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

陈昶聿

昨天 e12b7983327f4881f91c8d081c52abbbf5bbc1e4

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

@@ -147,4 +147,6 @@
    public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS);

    public List<ServiceSubtaskDiagname> convertToDiagnameList(List<ServiceSubtask> subtaskList) ;

    public Map<String, Object> getCurrentUserServiceSubtaskCount(ServiceSubtaskEntity entity);
    }