Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/RuleEngine.java

@@ -234,9 +234,10 @@ public class RuleEngine {
                 MedicalInsRuleInfo medicalInsRuleInfo = medicalInsRuleInfoService.getById(medicalRuleInsInfoId);
                 runAdvanceWaringEngine(paramMap, medicalInsRuleInfo, advanceWarningAudit);
             }
-
-            webSocket.pushMessage(ipStr, JSON.toJSONString(advanceWarningAudit));
-
+            JSONObject sendJson = new JSONObject();
+            sendJson.put("id", advanceWarningAudit.getId());
+            sendJson.put("type","during");
+            webSocket.pushMessage(ipStr, sendJson.toJSONString());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -281,8 +282,12 @@ public class RuleEngine {
                 }
                 sendFlag = runMidEngine(auditDetailSet, itemMap, medicalInsRuleInfoIdList, midIncidentAudit, itemList);
             }
+
             if (sendFlag) {
-                webSocket.pushMessage(ipStr, JSON.toJSONString(midIncidentAudit));
+                JSONObject sendJson = new JSONObject();
+                sendJson.put("id", midIncidentAudit.getId());
+                sendJson.put("type","before");
+                webSocket.pushMessage(ipStr, sendJson.toJSONString());
             } else {
                 log.error("无违规，事中审核无需提醒 门诊/住院号：{}", midIncidentWarningVO.getVisit_no());
             }