长兴、台州修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH02978.java

@@ -17,9 +17,17 @@ public class BEH02978 extends QCCatalogue {
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
+            return;
+        }
+        String bhAllergy = inputInfo.getBeHospitalizedDoc().getStructureMap().get("过敏史");
+        String fipAllergy = inputInfo.getFirstPageRecordDoc().getStructureMap().get("过敏药物");
+        if (StringUtil.isBlank(bhAllergy) || StringUtil.isBlank(fipAllergy)){
             return;
         }
 
+        if (!bhAllergy.equals(fipAllergy)){
+            status.set("-1");
+        }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH02979.java

@@ -0,0 +1,30 @@
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @ClassName : BEH02979
+ * @Description :  子女健康状况未描述（结构化数据）
+ * @Author : 胡敬
+ * @Date: 2020-06-22 10:16
+ */
+@Component
+public class BEH02979 extends QCCatalogue {
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        if (inputInfo.getBeHospitalizedDoc() == null) {
+            return;
+        }
+        Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+        if (StringUtil.isBlank(beHospitalStructureMap.get("子女健康状况"))) {
+            status.set("-1");
+        }
+    }
+}

kernel/src/main/java/com/lantone/qc/kernel/catalogue/dutyshiftsystem/DUT0296.java

@@ -40,7 +40,7 @@ public class DUT0296 extends QCCatalogue {
         String leaveDate = structureMap_leave.get("出院时间");//2019-12-10 10:49
         /* 住院天数小于30天不报错*/
         int lengthOfStayNum = 0;
-        if (StringUtil.isNotBlank(beDate) || StringUtil.isNotBlank(leaveDate)) {
+        if (StringUtil.isNotBlank(beDate) && StringUtil.isNotBlank(leaveDate)) {
             lengthOfStayNum = dateDifference(beDate, leaveDate);
             if (lengthOfStayNum < 30) {
                 return;

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcessThreeLevelWard.java

@@ -203,7 +203,8 @@ public class EntityProcessThreeLevelWard extends EntityProcess {
                     start = Integer.parseInt(lemma.getPosition());
                     title = lemma.getProperty();//截取的这一段文本的标题
                 } else {
-                    subContentIndex = start + lemma.getText().length() + 1 + "," + Integer.parseInt(lemma.getPosition());
+                    /*subContentIndex = start + lemma.getText().length() + 1 + "," + Integer.parseInt(lemma.getPosition());*/
+                    subContentIndex = start + "," + Integer.parseInt(lemma.getPosition());
                     putSubContent(titleText, title, subContentIndex);
                     start = Integer.parseInt(lemma.getPosition());
                     title = lemma.getProperty();//截取的这一段文本的标题