Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/src/main/java/com/lantone/qc/pub/model/doc/LeaveHospitalDoc.java

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

@@ -18,11 +18,12 @@ import java.util.Map;
 @Component
 public class FIRP0255 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String name = firstpageStructureMap.get(Content.outcome).toString();
-            if (!CatalogueUtil.isEmpty(name)){
-                status = "0";
+            if (CatalogueUtil.isEmpty(name)){
+                status = "-1";
             }
         }
     }

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

@@ -0,0 +1,30 @@
+package com.lantone.qc.kernel.catalogue.firstpagerecord;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.kernel.util.CatalogueUtil;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @ClassName : FIRP0258
+ * @Description : 门诊诊断与住院诊断符合情况未填
+ * @Author : 楼辉荣
+ * @Date: 2020-03-06 17:28
+ */
+@Component
+public class FIRP0258 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status = "0";
+        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
+            if (CatalogueUtil.isEmpty(map.get(Content.o_i))){
+                status = "-1";
+            }
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.lantone.qc.kernel.catalogue.firstpagerecord;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.kernel.util.CatalogueUtil;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @ClassName : FIRP0260
+ * @Description :  入院诊断与出院诊断符合情况未填
+ * @Author : 楼辉荣
+ * @Date: 2020-03-06 17:28
+ */
+@Component
+public class FIRP0260 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status = "0";
+        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
+            if (CatalogueUtil.isEmpty(map.get(Content.i_o))){
+                status = "-1";
+            }
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.lantone.qc.kernel.catalogue.firstpagerecord;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.kernel.util.CatalogueUtil;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @ClassName : FIRP0262
+ * @Description :  术前诊断与术后诊断符合情况未填
+ * @Author : 楼辉荣
+ * @Date: 2020-03-06 17:28
+ */
+@Component
+public class FIRP0262 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status = "0";
+        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
+            if (CatalogueUtil.isEmpty(map.get(Content.ob_oa))){
+                status = "-1";
+            }
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.lantone.qc.kernel.catalogue.firstpagerecord;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.kernel.util.CatalogueUtil;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @ClassName : FIRP0264
+ * @Description :  临床诊断与病理诊断符合情况未填
+ * @Author : 楼辉荣
+ * @Date: 2020-03-06 17:28
+ */
+@Component
+public class FIRP0264 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status = "0";
+        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
+            if (CatalogueUtil.isEmpty(map.get(Content.clinical_pathology))){
+                status = "-1";
+            }
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.lantone.qc.kernel.catalogue.firstpagerecord;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.kernel.util.CatalogueUtil;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @ClassName : FIRP0266
+ * @Description :  放射诊断与病理诊断符合情况未填
+ * @Author : 楼辉荣
+ * @Date: 2020-03-06 17:28
+ */
+@Component
+public class FIRP0266 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status = "0";
+        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
+            if (CatalogueUtil.isEmpty(map.get(Content.radiation_pathology))){
+                status = "-1";
+            }
+        }
+    }
+}

public/src/main/java/com/lantone/qc/pub/Content.java

@@ -143,12 +143,18 @@ public class Content {
     public static final String contact_address = "联系人地址";
     public static final String contact_phone = "联系人电话";
 
+    public static final String diagnose_cts = "诊断符合情况";
+    public static final String o_i = "门诊与出院";
+    public static final String i_o = "入院与出院";
+    public static final String ob_oa = "术前与术后";
+    public static final String clinical_pathology = "临床与病理";
+    public static final String radiation_pathology = "放射与病理";
+
     public static final String outpatientEmergencyDiag = "门急诊诊断";
     public static final String diagCode = "诊断编码";
     public static final String diagnose_name = "诊断名称";
     public static final String in_status = "入院情况";
     public static final String out_status = "出院情况";
-
     public static final String dischargeDiag = "出院诊断";
     public static final String dp_out = "损伤、中毒外部原因";
     public static final String pathologyDiagnose = "病理诊断";
@@ -197,6 +203,9 @@ public class Content {
     public static final String re_hospitalization="31天内再住院计划";
 
 
+
+
+
     public static final String type = "性";
     public static final String otherCharge = "其他费用";
     public static final String charge = "费用";

public/src/main/java/com/lantone/qc/pub/model/doc/LeaveHospitalDoc.java

@@ -1,8 +1,14 @@
 package com.lantone.qc.pub.model.doc;
 
+import com.lantone.qc.pub.model.label.ChiefLabel;
+import com.lantone.qc.pub.model.label.DoctorAdviceLabel;
+import com.lantone.qc.pub.model.label.NoticeLabel;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @ClassName : LeaveHospitalDoc
  * @Description : 出院小结
@@ -11,5 +17,10 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class LeaveHospitalDoc extends ModelDoc {
+public class LeaveHospitalDoc {
+    //出院小结所有结构化信息存储
+    private Map<String, String> structureMap = new HashMap<>();
+    private ChiefLabel chiefLabel;  //主诉
+    private NoticeLabel noticeLabel;//注意事项
+    private DoctorAdviceLabel doctorAdviceLabel;//医嘱
 }

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

@@ -0,0 +1,15 @@
+package com.lantone.qc.pub.model.label;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName : DoctorAdvice
+ * @Description : 医嘱
+ * @Author : 楼辉荣
+ * @Date: 2020-03-17 14:44
+ */
+@Getter
+@Setter
+public class DoctorAdviceLabel extends GeneralLabel {
+}

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

@@ -0,0 +1,15 @@
+package com.lantone.qc.pub.model.label;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName : NoticeLabel
+ * @Description : 注意事项，主要出现在出院小结
+ * @Author : 楼辉荣
+ * @Date: 2020-03-17 14:42
+ */
+@Setter
+@Getter
+public class NoticeLabel extends GeneralLabel {
+}