优化SOCKET消息

src/main/java/thyyxxk/webserver/constants/Message.java

@@ -9,7 +9,7 @@ public enum Message {
      * 刷新 token
      */
     REFRESH_TOKEN("refreshToken"),
-    FEE_UPDATED("feeUpdated"),
+    MED_INS_FEE_UPLOAD_PROGRESS("medInsFeeUploadProgress"),
     /**
      * 进度条消息
      */

src/main/java/thyyxxk/webserver/controller/webosket/SendSocketController.java

@@ -17,7 +17,7 @@ public class SendSocketController {
     @PassToken
     @PostMapping("/sendById")
     public String sendMessageById(@RequestBody PureCodeName msg) {
-        WebSocketServer.sendMessage(msg.getCode(), SocketMsg.socketVo(Message.FEE_UPDATED, msg.getName()));
+        WebSocketServer.sendMessage(msg.getCode(), SocketMsg.socketVo(Message.MED_INS_FEE_UPLOAD_PROGRESS, msg.getName()));
         return "done";
     }
 }

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiZyService.java

@@ -327,6 +327,10 @@ public class SiZyService {
         if (null == p.getStaffId()) {
             p.setStaffId(TokenUtil.getTokenUserId());
         }
+        ReadCardBizType readCardBizType = ReadCardBizType.get(p.getReadCardBizType());
+        if (readCardBizType != ReadCardBizType.SETTLEMENT) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先读卡再做出院结算。");
+        }
         dscginfo.setDiseCodg(setlDises.get(0).getDiagCode());
         dscginfo.setDiseName(setlDises.get(0).getDiagName());
         dscginfo.setDscgWay(DscgWay.ORDER_TO_LEAVE_HOSPITAL.getCode());

src/main/java/thyyxxk/webserver/utils/SocketMsg.java

@@ -14,7 +14,7 @@ public class SocketMsg {
     public static String socketVo(Message messageName, JSONObject map) {
         JSONObject msg = new JSONObject();
         msg.put("name", messageName.getName());
-        msg.put("data", map);
+        msg.put("message", map);
         return msg.toJSONString();
     }
 
@@ -22,7 +22,7 @@ public class SocketMsg {
     public static String socketVo(Message messageName, String data) {
         JSONObject msg = new JSONObject();
         msg.put("name", messageName.getName());
-        msg.put("data", data);
+        msg.put("message", data);
         return msg.toJSONString();
     }