Merge remote-tracking branch 'origin/master'

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

@@ -203,7 +203,8 @@ public class RuleEngine {
                     if(StringUtils.isNotBlank(medicalInsRuleInfo.getSelectedRoles())) {
                         String[] rolesArr = medicalInsRuleInfo.getSelectedRoles().split(",");
                         boolean medicalDiagnoseCodeFlag = Arrays.stream(rolesArr).allMatch(role -> role.equals("medicalDiagnoseCode"));
-                        if(medicalDiagnoseCodeFlag) {
+                        boolean cMedicalDiagnoseCodeFlag = Arrays.stream(rolesArr).allMatch(role -> role.equals("correlationMedicalDiagnoseCode"));
+                        if(medicalDiagnoseCodeFlag || cMedicalDiagnoseCodeFlag) {
                             List<MedicalInsRuleProjectDiagnose> medicalInsRuleProjectDiagnoseList = medicalInsRuleProjectDiagnoseService.lambdaQuery().eq(MedicalInsRuleProjectDiagnose::getMedicalInsRuleInfoId, medicalInsRuleInfo.getId()).list();
                             if (CollectionUtil.isNotEmpty(medicalInsRuleProjectDiagnoseList)) {
                                 for (MedicalInsRuleProjectDiagnose medicalInsRuleProjectDiagnose : medicalInsRuleProjectDiagnoseList) {