Browse Source

事中住院接口

0027005599 2 years ago
parent
commit
ee07cdb471

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

@@ -296,7 +296,6 @@ public class FactorEnchangeFactory {
         afterwardsAuditDetail.setUseDay((Integer) itemMap.getOrDefault(SystemEventAttrConstant.USE_DAY, 1));
         afterwardsAuditDetail.setQuantity(itemMap.get(SystemEventAttrConstant.QUANTITY) != null ? Integer.parseInt(itemMap.get(SystemEventAttrConstant.QUANTITY).toString()) : 1);
         afterwardsAuditDetail.setViolationLevel(medicalInsRuleInfo.getViolationLevel());
-        afterwardsAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
         afterwardsAuditDetail.setAfterwardsAuditId(afterwardsAudit.getId());
         afterwardsAuditDetail.setMedicalInsuranceMark(itemMap.get(Constant.MEDICAL_INSURANCE_MARK_KEY) != null ? itemMap.get(Constant.MEDICAL_INSURANCE_MARK_KEY).toString() : "0");
         afterwardsAuditDetail.setPrice(itemMap.get(SystemEventAttrConstant.PRICE) != null ? new BigDecimal(itemMap.get(SystemEventAttrConstant.PRICE).toString()) : null);
@@ -373,13 +372,15 @@ public class FactorEnchangeFactory {
         midIncidentAuditDetail.setOutpatientNumber(midIncidentAudit.getOutpatientNumber());
         midIncidentAuditDetail.setPrescriptionNumber(midIncidentAudit.getPrescriptionNumber());
         midIncidentAuditDetail.setViolationLevel(medicalInsRuleInfo.getViolationLevel());
-        midIncidentAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
         midIncidentAuditDetail.setMidIncidentAuditId(midIncidentAudit.getId());
         midIncidentAuditDetail.setProejctCode(itemMap.get(Constant.PROJECT_CODE_KEY).toString());
         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.parseInt(itemMap.getOrDefault(SystemEventAttrConstant.DOSE_DAY, 0).toString()));
+        Object projectUseTime = itemMap.get(SystemEventAttrConstant.PROJECT_USE_TIME);
+        String projectUseTimeStr = CommonUtil.getProjectUseTime(projectUseTime);
+        midIncidentAuditDetail.setProjectUseTime(projectUseTimeStr);
         Object priceObject = itemMap.get(SystemEventAttrConstant.PRICE);
         if(null != priceObject) {
             BigDecimal price = new BigDecimal(priceObject.toString());
@@ -398,6 +399,8 @@ public class FactorEnchangeFactory {
         midIncidentAuditDetail.setDoseUnit((String) itemMap.getOrDefault(SystemEventAttrConstant.DOSE_UNIT, ""));
         Integer useDay = Integer.parseInt(itemMap.getOrDefault(SystemEventAttrConstant.USE_DAY, "1").toString());
         midIncidentAuditDetail.setUseDay(useDay);
+        midIncidentAuditDetail.setPatientAge(itemMap.getOrDefault(SystemEventAttrConstant.PATIENT_AGE_KEY, "1").toString());
+        midIncidentAuditDetail.setPatientGender(itemMap.getOrDefault(SystemEventAttrConstant.PATIENT_GENDER_KEY, "3").toString());
         midIncidentAuditDetail.setProjectType(itemMap.getOrDefault(Constant.PROJECT_TYPE_KEY, "default").toString());
         midIncidentAuditDetail.setMedicalRuleProjectId((Integer) itemMap.get(SystemEventAttrConstant.MEDICAL_INS_RULE_PROJECT_ID));
         Object expenseCategory = itemMap.getOrDefault(SystemEventAttrConstant.EXPENSE_CATEGORY, "");