Merge remote-tracking branch 'origin/beilun/dev' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/behospitalized/BEH0011.java

@@ -145,7 +145,7 @@ public class BEH0011 extends QCCatalogue {
                 String symptom = jsonArray.getString(0);
                 /* 相似度分数 */
                 double likeRate = jsonArray.getDoubleValue(1);
-                if (likeRate > 0.85) {
+                if (likeRate > 0.80) {
                     matchSum++;
                 } else {
                     infoStr = CatalogueUtil.concatInfo(infoStr, presentPastDiag);

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/firstcourserecord/FIRC0095.java

@@ -23,6 +23,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName : FIRC0095
@@ -123,6 +124,7 @@ public class FIRC0095 extends QCCatalogue {
         List<String> initDiags = new ArrayList<>();
         List<Diag> initialDiagDiags = initialDiagLabel.getDiags();
         addInitDiagHospitalName(initDiags, initialDiagDiags);
+        initDiags = initDiags.stream().distinct().collect(Collectors.toList());
 
         String infoStr = "";
         int matchSum = 0;
@@ -135,7 +137,7 @@ public class FIRC0095 extends QCCatalogue {
                 String symptom = jsonArray.getString(0);
                 /* 相似度分数 */
                 double likeRate = jsonArray.getDoubleValue(1);
-                if (likeRate > 0.85) {
+                if (likeRate > 0.80) {
                     matchSum++;
                 } else {
                     infoStr = CatalogueUtil.concatInfo(infoStr, presentPastDiag);

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/clinicalblood/CLI0306.java

@@ -5,6 +5,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
 import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -37,6 +38,10 @@ public class CLI0306 extends QCCatalogue {
                 if (StringUtils.isNotEmpty(infusionReason)) {
                     continue;
                 }
+                String title = cliBStructureMap.get("病程标题");
+                if (StringUtil.isNotBlank(title) && title.contains("蛋白")){
+                    continue;
+                }
                 String record = cliBStructureMap.get("病情记录");
                 if (!record.contains("贫血")&&!record.contains("低蛋白")) {
                     status.set("-1");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/clinicalblood/CLI0569.java

@@ -37,6 +37,11 @@ public class CLI0569 extends QCCatalogue {
                     matchSum++;
                     continue;
                 }
+                String title = cliBStructureMap.get("病程标题");
+                if (StringUtil.isNotBlank(title) && title.contains("蛋白")){
+                    matchSum++;
+                    continue;
+                }
                 String record = cliBStructureMap.get("病情记录");
                 if (record.contains("A型") || record.contains("B型") || record.contains("AB型") || record.contains("O型")) {
                     matchSum++;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/clinicalblood/CLI0571.java

@@ -5,6 +5,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
 import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -27,6 +28,10 @@ public class CLI0571 extends QCCatalogue {
         if (clinicalBloodDocs != null && clinicalBloodDocs.size() > 0) {
             for (ClinicalBloodDoc cliB : clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
+                String title = cliBStructureMap.get("病程标题");
+                if (StringUtil.isNotBlank(title) && title.contains("蛋白")){
+                    continue;
+                }
                 String record = cliBStructureMap.get("病情记录");
                 if (!record.contains("Rh") && !record.contains("rh")&&!record.contains("RH")) {
                     status.set("-1");