北仑代码优化

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

@@ -10,6 +10,7 @@ import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +47,30 @@ public class BEH0035 extends QCCatalogue {
         if(wtAmNames.contains("止痛片")){
             return;
         }
+        String pastText = pastLabel.getText();
+        List<String> wtDiagList = new ArrayList<>();
         if (ListUtil.isNotEmpty(wtAmNames)) {
+            for (String wtDiagName : wtAmNames) {
+                int index = pastText.indexOf(wtDiagName);
+                if (index - 1 > 0) {
+                    String markText = pastText.substring(index - 1, index);
+                    if (markText.contains("\"") || markText.contains("“")) {
+                        continue;
+                    }
+                }
+                if (index + wtDiagName.length() + 1 < pastText.length() && index > 0) {
+                    String markText = pastText.substring(index + wtDiagName.length(), index + wtDiagName.length() + 1);
+                    if (markText.contains("\"") || markText.contains("”")) {
+                        continue;
+                    }
+                }
+                wtDiagList.add(wtDiagName);
+            }
+        }
+
+        if (ListUtil.isNotEmpty(wtDiagList)) {
             status.set("-1");
-            for (String wtAmName : wtAmNames) {
+            for (String wtAmName : wtDiagList) {
                 info.set(info.get() + wtAmName + " ");
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/operationdiscussion/OPE0322.java

@@ -30,12 +30,15 @@ public class OPE0322 extends QCCatalogue {
         long cou = inputInfo.getOperationDocs().stream().map(OperationDoc::getOperationRecordDoc).filter(Objects::nonNull).count();
         for (DoctorAdviceDoc dad : doctorAdviceDocs) {
             String name = dad.getStructureMap().get("医嘱项目名称");
+            String daStartDateStr = dad.getStructureMap().get("医嘱开始时间");
             if (name.contains("非手术") || name.contains("手术室") || (name.contains("手术") && name.contains("取消")) || (name.contains("暂停") && name.contains("手术")) || name.contains("静脉穿刺置管术") || name.startsWith("停") || name.contains("前一次")
                     || name.contains("特殊病人手术使用一次性卫生材料") || name.contains("人免疫缺陷病毒抗体检测免费")) {
                 continue;
             }
             if (name.contains("手术") && cou == 0) {
+                info.set("医嘱时间" + daStartDateStr);
                 status.set("-1");
+                return;
             }
         }
         /*long cou = inputInfo.getOperationDocs().stream().map(i -> i.getOperationRecordDoc()).filter(i -> i != null).count();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/operationdiscussion/OPE0369.java

@@ -95,7 +95,8 @@ public class OPE0369 extends QCCatalogue {
                         if (StringUtil.isNotBlank(recordDateStr) && date != null
                                 && StringUtil.parseDateTime(recordDateStr).before(date)) {
                             if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(recordDateStr), date, Long.valueOf(24 * 60))
-                                    && (makeTitle.contains("主刀") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))) {
+                                    && ((makeTitle.contains("主刀") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))
+                                    || (makeTitle.contains("术前") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
                                 operateCount++;
                             }
                         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR02900.java

@@ -101,7 +101,12 @@ public class THR02900 extends QCCatalogue {
                 }
             }
             //查房标题中有主刀
-            if (allTitle.contains("主刀")) {
+            if (allTitle.contains("主刀") || allTitle.contains("术后第一天")) {
+                return;
+            }
+            //病情记录对比
+            if ((StringUtil.isNotBlank(chiefSurgeon) && allPathography.contains(chiefSurgeon)) ||
+                    (StringUtil.isNotBlank(firstAssistant) && allPathography.contains(firstAssistant))) {
                 return;
             }
             //查房标题对比
@@ -116,11 +121,6 @@ public class THR02900 extends QCCatalogue {
                     }
                 }
             }
-            //病情记录对比
-            if ((StringUtil.isNotBlank(chiefSurgeon) && allPathography.contains(chiefSurgeon)) ||
-                    (StringUtil.isNotBlank(firstAssistant) && allPathography.contains(firstAssistant))) {
-                return;
-            }
         }
     }
 }