分诊动作要通知诊室小屏幕，优化诊室IP设置

src/main/java/thyyxxk/webserver/controller/outpatient/triage/TriageController.java

@@ -87,8 +87,9 @@ public class TriageController {
     }
 
     @GetMapping("/cancelTriage")
-    public ResultVo<Integer> cancelTriage(@RequestParam("serialNo") Integer serialNo) {
-        return service.cancelTriage(serialNo);
+    public ResultVo<Integer> cancelTriage(@RequestParam("serialNo") Integer serialNo,
+                                          @RequestParam("roomCode") String roomCode) {
+        return service.cancelTriage(serialNo, roomCode);
     }
 
     @GetMapping("/refreshBigScreenData")

src/main/java/thyyxxk/webserver/controller/outpatient/triage/TriageSettingsController.java

@@ -2,12 +2,10 @@ package thyyxxk.webserver.controller.outpatient.triage;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.dictionary.CodeName;
 import thyyxxk.webserver.entity.outpatient.triage.FloorScreenSetting;
 import thyyxxk.webserver.entity.outpatient.triage.MzfzZdDeptRoom;
-import thyyxxk.webserver.entity.outpatient.triage.RoomIp;
 import thyyxxk.webserver.service.outpatient.triage.TriageSettingsService;
 import thyyxxk.webserver.utils.ResultVoUtil;
 
@@ -59,13 +57,13 @@ public class TriageSettingsController {
     }
 
     @GetMapping("/getAllRoomIp")
-    public ResultVo<List<RoomIp>> getAllRoomIp() {
-        return service.getAllRoomIp();
+    public ResultVo<List<MzfzZdDeptRoom>> getAllRoomIp() {
+        return service.getAllMzfzRooms();
     }
 
     @PostMapping("/updateRoomIp")
-    public ResultVo<String> updateRoomIp(@RequestBody RoomIp param) {
-        return service.updateRoomIp(param);
+    public ResultVo<String> updateRoomIp(@RequestBody MzfzZdDeptRoom room) {
+        return service.updateRoomIp(room);
     }
 
     @GetMapping("/getFloorScreenSetting")

src/main/java/thyyxxk/webserver/dao/his/dictionary/ClinicRoomDictDao.java

@@ -19,7 +19,7 @@ public interface ClinicRoomDictDao {
     List<CodeName> getDeptList();
 
     @Update("update mzfz_zd_dept_room set dept_code=#{deptCode}, " +
-            "room_name=#{roomName},room_no=#{roomNo},status_flag=#{statusFlag} " +
+            "room_name=#{deptName},room_no=#{roomNo},status_flag=#{statusFlag} " +
             "where room_code=#{roomCode}")
     void updateRoomInfo(MzfzZdDeptRoom room);
 
@@ -27,6 +27,6 @@ public interface ClinicRoomDictDao {
     String getMaxRoomCode();
 
     @Insert("insert into mzfz_zd_dept_room (dept_code,room_code,room_name,room_no,status_flag) " +
-            "values (#{deptCode},#{roomCode},#{roomName},#{roomNo},#{statusFlag})")
+            "values (#{deptCode},#{roomCode},#{deptName},#{roomNo},#{statusFlag})")
     void insertRoomInfo(MzfzZdDeptRoom room);
 }

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

@@ -48,7 +48,7 @@ public interface RoomScreenDao {
             "and status_flag in ('1','2','3') order by fz_no")
     List<MessageForPush> getNextJzList(MessageForPush param);
 
-    @Select("select top 1 room_code from zd_triage_room_ip where ip=#{ip}")
+    @Select("select top 1 room_code from mzfz_zd_dept_room where room_ip=#{ip}")
     String getRoomCodeByIp(@Param("ip") String ip);
 
     @Update("update t_triage_notify_relation set notify_datetime=getdate() where serial_no=#{serialNo}")

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

@@ -4,7 +4,6 @@ import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.dictionary.CodeName;
 import thyyxxk.webserver.entity.outpatient.triage.FloorScreenSetting;
 import thyyxxk.webserver.entity.outpatient.triage.MzfzZdDeptRoom;
-import thyyxxk.webserver.entity.outpatient.triage.RoomIp;
 
 import java.util.List;
 
@@ -52,11 +51,11 @@ public interface TriageSettingsDao {
             "where room_code=#{roomCode}")
     void updateRoomSettings(MzfzZdDeptRoom room);
 
-    @Select("select * from zd_triage_room_ip with(nolock)")
-    List<RoomIp> getAllRoomIp();
+    @Select("select * from mzfz_zd_dept_room with(nolock)")
+    List<MzfzZdDeptRoom> getAllMzfzRoom();
 
-    @Update("update zd_triage_room_ip set ip=#{ip} where [key]=#{key}")
-    void updateRoomIp(RoomIp param);
+    @Update("update mzfz_zd_dept_room set room_ip=#{roomIp} where room_code=#{roomCode} ")
+    void updateRoomIp(MzfzZdDeptRoom room);
 
     @Select("select * from t_floor_screen_settings where user_code=#{userCode}")
     FloorScreenSetting getFloorScreenSetting(String userCode);

src/main/java/thyyxxk/webserver/entity/outpatient/triage/MzfzZdDeptRoom.java

@@ -52,6 +52,11 @@ public class MzfzZdDeptRoom  implements Serializable {
 	 */
 	private Integer roomNo;
 
+	/**
+	 * 诊室候诊信息屏幕的IP地址
+	 * */
+	private String roomIp;
+
 	/**
 	 * 分诊初始号
 	 */

src/main/java/thyyxxk/webserver/entity/outpatient/triage/RoomIp.java

@@ -1,14 +0,0 @@
-package thyyxxk.webserver.entity.outpatient.triage;
-
-import lombok.Data;
-
-@Data
-public class RoomIp {
-    private Integer key;
-    private String ip;
-    private String deptCode;
-    private String deptName;
-    private Integer roomCode;
-    private String roomName;
-    private Integer roomNo;
-}

src/main/java/thyyxxk/webserver/http/websocket/SocketV2.java

@@ -97,7 +97,7 @@ public class SocketV2 {
             setSpeechUrl(body);
         }
         JSONObject json = new JSONObject();
-        json.set("sid", body.getSid());
+        json.set("sid", body.getRoomCode());
         JSONObject msg = JSONUtil.parseObj(body);
         json.set("msg", msg);
         getPostApi("/roomScreen")

src/main/java/thyyxxk/webserver/service/crbmanagement/CrbUpdateByEmr.java

@@ -30,10 +30,10 @@ public class CrbUpdateByEmr {
     private final static String EMPTY = "-";
     private final MedinsurConfig config;
 
-    @PostConstruct
-    public void init() {
-        getData("000362", 14);
-    }
+//    @PostConstruct
+//    public void init() {
+//        getData("000362", 14);
+//    }
 
     public Map<String, Object> getData(String patNo, Integer times) {
         Map<String, Object> map = new HashMap<>();

src/main/java/thyyxxk/webserver/service/dictionary/ClinicRoomDictService.java

@@ -34,6 +34,7 @@ public class ClinicRoomDictService {
             dao.updateRoomInfo(room);
         } else {
             room.setRoomCode(dao.getMaxRoomCode());
+            room.setDeptName(deptCache.getDeptName(room.getDeptCode()));
             dao.insertRoomInfo(room);
         }
         room.setDeptName(deptCache.getDeptName(room.getDeptCode()));

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

@@ -65,7 +65,6 @@ public class RoomScreenService {
     }
 
     public ResultVo<String> pushSocketMsg(MessageForPush param) {
-        param.setSid(param.getRoomCode());
         socketV2.sendMsgToRoomScreen(param);
         return ResultVoUtil.success();
     }

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

@@ -196,6 +196,7 @@ public class TriageService {
         messageForPush.setSid(room.getTriageStaff());
         messageForPush.setRoomCode(room.getRoomCode());
         socketV2.sendMsgToHelpDesk(messageForPush);
+        socketV2.sendMsgToRoomScreen(messageForPush);
 
         return ResultVoUtil.success("分诊成功。");
     }
@@ -209,14 +210,16 @@ public class TriageService {
         return ResultVoUtil.success(dao.fuZhen(serialNo));
     }
 
-    public ResultVo<Integer> cancelTriage(Integer serialNo) {
+    public ResultVo<Integer> cancelTriage(Integer serialNo, String roomCode) {
         Integer ret = dao.cancelTriage(serialNo);
         dao.deleteNotifyRelation(serialNo);
         MessageForPush messageForPush = new MessageForPush();
         messageForPush.setAction(5);
         messageForPush.setSerialNo(serialNo);
         messageForPush.setSid(TokenUtil.getInstance().getTokenUserId());
+        messageForPush.setRoomCode(roomCode.trim());
         socketV2.sendMsgToHelpDesk(messageForPush);
+        socketV2.sendMsgToRoomScreen(messageForPush);
         return ResultVoUtil.success(ret);
     }
 
@@ -279,8 +282,6 @@ public class TriageService {
         messageForPush.setRoomCode(notifyRelation.getRoomCode());
         socketV2.sendMsgToHelpDesk(messageForPush);
         dao.updateNotifyDatetime(param.getSerialNo());
-
-        messageForPush.setSid(messageForPush.getRoomCode());
         socketV2.sendMsgToRoomScreen(messageForPush);
         return ResultVoUtil.success("通知完成。");
     }

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

@@ -9,7 +9,6 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.dictionary.CodeName;
 import thyyxxk.webserver.entity.outpatient.triage.FloorScreenSetting;
 import thyyxxk.webserver.entity.outpatient.triage.MzfzZdDeptRoom;
-import thyyxxk.webserver.entity.outpatient.triage.RoomIp;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
 import thyyxxk.webserver.utils.TokenUtil;
@@ -85,12 +84,12 @@ public class TriageSettingsService {
         return ResultVoUtil.success("已成功更新诊室信息。");
     }
 
-    public ResultVo<List<RoomIp>> getAllRoomIp() {
-        return ResultVoUtil.success(dao.getAllRoomIp());
+    public ResultVo<List<MzfzZdDeptRoom>> getAllMzfzRooms() {
+        return ResultVoUtil.success(dao.getAllMzfzRoom());
     }
 
-    public ResultVo<String> updateRoomIp(RoomIp param) {
-        dao.updateRoomIp(param);
+    public ResultVo<String> updateRoomIp(MzfzZdDeptRoom room) {
+        dao.updateRoomIp(room);
         return ResultVoUtil.success("更新ip地址成功。");
     }
 

src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: prod
+      primary: his
       strict: false
       datasource:
         prod:
@@ -148,7 +148,7 @@ si-zy-fee-url: http://172.16.30.26:1000
 si-mz-fee-url: http://172.16.30.26:1100/mzFee
 si-injury-fee-url: http://172.16.30.26:2100/siInjury
 si-injury-systm-url: http://172.16.30.26:2000/siInjury
-thmz-api-url: http://172.16.30.26:8089/thmz
+thmz-api-url: http://172.16.30.119:8089/thmz
 rmHkUserApi: http://172.16.30.66:20923/thyy/api/haikang/door/destructionUser
 si-crb-url: http://172.16.32.206:8881