事中表字段添加

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

@@ -49,4 +49,45 @@ public class SystemEventAttrConstant {
      * 医院项目编码 eventAttrId: 992
      */
     public static final String PROJECT_CODE_LSIT = "projectCodeList";
+    /**
+     * 单次用药量 eventAttrId: 991
+     */
+    public static final String SINGLE_DOSE_NUMBER = "single_dose_number";
+    /**
+     * 单次用药剂量单位 eventAttrId: 990
+     */
+    public static final String SINGLE_DOSE_UNIT = "single_dose_unit";
+    /**
+     * 服用频次 eventAttrId: 989
+     */
+    public static final String TAKE_FREQUENCE = "take_frequence";
+    /**
+     * 规格 eventAttrId: 988
+     */
+    public static final String MEDICAL_SPECIFICATION = "medical_specification";
+    /**
+     * 单价 eventAttrId: 987
+     */
+    public static final String PRICE = "price";
+    /**
+     * 用药天数 eventAttrId: 986
+     */
+    public static final String USE_DAY = "use_day";
+    /**
+     * 剂型 eventAttrId: 985
+     */
+    public static final String DOSE_FORM = "dose_form";
+    /**
+     * 药量天数 eventAttrId: 984
+     */
+    public static final String DOSE_DAY = "dose_day";
+    /**
+     * 单位 eventAttrId:983
+     */
+    public static final String DOSE_UNIT = "dose_unit";
+    /**
+     * 数量 eventAttrId:982
+     */
+    public static final String QUANTITY = "quantity";
+
 }

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

@@ -9,6 +9,7 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.EnchanceTypeEnum;
+import org.jeecg.modules.medical.SystemEventAttrConstant;
 import org.jeecg.modules.medical.entity.AdvanceWarningAudit;
 import org.jeecg.modules.medical.entity.AdvanceWarningAuditDetail;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
@@ -309,6 +310,17 @@ public class FactorEnchangeFactory {
                 BigDecimal otherAmount = (BigDecimal) otherItemMap.getOrDefault(Constant.AMOUNT_KEY, 0);
                 midIncidentAuditDetail.setAmount(otherAmount.doubleValue());
                 midIncidentAuditDetail.setProjectType(otherItemMap.getOrDefault(Constant.PROJECT_TYPE_KEY, "default").toString());
+
+                midIncidentAuditDetail.setDoseDay((Integer) otherItemMap.getOrDefault(SystemEventAttrConstant.DOSE_DAY, 0));
+                midIncidentAuditDetail.setPrice((BigDecimal) otherItemMap.getOrDefault(SystemEventAttrConstant.PRICE, 0));
+                midIncidentAuditDetail.setDoseForm((String) otherItemMap.getOrDefault(SystemEventAttrConstant.DOSE_FORM, ""));
+                midIncidentAuditDetail.setTakeFrequence((String) otherItemMap.getOrDefault(SystemEventAttrConstant.TAKE_FREQUENCE, ""));
+                midIncidentAuditDetail.setSingleDoseNumber((Integer) otherItemMap.getOrDefault(SystemEventAttrConstant.SINGLE_DOSE_NUMBER, 0));
+                midIncidentAuditDetail.setSingleDoseUnit((String) otherItemMap.getOrDefault(SystemEventAttrConstant.SINGLE_DOSE_UNIT, ""));
+                midIncidentAuditDetail.setMedicalSpecification((String) otherItemMap.getOrDefault(SystemEventAttrConstant.MEDICAL_SPECIFICATION, ""));
+                midIncidentAuditDetail.setMedicalNumber((Float) otherItemMap.getOrDefault(SystemEventAttrConstant.QUANTITY, 0));
+                midIncidentAuditDetail.setDoseUnit((String) otherItemMap.getOrDefault(SystemEventAttrConstant.DOSE_UNIT, ""));
+                midIncidentAuditDetail.setUseDay((Integer) otherItemMap.getOrDefault(SystemEventAttrConstant.USE_DAY, 0));
                 otherList.add(midIncidentAuditDetail);
             }
             midIncidentAuditDetailService.saveBatch(otherList);
