更新辅检提醒中疾病条件判断的逻辑

src/main/java/com/diagbot/repository/PacsRemindNode.java

@@ -28,7 +28,7 @@ public class PacsRemindNode {
 		OtherTipPacsNeoDTO otherPacsNeoDTO;
 
 		Item item;
-		List<String> diseases = new ArrayList<>();
+		List<String> pacsdiseases = new ArrayList<>();
 		List<String> pacsresult = new ArrayList<>();
 		String pacsgender = "";
 		String disname, gender, psresult, posres, negres, msg;
@@ -38,7 +38,7 @@ public class PacsRemindNode {
 
 
 		for (Item dg : wordCrfDTO.getDiag()) {
-			diseases.add(dg.getUniqueName());
+			pacsdiseases.add(dg.getUniqueName());
 		}
 
 		for (Pacs pacs : wordCrfDTO.getPacs()) {
@@ -96,16 +96,20 @@ public class PacsRemindNode {
 			}
 
 			otherPacsNeoDTO = null;
-			boolean proceed = true;
+			boolean proceed = false;
 			if (StringUtil.isNotBlank(psresult)) {
 
-				if (StringUtil.isNotBlank(disname) && proceed) {
-					if (disname.equals(diseases.get(0))) {
-					}
-					else {
-						proceed = false;
+				if (StringUtil.isNotBlank(disname)) {
+					for (String pacsdname : pacsdiseases){
+						if (disname.contains(pacsdname)) {
+							proceed = true;
+							break;
+						}
 					}
 				}
+				else {
+					proceed = true;
+				}
 
 				if (StringUtil.isNotBlank(gender) && proceed) {
 					if (gender.contains(pacsgender)) {