hujing 5 роки тому
батько
коміт
de49e519c8

+ 3 - 13
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0011.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.client.ChiefPresentSimilarityServiceClient;
 import com.lantone.qc.kernel.structure.ai.ModelAI;
+import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Diag;
@@ -97,10 +98,10 @@ public class BEH0011 extends QCCatalogue {
                 if (likeRate > 0.85) {
                     matchSum++;
                 } else {
-                    infoStr = concatInfo(infoStr, presentPastDiag);
+                    infoStr = CatalogueUtil.concatInfo(infoStr, presentPastDiag);
                 }
             } else {
-                infoStr = concatInfo(infoStr, presentPastDiag);
+                infoStr = CatalogueUtil.concatInfo(infoStr, presentPastDiag);
             }
         }
         info.set(infoStr);
@@ -114,17 +115,6 @@ public class BEH0011 extends QCCatalogue {
          */
     }
 
-    private String concatInfo(String infoStr, String presentPastDiag) {
-        if (StringUtil.isBlank(infoStr)) {
-            infoStr += presentPastDiag;
-        } else {
-            if (!infoStr.contains(presentPastDiag)) {
-                infoStr += "," + presentPastDiag;
-            }
-        }
-        return infoStr;
-    }
-
     private void addDiagHospitalName(List<String> presentPastDiag, List<Diag> pastDiags) {
         for (Diag pastDiag : pastDiags) {
             if (pastDiag.getNegative() != null) {

+ 3 - 13
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0095.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.client.ChiefPresentSimilarityServiceClient;
 import com.lantone.qc.kernel.structure.ai.ModelAI;
+import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Diag;
@@ -94,10 +95,10 @@ public class FIRC0095 extends QCCatalogue {
                 if (likeRate > 0.85) {
                     matchSum++;
                 } else {
-                    infoStr = concatInfo(infoStr, presentPastDiag);
+                    infoStr = CatalogueUtil.concatInfo(infoStr, presentPastDiag);
                 }
             } else {
-                infoStr = concatInfo(infoStr, presentPastDiag);
+                infoStr = CatalogueUtil.concatInfo(infoStr, presentPastDiag);
             }
         }
         info.set(infoStr);
@@ -111,17 +112,6 @@ public class FIRC0095 extends QCCatalogue {
          */
     }
 
-    private String concatInfo(String infoStr, String presentPastDiag) {
-        if (StringUtil.isBlank(infoStr)) {
-            infoStr += presentPastDiag;
-        } else {
-            if (!infoStr.contains(presentPastDiag)) {
-                infoStr += "," + presentPastDiag;
-            }
-        }
-        return infoStr;
-    }
-
     private void addDiagHospitalName(List<String> presentPastDiag, List<Diag> pastDiags) {
         for (Diag pastDiag : pastDiags) {
             if (pastDiag.getNegative() != null) {

+ 17 - 0
kernel/src/main/java/com/lantone/qc/kernel/util/CatalogueUtil.java

@@ -475,4 +475,21 @@ public class CatalogueUtil {
         }
         return textJoin;
     }
+
+    /**
+     * 拼接info信息
+     * @param infoStr
+     * @param content
+     * @return
+     */
+    public static String concatInfo(String infoStr, String content) {
+        if (StringUtil.isBlank(infoStr)) {
+            infoStr += content;
+        } else {
+            if (!infoStr.contains(content)) {
+                infoStr += "," + content;
+            }
+        }
+        return infoStr;
+    }
 }