Merge branch 'master' into master-任务组

陈昶聿

10 天以前 37e23ae4323114564dadbacf75449b75ad957bbf

 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);