Merge branch 'master' of http://192.168.2.236:10080/louhr/qc

kernel/src/main/java/com/lantone/qc/kernel/catalogue/QCCatalogue.java

@@ -3,10 +3,8 @@ package com.lantone.qc.kernel.catalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -16,15 +14,32 @@ import java.util.Map;
  * @Date: 2020-03-04 11:24
  */
 public class QCCatalogue {
-    protected Map<String, QCCatalogue> qcCatalogueMap = CatalogueUtil.qcCatalogueMap;
+
+    protected String status = "-1";
+    protected Map<String, String> resultDetail;
+    private String className = this.getClass().getSimpleName();
+
+    public QCCatalogue() {
+        CatalogueUtil.qcCatalogueMap.put(className, this);
+    }
+
     /**
-     *
-     * @return  如
+     * @return 如
      * {
-     *     "BEH001":{"status":"-1", "info": "发热"}
+     * "BEH001":{"status":"-1", "info": "发热"}
      * }
      */
     public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (outputInfo.getResult().get(className) != null) {
+            return;
+        }
+        resultDetail = new HashMap<>();
+        resultDetail.put("info", "");
+        start(inputInfo, outputInfo);
+        outputInfo.getResult().put(className, resultDetail);
+    }
+
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+    }
 
-    };
 }

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

@@ -4,9 +4,14 @@ 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.entity.Clinical;
+import com.lantone.qc.pub.model.entity.PD;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,10 +22,27 @@ import java.util.Map;
  */
 @Component
 public class BEH0001 extends QCCatalogue {
-    public BEH0001() {
-        qcCatalogueMap.put("BEH0001", this);
-    }
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
-        System.out.println("111111111");
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        Map<String,String> statusMap = new HashMap<>();
+        String status = "0";
+        String infos = "";
+        List<Clinical> clinicals = inputInfo.getBeHospitalizedDoc().getChiefLabel().getClinicals();
+        if(clinicals.size()>0){
+            for (Clinical clinical:clinicals) {
+                String clinicalName = clinical.getName();
+                List<PD> timestamp = clinical.getTimestamp();
+                if(timestamp == null){
+                    infos = infos+","+clinicalName;
+                }
+            }
+        }
+        if(StringUtils.isNotEmpty(infos)){
+            status = "-1";
+        }
+        statusMap.put("status",status);
+        statusMap.put("info",infos);
+        Map<String, Map<String, String>> result = outputInfo.getResult();
+        result.put("BEH0001",statusMap);
+        outputInfo.setResult(result);
     }
 }

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

@@ -0,0 +1,32 @@
+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.model.entity.Wound;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 外伤史未填写
+ * @author: rengb
+ * @time: 2020/3/10 13:53
+ */
+@Component
+public class BEH0024 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<Wound> wounds = inputInfo.getBeHospitalizedDoc().getPastLabel().getWounds();
+        if (ListUtil.isNotEmpty(wounds)) {
+            if (wounds.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
+                status = "0";
+            }
+        }
+        resultDetail.put("status", status);
+    }
+
+}

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

@@ -0,0 +1,32 @@
+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.model.entity.Operation;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 手术史未填写
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0025 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<Operation> operations = inputInfo.getBeHospitalizedDoc().getPastLabel().getOperations();
+        if (ListUtil.isNotEmpty(operations)) {
+            if (operations.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
+                status = "0";
+            }
+        }
+        resultDetail.put("status", status);
+    }
+
+}

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

@@ -0,0 +1,32 @@
+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.model.entity.AllergyFood;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 食物过敏史未填写
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0026 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<AllergyFood> allergyFoods = inputInfo.getBeHospitalizedDoc().getPastLabel().getAllergyFoods();
+        if (ListUtil.isNotEmpty(allergyFoods)) {
+            if (allergyFoods.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
+                status = "0";
+            }
+        }
+        resultDetail.put("status", status);
+    }
+
+}

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

