Sfoglia il codice sorgente

1、未配置项目编码的诊断编码才需要单独匹配

0027005599 2 anni fa
parent
commit
fd394c2a8a

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

@@ -245,7 +245,9 @@ public class RuleEngine {
                     String[] rolesArr = medicalInsRuleInfo.getSelectedRoles().split(",");
                     boolean medicalDiagnoseCodeFlag = Arrays.stream(rolesArr).anyMatch(role -> role.equals("medicalDiagnoseCode"));
                     boolean cMedicalDiagnoseCodeFlag = Arrays.stream(rolesArr).anyMatch(role -> role.equals("correlationMedicalDiagnoseCode"));
-                    if (medicalDiagnoseCodeFlag || cMedicalDiagnoseCodeFlag) {
+                    boolean projectCodeFlag = Arrays.stream(rolesArr).anyMatch(role -> role.equals("projectCode"));
+                    boolean correlationProjectCodeFlag = Arrays.stream(rolesArr).anyMatch(role -> role.equals("correlationProjectCode"));
+                    if ((!projectCodeFlag && medicalDiagnoseCodeFlag)|| (!correlationProjectCodeFlag && cMedicalDiagnoseCodeFlag)) {
                         List<MedicalInsRuleProjectDiagnose> medicalInsRuleProjectDiagnoseList = medicalInsRuleProjectDiagnoseService.lambdaQuery().eq(MedicalInsRuleProjectDiagnose::getMedicalInsRuleInfoId, medicalInsRuleInfo.getId()).list();
                         if (CollectionUtil.isNotEmpty(medicalInsRuleProjectDiagnoseList)) {
                             Set<String> treatmentProjectCodeList = new HashSet<>();