表结构更新

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/AfterwardsAudit.java

@@ -36,30 +36,10 @@ public class AfterwardsAudit implements Serializable {
 	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
-	/**医保规则ID*/
-	@Excel(name = "医保规则ID", width = 15)
-    @ApiModelProperty(value = "医保规则ID")
-    private java.lang.Integer medicalInsRuleInfoId;
-	/**医保规则编码*/
-	@Excel(name = "医保规则编码", width = 15)
-    @ApiModelProperty(value = "医保规则编码")
-    private java.lang.String medicalInsRuleInfoCode;
-	/**医保规则名称*/
-	@Excel(name = "医保规则名称", width = 15)
-    @ApiModelProperty(value = "医保规则名称")
-    private java.lang.String medicalInsRuleInfoName;
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
     private java.lang.String treatmentType;
-	/**警示级别*/
-	@Excel(name = "警示级别", width = 15)
-    @ApiModelProperty(value = "警示级别")
-    private java.lang.String reminderLevel;
-    /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3：仅提醒展示*/
-    @Excel(name = "违规等级", width = 15)
-    @ApiModelProperty(value = "违规等级")
-    private java.lang.Integer violationLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
     @ApiModelProperty(value = "提醒类别;事前提醒，事中预警，事后监管")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/AfterwardsAuditDetail.java

@@ -56,6 +56,10 @@ public class AfterwardsAuditDetail implements Serializable {
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
     private java.lang.String reminderLevel;
+    /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3：仅提醒展示*/
+    @Excel(name = "违规等级", width = 15)
+    @ApiModelProperty(value = "违规等级")
+    private java.lang.Integer violationLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
     @ApiModelProperty(value = "提醒类别;事前提醒，事中预警，事后监管")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentAuditDetail.java

@@ -56,6 +56,10 @@ public class MidIncidentAuditDetail implements Serializable {
 	@Excel(name = "警示级别", width = 15)
     @ApiModelProperty(value = "警示级别")
     private java.lang.String reminderLevel;
+    /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3：仅提醒展示*/
+    @Excel(name = "违规等级", width = 15)
+    @ApiModelProperty(value = "违规等级")
+    private java.lang.Integer violationLevel;
 	/**提醒类别;事前提醒，事中预警，事后监管*/
 	@Excel(name = "提醒类别;事前提醒，事中预警，事后监管", width = 15)
     @ApiModelProperty(value = "提醒类别;事前提醒，事中预警，事后监管")

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

@@ -149,7 +149,7 @@ public class RuleEngine {
         return Result.ok();
     }
 
-    public void insertMidWarning(MedicalInsRuleInfo medicalInsRuleInfo){
+    public void insertMidWarning(){
         MidIncidentWarningVO midIncidentWarningVO = RuleEngine.midIncidentWarningVOThreadLocal.get();
         MidIncidentAudit midIncidentAudit = new MidIncidentAudit();
         midIncidentAudit.setMedicalDeptCode(midIncidentWarningVO.getMedical_dept_code());
@@ -160,11 +160,8 @@ public class RuleEngine {
         midIncidentAudit.setDoctorId(midIncidentWarningVO.getDoctor_code());
         midIncidentAudit.setPatientId(midIncidentWarningVO.getPatient_id());
         midIncidentAudit.setPatientName(midIncidentWarningVO.getPatient_name());
-        midIncidentAudit.setMedicalInsRuleInfoId(medicalInsRuleInfo.getId());
-        midIncidentAudit.setMedicalInsRuleInfoCode(medicalInsRuleInfo.getRuleCode());
-        midIncidentAudit.setMedicalInsRuleInfoName(medicalInsRuleInfo.getRuleName());
-        midIncidentAudit.setViolationLevel(medicalInsRuleInfo.getViolationLevel());
-        midIncidentAudit.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
+        midIncidentAudit.setTreatmentType(midIncidentWarningVO.getVisit_type());
+        midIncidentAudit.setPrescriptionNumber(midIncidentWarningVO.getDoctor_advice_no());
         midIncidentAudit.setNoticeType("事中预警");
         midIncidentAuditService.save(midIncidentAudit);
     }