@@ -0,0 +1,32 @@
+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.model.entity.AllergyMedicine;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 药物过敏史未填写
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0027 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<AllergyMedicine> allergyMedicines = inputInfo.getBeHospitalizedDoc().getPastLabel().getAllergyMedicines();
+        if (ListUtil.isNotEmpty(allergyMedicines)) {
+            if (allergyMedicines.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
+                status = "0";
+            }
+        }
+        resultDetail.put("status", status);
+    }
+
+}

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

@@ -0,0 +1,32 @@
+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.model.entity.BloodTransfusion;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 输血史未填写
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0028 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<BloodTransfusion> bloodTransfusions = inputInfo.getBeHospitalizedDoc().getPastLabel().getBloodTransfusions();
+        if (ListUtil.isNotEmpty(bloodTransfusions)) {
+            if (bloodTransfusions.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
+                status = "0";
+            }
+        }
+        resultDetail.put("status", status);
+    }
+
+}

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

@@ -0,0 +1,32 @@
+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.model.entity.Vaccinate;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 预防接种史未填写
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0029 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<Vaccinate> vaccinates = inputInfo.getBeHospitalizedDoc().getPastLabel().getVaccinates();
+        if (ListUtil.isNotEmpty(vaccinates)) {
+            if (vaccinates.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
+                status = "0";
+            }
+        }
+        resultDetail.put("status", status);
+    }
+
+}

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

@@ -0,0 +1,32 @@
+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.model.entity.DiagInfectious;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 传染病史未填写
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0030 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<DiagInfectious> diagInfectiouses = inputInfo.getBeHospitalizedDoc().getPastLabel().getDiagInfectiouses();
+        if (ListUtil.isNotEmpty(diagInfectiouses)) {
+            if (diagInfectiouses.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
+                status = "0";
+            }
+        }
+        resultDetail.put("status", status);
+    }
+
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0031 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0032 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0033 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0034 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0035 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0036 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0037 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0038 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0039 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0040 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,25 @@
+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;
+
+/**
+ * @Description: 个人史未填写
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0041 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (StringUtil.isNotBlank(inputInfo.getBeHospitalizedDoc().getPersonalLabel().getText())) {
+            status = "0";
+        }
+        resultDetail.put("status", status);
+    }
+
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0042 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0043 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0044 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0045 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0046 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0047 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0048 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0049 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0050 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0051 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0052 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0053 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0054 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0055 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0056 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0057 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+
+    }
+}

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

@@ -0,0 +1,20 @@
+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 org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0058 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+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 org.springframework.stereotype.Component;
+
+/**
+ * @ClassName : BEH0059
+ * @Description : 月经史未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-10 10:10
+ */
+@Component
+public class BEH0059 extends QCCatalogue {
+    @Override
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getMenstrualLabel().getText())) {
+            status = "0";
+            resultDetail.put("status", status);
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+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 org.springframework.stereotype.Component;
+
+/**
+ * @ClassName : BEH0069
+ * @Description : 家族史未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-10 15:08
+ */
+@Component
+public class BEH0069 extends QCCatalogue {
+    @Override
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getFamilyLabel().getText())) {
+            status = "0";
+            resultDetail.put("status", status);
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+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 org.springframework.stereotype.Component;
+
+/**
+ * @ClassName : BEH0076
+ * @Description : 体格检查未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-10 15:10
+ */
+@Component
+public class BEH0076 extends QCCatalogue {
+    @Override
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getVitalLabel().getText())) {
+            status = "0";
+            resultDetail.put("status", status);
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+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 org.springframework.stereotype.Component;
+
+/**
+ * @ClassName : BEH0079
+ * @Description : 专科检查未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-10 15:12
+ */
+@Component
+public class BEH0079 extends QCCatalogue {
+    @Override
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getVitalLabelSpecial().getText())) {
+            status = "0";
+            resultDetail.put("status", status);
+        }
+    }
+}

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0299.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.clinicalblood;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class CLI0299 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.consultation;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class CON0280 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathcasediscuss/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.deathcasediscuss;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+@Component
+public class DEAC0097 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathrecord/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.deathrecord;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+@Component
+public class DEAR0337 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/difficultcasediscuss/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.difficultcasediscuss;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+@Component
+public class DIF0280 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

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

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.dutyshiftsystem;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+@Component
+public class DUT0280 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.firstcourserecord;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+@Component
+public class FIRC0083 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.firstpagerecord;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+@Component
+public class FIRP0157 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/CON0280.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.leavehospital;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
-public class CON0280 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+@Component
+public class LEA0280 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/nursingsystem/NUR0293.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.nursingsystem;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class NUR0293 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0310.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.operationdiscussion;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class OPE0310 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0328.java

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.preoperativediscussion;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class PRE0328 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

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

