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

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

@@ -29,7 +29,8 @@ public class BEH03002 extends QCCatalogue {
             String dateStr = structureMap.get(Content.admisDate);
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             try {
-                Date d = formatter.parse(dateStr);
+                String replace = dateStr.replace('/', '-');
+                Date d = formatter.parse(replace);
                 status.set("0");
             } catch (Exception e) {
                 status.set("-1");

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

@@ -28,7 +28,8 @@ public class BEH03003 extends QCCatalogue {
             String dateStr = structureMap.get("记录日期");
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             try {
-                Date d = formatter.parse(dateStr);
+                String replace = dateStr.replace('/', '-');
+                Date d = formatter.parse(replace);
                 status.set("0");
             } catch (Exception e) {
                 status.set("-1");

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

@@ -0,0 +1,40 @@
+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.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangfeng
+ * @Description:缺重要脏器疾病史
+ * @date 2020-06-29 15:46
+ */
+@Component
+public class BEH03005 extends QCCatalogue {
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        if (inputInfo.getBeHospitalizedDoc() == null) {
+            return;
+        }
+        Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+        if (structureMap != null) {
+            String[] strs = {"高血压","心脏病","糖尿病","脑血管疾病","呼吸系统疾病","肾脏疾病","肝脏疾病","内科疾病史其它"};
+            for(String s :strs){
+                String s1 = structureMap.get(s).trim();
+                if(s1!=null&&StringUtil.isEmpty(s1)){
+                    status.set("-1");
+                }
+            }
+
+        }
+
+    }
+}

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03010.java

@@ -0,0 +1,29 @@
+package com.lantone.qc.kernel.catalogue.threelevelward;
+
+import com.google.common.collect.Lists;
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+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.doc.ThreeLevelWardDoc;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-29 17:16
+ */
+@Component
+public class THR03010 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getThreeLevelWardDocs().size() == 0) {
+            return;
+        }
+
+    }
+}