Merge remote-tracking branch 'origin/master'

陈昶聿

13 小时以前 0d10bc99eec75672b049339399e4f762fbd9746e

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