Merge remote-tracking branch 'origin/master'

陈昶聿

2026-05-15 c3117a0c5c7b2b69c56cfc50fe5c199c2c2276c1

 smartor/src/main/java/com/smartor/service/IServiceTaskService.java

@@ -75,7 +75,7 @@
     * @param patid
     * @return
     */
    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid, Boolean isFinish, String patfrom);
    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid, Boolean isFinish, String patfrom,Long subId);

    public Map<String, Object> getScriptByCondition(Long taskid, String zyserialnum, String mzserialnum, String tsserialnum);