国际医疗部和知名专家室都要发通知

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>11.9.8</version>
+    <version>12.0.0</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/dao/his/outpatient/triage/TriageDao.java

@@ -198,11 +198,13 @@ public interface TriageDao {
     @Select("select * from t_triage_notify_relation where serial_no=#{serialNo}")
     TriageNotifyRelation selectTriageNotifyRelation(@Param("serialNo") int serialNo);
 
-    @Select("select rtrim(name) as name,visit_date from mzfz_patient_order where serial_no=#{serialNo}")
+    @Select("select rtrim(a.name) as name,a.visit_date," +
+            "deptName=(select rtrim(d.name) from zd_unit_code d where d.code=a.dept_code) " +
+            "from mzfz_patient_order a where a.serial_no=#{serialNo}")
     MessageForPush selectVipRegMessage(@Param("serialNo") int serialNo);
 
     @Select("select code from t_triage_user_depts where isnull(del_flag,0)=0 " +
-            "and chosen_dept like '%\"1060000\"%'")
+            "and (chosen_dept like '%\"1060000\"%' or chosen_dept like '%\"1060010\"%')")
     List<String> selectVipTriageUser();
 
     @Select("select rtrim(code_rs) from a_employee_mi where dept_code='2080000' and isnull(del_flag,'0')!='1'")

src/main/java/thyyxxk/webserver/service/outpatient/triage/TriageService.java

@@ -245,8 +245,9 @@ public class TriageService {
 
     private ResultVo<String> notifyVipReq(int serialNo) {
         MessageForPush vipRegMessage = dao.selectVipRegMessage(serialNo);
-        String message = String.format("患者【%s】预约了国际医疗部，预约就诊时间为【%s】",
-                vipRegMessage.getName(), DateUtil.formatDatetime(vipRegMessage.getVisitDate()));
+        String message = String.format("患者【%s】预约了%s，预约就诊时间为【%s】",
+                vipRegMessage.getName(), vipRegMessage.getDeptName(),
+                DateUtil.formatDatetime(vipRegMessage.getVisitDate()));
         JSONObject messageWrapper = new JSONObject();
         messageWrapper.put("name", "systemNotification");
         JSONObject messageBody = new JSONObject();