@@ -3,6 +3,7 @@ package com.lantone.qc.kernel.catalogue.threelevelward;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28
  */
+@Component
 public class THR0122 extends QCCatalogue {
-    public void execute(InputInfo inputInfo, OutputInfo outputInfo) {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/AIAnalyze.java

@@ -17,10 +17,8 @@ public class AIAnalyze {
         this.crfServiceClient = crfService;
     }
     public void AIprocess(InputInfo inputInfo){
-//        Map<String, CrfOut> stringCrfOutMap = beHospitalizedAI.medrec_new(inputInfo, crfServiceClient);
             beHospitalizedAI.medrec(inputInfo, crfServiceClient);
 
-
     }
 
 

kernel/src/main/java/com/lantone/qc/kernel/util/CatalogueUtil.java

@@ -1,6 +1,8 @@
 package com.lantone.qc.kernel.util;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.util.StringUtil;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.core.annotation.Order;
@@ -19,4 +21,9 @@ import java.util.Map;
 @Setter
 public class CatalogueUtil {
     public static Map<String, QCCatalogue> qcCatalogueMap = new HashMap<>();
+
+
+    public static boolean isEmpty(String content) {
+        return StringUtil.isBlank(content.replaceAll("[\r\n|/r/n|\n|/n|/t]", ""));
+    }
 }

kernel/src/main/java/com/lantone/qc/kernel/web/controller/QCController.java

@@ -1,20 +1,17 @@
 package com.lantone.qc.kernel.web.controller;
 
 import com.lantone.qc.kernel.analysis.QCAnalysis;
+import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.vo.QueryVo;
 import com.lantone.qc.pub.res.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 /**
  * @ClassName : QCController
  * @Description : 质控总入口
@@ -28,12 +25,13 @@ public class QCController {
 
     @Autowired
     private QCAnalysis qCAnalysis;
+
     @ApiOperation(value = "质控外部接口，需要token信息", notes = "")
     @PostMapping("rec")
-    public Response<Map<String, Object>> extract(@RequestBody QueryVo queryVo) {
+    public Response<OutputInfo> extract(@RequestBody QueryVo queryVo) {
         Response response = new Response();
-        qCAnalysis.anlysis(queryVo);
+        response.setData(qCAnalysis.anlysis(queryVo));
         return response;
     }
-    
+
 }

public/src/main/java/com/lantone/qc/pub/model/InputInfo.java

@@ -16,6 +16,11 @@ import java.util.Map;
 @Getter
 @Setter
 public class InputInfo {
+
+    /**
+     * 将要执行的规则，PRECOND--规则执行前置条件
+     * {"BEH0001":{"PRECOND":"BEH0002,BEH0003,BEH0004"}}
+     */
     private Map<String, Map<String, String>> inputCatalogueMap = new HashMap<>();
     //入院病历
     private BeHospitalizedDoc beHospitalizedDoc;

public/src/main/java/com/lantone/qc/pub/model/label/PastLabel.java

@@ -19,8 +19,8 @@ public class PastLabel extends GeneralLabel{
     private List<Wound> wounds;//外伤史
     private List<DiagInfectious> diagInfectiouses;//传染病史
     private List<Allergy> allergies;//过敏史
-    private List<AllergyFood> allergyFoods;
-    private List<AllergyMedicine> allergyMedicines;
+    private List<AllergyFood> allergyFoods;//食物过敏史
+    private List<AllergyMedicine> allergyMedicines;//药物过敏史
     private List<AllergyDesc> allergyDescs;
     private List<BloodTransfusion> bloodTransfusions;//输血史
     private List<Operation> operations;//手术史

trans/src/main/java/com/lantone/qc/trans/comsis/ModelDocGenerate.java

@@ -34,59 +34,73 @@ public class ModelDocGenerate {
      */
     public BeHospitalizedDoc beHospitalizedDocGen(Map<String, String> structureMap) {
         BeHospitalizedDoc beHospitalizedDoc = new BeHospitalizedDoc();
-        beHospitalizedDoc.setStructureMap(structureMap);
 
         ChiefLabel chiefLabel = new ChiefLabel();
         chiefLabel.setText(structureMap.get("主诉"));
         beHospitalizedDoc.setChiefLabel(chiefLabel);
+        structureMap.remove("主诉");
 
         PresentLabel presentLabel = new PresentLabel();
         presentLabel.setText(structureMap.get("现病史"));
         beHospitalizedDoc.setPresentLabel(presentLabel);
+        structureMap.remove("现病史");
 
         PastLabel pastLabel = new PastLabel();
         pastLabel.setText(structureMap.get("既往史"));
         beHospitalizedDoc.setPastLabel(pastLabel);
+        structureMap.remove("既往史");
 
         PersonalLabel personalLabel = new PersonalLabel();
         personalLabel.setText(structureMap.get("个人史"));
         beHospitalizedDoc.setPersonalLabel(personalLabel);
+        structureMap.remove("个人史");
 
         MaritalLabel maritalLabel = new MaritalLabel();
         maritalLabel.setText(structureMap.get("婚育史"));
         beHospitalizedDoc.setMaritalLabel(maritalLabel);
+        structureMap.remove("婚育史");
 
         MenstrualLabel menstrualLabel = new MenstrualLabel();
         menstrualLabel.setText(structureMap.get("月经史"));
         beHospitalizedDoc.setMenstrualLabel(menstrualLabel);
+        structureMap.remove("月经史");
 
         FamilyLabel familyLabel = new FamilyLabel();
         familyLabel.setText(structureMap.get("家族史"));
         beHospitalizedDoc.setFamilyLabel(familyLabel);
+        structureMap.remove("家族史");
 
         VitalLabel vitalLabel = new VitalLabel();
         vitalLabel.setText(structureMap.get("体格检查"));
         beHospitalizedDoc.setVitalLabel(vitalLabel);
+        structureMap.remove("体格检查");
 
         VitalLabelSpecial vitalLabelSpecial = new VitalLabelSpecial();
         vitalLabelSpecial.setText(structureMap.get("专科体格检查"));
         beHospitalizedDoc.setVitalLabelSpecial(vitalLabelSpecial);
+        structureMap.remove("专科体格检查");
 
         PacsLabel pacsLabel = new PacsLabel();
         pacsLabel.setText(structureMap.get("辅助检查"));
         beHospitalizedDoc.setPacsLabel(pacsLabel);
+        structureMap.remove("辅助检查");
 
         InitialDiagLabel initialDiagLabel = new InitialDiagLabel();
         initialDiagLabel.setText(structureMap.get("初步诊断"));
         beHospitalizedDoc.setInitialDiagLabel(initialDiagLabel);
+        structureMap.remove("初步诊断");
 
         RevisedDiagLabel revisedDiagLabel = new RevisedDiagLabel();
         revisedDiagLabel.setText(structureMap.get("修正诊断"));
         beHospitalizedDoc.setRevisedDiagLabel(revisedDiagLabel);
+        structureMap.remove("修正诊断");
 
         SuppleDiagLabel suppleDiagLabel = new SuppleDiagLabel();
         suppleDiagLabel.setText(structureMap.get("补充诊断"));
         beHospitalizedDoc.setSuppleDiagLabel(suppleDiagLabel);
+        structureMap.remove("补充诊断");
+
+        beHospitalizedDoc.setStructureMap(structureMap);
 
         return beHospitalizedDoc;
     }