宁海医院问题修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0007.java

@@ -41,7 +41,7 @@ public class BEH0007 extends QCCatalogue {
             status.set("0");
         } else {
             List<Clinical> clinicals = chiefLabel.getClinicals();
-            if (clinicals.size() > 0) {
+            if (clinicals != null && clinicals.size() > 0) {
                 Clinical clinical = clinicals.get(0);
                 List<PD> timestamp = clinical.getTimestamp();
                 if (timestamp.size() > 0) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0008.java

@@ -20,23 +20,24 @@ import java.util.List;
 @Component
 public class BEH0008 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
         if (inputInfo.getBeHospitalizedDoc() == null) {
-            status.set("0");
             return;
         }
         ChiefLabel chiefLabel = inputInfo.getBeHospitalizedDoc().getChiefLabel();
         if (chiefLabel == null) {
-            status.set("0");
             return;
         }
         String chiefText = chiefLabel.getText();
         if (StringUtil.isBlank(chiefText)) {
-            status.set("0");
             return;
         }
         List<Clinical> clinicals = chiefLabel.getClinicals();
-        if (clinicals != null && clinicals.size() <= 3) {
-            status.set("0");
+        if (clinicals == null) {
+            return;
+        }
+        if (clinicals.size() > 3) {
+            status.set("-1");
         }
 
     }

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

@@ -64,17 +64,25 @@ public class THR02900 extends QCCatalogue {
             if (StringUtil.isNotBlank(opeAssName)) {
                 split = opeAssName.split("、");
                 firstAssistant = structureMap.get("助手");
-                opeEndTime = structureMap.get("手术日期");
             } else {
                 firstAssistant = structureMap.get("一助");
-                //取得手术时间截取结束时间（格式 2020-07-24 10:30-2020-07-24 11:45）
-                opeEndTime = structureMap.get("手术日期");
-                if (StringUtil.isBlank(opeEndTime) || opeEndTime.contains("年月日")) {
-                    continue;
+            }
+            //取得手术时间截取结束时间（格式 2020-07-24 10:30-2020-07-24 11:45）
+            opeEndTime = structureMap.get("手术日期");
+            if (StringUtil.isNotBlank(opeEndTime)) {
+                if (opeEndTime.contains("结束")) {
+                    opeEndTime = opeEndTime.substring(0, opeEndTime.indexOf("结束")).replace("开始:", "");
+                }
+                if (opeEndTime.contains("年月日")) {
+                    opeEndTime = DateUtil.nowString();
+                }
+                //取不到时间不判断规则
+                if (StringUtil.parseDateTime(opeEndTime) == null) {
+                    return;
                 }
             }
             String chiefSurgeon = structureMap.get("主刀医师");
-            if (chiefSurgeon.contains("、")) {
+            if (StringUtil.isNotBlank(chiefSurgeon) && chiefSurgeon.contains("、")) {
                 chiefSurgeon = chiefSurgeon.split("、")[0];
             }
             Date opeEndDate = CatalogueUtil.parseStringDate(opeEndTime);
@@ -126,7 +134,7 @@ public class THR02900 extends QCCatalogue {
                     StringUtil.isNotBlank(firstAssistant) && !allTitle.contains(firstAssistant)) {
                 status.set("-1");
                 return;
-            } else if (StringUtil.isBlank(chiefSurgeon) && StringUtil.isBlank(firstAssistant) && split.length > 1) {
+            } else if (StringUtil.isBlank(chiefSurgeon) && StringUtil.isBlank(firstAssistant) && split != null && split.length > 1) {
                 for (int i = 0; i < split.length; i++) {
                     if (allTitle.contains(split[i])) {
                         return;

trans/src/main/java/com/lantone/qc/trans/ninghaiyiyi/util/NingHaiYiYiBeHospitalizedHtmlAnalysis.java

@@ -28,7 +28,7 @@ public class NingHaiYiYiBeHospitalizedHtmlAnalysis implements NingHaiYiYiHtmlAna
     public Map<String, String> analysis(String... args) {
         Map<String, String> map = Maps.newLinkedHashMap();
         try {
-            String html = args[0];
+            String html = args[0].replace("&nbsp;"," ");
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);

trans/src/main/java/com/lantone/qc/trans/ninghaiyiyi/util/NingHaiYiYiOperationHtmlAnalysis.java

@@ -24,7 +24,7 @@ public class NingHaiYiYiOperationHtmlAnalysis implements NingHaiYiYiHtmlAnalysis
     public Map<String, String> analysis(String... args) {
         Map<String, String> map = Maps.newLinkedHashMap();
         try {
-            String html = args[0];
+            String html = args[0].replace("&nbsp;"," ");
             String recTitle = args[1];
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0).getElementById("main");