@@ -339,7 +351,16 @@ public class FactorEnchangeFactory {
             midIncidentAuditDetail.setProejctName(itemMap.get(Constant.PROJECT_NAME_KEY).toString());
             midIncidentAuditDetail.setMedicalProjectCode(itemMap.get(Constant.MEDICAL_PROJECT_CODE_KEY).toString());
             midIncidentAuditDetail.setMedicalProjectName(itemMap.get(Constant.MEDICAL_PROJECT_NAME_KEY).toString());
-
+            midIncidentAuditDetail.setDoseDay((Integer) itemMap.getOrDefault(SystemEventAttrConstant.DOSE_DAY, 0));
+            midIncidentAuditDetail.setPrice((BigDecimal) itemMap.getOrDefault(SystemEventAttrConstant.PRICE, 0));
+            midIncidentAuditDetail.setDoseForm((String) itemMap.getOrDefault(SystemEventAttrConstant.DOSE_FORM, ""));
+            midIncidentAuditDetail.setTakeFrequence((String) itemMap.getOrDefault(SystemEventAttrConstant.TAKE_FREQUENCE, ""));
+            midIncidentAuditDetail.setSingleDoseNumber((Integer) itemMap.getOrDefault(SystemEventAttrConstant.SINGLE_DOSE_NUMBER, 0));
+            midIncidentAuditDetail.setSingleDoseUnit((String) itemMap.getOrDefault(SystemEventAttrConstant.SINGLE_DOSE_UNIT, ""));
+            midIncidentAuditDetail.setMedicalSpecification((String) itemMap.getOrDefault(SystemEventAttrConstant.MEDICAL_SPECIFICATION, ""));
+            midIncidentAuditDetail.setMedicalNumber((Float) itemMap.getOrDefault(SystemEventAttrConstant.QUANTITY, 0));
+            midIncidentAuditDetail.setDoseUnit((String) itemMap.getOrDefault(SystemEventAttrConstant.DOSE_UNIT, ""));
+            midIncidentAuditDetail.setUseDay((Integer) itemMap.getOrDefault(SystemEventAttrConstant.USE_DAY, 0));
             midIncidentAuditDetail.setProjectType(itemMap.getOrDefault(Constant.PROJECT_TYPE_KEY, "default").toString());
             midIncidentAuditService.lambdaUpdate().setSql("amount = amount +" + amount.doubleValue()).eq(MidIncidentAudit::getId, midIncidentAudit.getId()).update();
 

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

@@ -398,8 +398,8 @@ public class RuleEngine {
                 midIncidentVisitDetailLog.setOrderCatalog(adviceDetailsVO.getOrder_catalog());
                 midIncidentVisitDetailLog.setSingleDoseNumber(adviceDetailsVO.getSingle_dose_number());
                 midIncidentVisitDetailLog.setSingleDoseUnit(adviceDetailsVO.getSingle_dose_unit());
-                midIncidentVisitDetailLog.setMedicalDeptCode(adviceDetailsVO.getMedical_project_code());
-                midIncidentVisitDetailLog.setMedicalDeptName(adviceDetailsVO.getMedical_project_name());
+                midIncidentVisitDetailLog.setMedicalDeptCode(midIncidentWarningVO.getMedical_dept_code());
+                midIncidentVisitDetailLog.setMedicalDeptName(midIncidentWarningVO.getMedical_dept_name());
                 midIncidentVisitDetailLog.setMedicalProjectName(adviceDetailsVO.getMedical_project_name());
                 midIncidentVisitDetailLog.setTakeFrequence(adviceDetailsVO.getTake_frequence());
                 midIncidentVisitDetailLog.setMedicalSpecification(adviceDetailsVO.getMedical_specification());