0027005599 пре 2 година
родитељ
комит
37e359518a

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

@@ -293,6 +293,7 @@ public class RuleEngine {
                         if (startFlag) {
                             afterwardsAuditDetail.setMedicalInsRuleInfoId(medicalInsRuleProject.getMedicalInsRuleInfoId());
                             MedicalInsRuleInfo medicalInsRuleInfo = medicalMap.get(medicalInsRuleProject.getMedicalInsRuleInfoId());
+                            afterwardsAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
                             afterwardsAuditDetail.setMedicalInsRuleInfoName(medicalInsRuleInfo.getRuleName());
                             afterwardsAuditDetail.setMedicalInsRuleInfoCode(medicalInsRuleInfo.getRuleCode());
                             if (StringUtils.isNotBlank(medicalInsRuleProject.getViolationDesc())) {
@@ -309,6 +310,7 @@ public class RuleEngine {
                             if (startFlag) {
                                 afterwardsAuditDetail.setMedicalInsRuleInfoId(medicalInsRuleProject.getMedicalInsRuleInfoId());
                                 MedicalInsRuleInfo medicalInsRuleInfo = medicalMap.get(medicalInsRuleProject.getMedicalInsRuleInfoId());
+                                afterwardsAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
                                 afterwardsAuditDetail.setMedicalInsRuleInfoName(medicalInsRuleInfo.getRuleName());
                                 afterwardsAuditDetail.setMedicalInsRuleInfoCode(medicalInsRuleInfo.getRuleCode());
                                 if (StringUtils.isNotBlank(medicalInsRuleProject.getViolationDesc())) {

+ 2 - 1
jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/AfterwardsAuditDataTest.java

@@ -191,6 +191,7 @@ public class AfterwardsAuditDataTest {
                 } else {
                     afterwardsAuditDetail.setDescription(medicalInsRuleInfo.getDescription());
                 }
+                afterwardsAuditDetail.setTreatmentType(medicalInsRuleInfo.getTreatmentType());
             }
 
         }
@@ -210,7 +211,7 @@ public class AfterwardsAuditDataTest {
         afterwardsAuditDetail.setAfterwardsAuditId(afterwardsAudit.getId());
 
         afterwardsAuditDetail.setAmount(Double.parseDouble(sttlMasterDetailBill.get金额()));
-        afterwardsAuditDetail.setTreatmentType("hops");
+
         afterwardsAuditDetail.setDoctorId(afterwardsAudit.getDoctorId());
         afterwardsAuditDetail.setDoctorName(afterwardsAudit.getDoctorName());
         afterwardsAuditDetail.setMedicalDeptCode(afterwardsAudit.getMedicalDeptCode());