|
|
@@ -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<>();
|