Merge branch 'master' into master-任务组

陈昶聿

8 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

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

@@ -75,7 +75,9 @@
     * @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);


}