Merge branch 'master' into master-手术随访

陈昶聿

20 小时以前 5dcd6447f315e821727508cd26bf05f8220b39c8

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

@@ -77,5 +77,7 @@
     */
    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid, Boolean isFinish, String patfrom);

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


}