Merge remote-tracking branch 'origin/master'

陈昶聿

昨天 b73334e984e391cb2ea6b2651e77bf008e127459

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


}