kongwz 5 years ago
parent
commit
9fd2ea1118

+ 51 - 48
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0536.java

@@ -1,49 +1,52 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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 com.lantone.qc.pub.model.doc.consultation.ConsultationApplicationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0536
- * @Description : 会诊申请单中会诊日期及时间填写不规范
- * @Author : 胡敬
- * @Date: 2020-03-28 10:20
- */
-@Component
-public class CON0536 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationApplicationDoc consultationApplicationDoc = consultationDoc.getConsultationApplicationDoc();
-            if (consultationApplicationDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationApplicationDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("会诊日期及时间");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                continue;
-            }
-            Date consultationDate = StringUtil.parseDateTime(consultationDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
-
-            if (null == consultationDate) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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 com.lantone.qc.pub.model.doc.consultation.ConsultationApplicationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0536
+ * @Description : 会诊申请单中会诊日期及时间填写不规范
+ * @Author : 胡敬
+ * @Date: 2020-03-28 10:20
+ */
+@Component
+public class CON0536 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationApplicationDoc consultationApplicationDoc = consultationDoc.getConsultationApplicationDoc();
+            if (consultationApplicationDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationApplicationDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("会诊日期及时间")){
+                String consultationDateStr = consultationResultStructureMap.get("会诊日期及时间");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    continue;
+                }
+                Date consultationDate = StringUtil.parseDateTime(consultationDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
+
+                if (null == consultationDate) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 42 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0538.java

@@ -1,41 +1,43 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0538
- * @Description : 会诊结果单中申请科室未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:39
- */
-@Component
-public class CON0538 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("申请科室");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0538
+ * @Description : 会诊结果单中申请科室未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:39
+ */
+@Component
+public class CON0538 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("申请科室")){
+                String consultationDateStr = consultationResultStructureMap.get("申请科室");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0539.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0539
- * @Description : 会诊结果单中会诊类别未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:39
- */
-@Component
-public class CON0539 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("会诊类别");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0539
+ * @Description : 会诊结果单中会诊类别未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:39
+ */
+@Component
+public class CON0539 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("会诊类别")){
+                String consultationDateStr = consultationResultStructureMap.get("会诊类别");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0540.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0540
- * @Description : 会诊结果单中申请医生未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:39
- */
-@Component
-public class CON0540 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("申请医生");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0540
+ * @Description : 会诊结果单中申请医生未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:39
+ */
+@Component
+public class CON0540 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("申请医生")){
+                String consultationDateStr = consultationResultStructureMap.get("申请医生");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0541.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0541
- * @Description : 会诊结果单中会诊科室未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:39
- */
-@Component
-public class CON0541 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("会诊科室");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0541
+ * @Description : 会诊结果单中会诊科室未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:39
+ */
+@Component
+public class CON0541 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("会诊科室")){
+                String consultationDateStr = consultationResultStructureMap.get("会诊科室");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0542.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0542
- * @Description : 会诊结果单中申请日期未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:39
- */
-@Component
-public class CON0542 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("申请日期");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0542
+ * @Description : 会诊结果单中申请日期未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:39
+ */
+@Component
+public class CON0542 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("申请日期")){
+                String consultationDateStr = consultationResultStructureMap.get("申请日期");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0543.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0543
- * @Description : 会诊结果单中会诊到达日期未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:37
- */
-@Component
-public class CON0543 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("会诊到达时间");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0543
+ * @Description : 会诊结果单中会诊到达日期未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:37
+ */
+@Component
+public class CON0543 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("会诊到达时间")){
+                String consultationDateStr = consultationResultStructureMap.get("会诊到达时间");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 51 - 48
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0544.java

@@ -1,49 +1,52 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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 com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0544
- * @Description : 会诊结果单中会诊到达日期填写不规范
- * @Author : 胡敬
- * @Date: 2020-03-28 10:20
- */
-@Component
-public class CON0544 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("会诊到达时间");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                continue;
-            }
-            Date consultationDate = StringUtil.parseDateTime(consultationDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
-
-            if (null == consultationDate) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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 com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0544
+ * @Description : 会诊结果单中会诊到达日期填写不规范
+ * @Author : 胡敬
+ * @Date: 2020-03-28 10:20
+ */
+@Component
+public class CON0544 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("会诊到达时间")){
+                String consultationDateStr = consultationResultStructureMap.get("会诊到达时间");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    continue;
+                }
+                Date consultationDate = StringUtil.parseDateTime(consultationDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
+
+                if (null == consultationDate) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0545.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0545
- * @Description : 会诊结果单中病史回顾描述未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:39
- */
-@Component
-public class CON0545 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("病史回顾描述");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0545
+ * @Description : 会诊结果单中病史回顾描述未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:39
+ */
+@Component
+public class CON0545 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("病史回顾描述")){
+                String consultationDateStr = consultationResultStructureMap.get("病史回顾描述");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0546.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0546
- * @Description : 会诊结果单中会诊查体未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:39
- */
-@Component
-public class CON0546 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("会诊查体");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0546
+ * @Description : 会诊结果单中会诊查体未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:39
+ */
+@Component
+public class CON0546 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("会诊查体")){
+                String consultationDateStr = consultationResultStructureMap.get("会诊查体");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0547.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0547
- * @Description : 会诊结果单中当前诊断未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:39
- */
-@Component
-public class CON0547 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("当前诊断");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0547
+ * @Description : 会诊结果单中当前诊断未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:39
+ */
+@Component
+public class CON0547 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("当前诊断")){
+                String consultationDateStr = consultationResultStructureMap.get("当前诊断");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0548.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0548
- * @Description : 会诊结果单中会诊意见未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:39
- */
-@Component
-public class CON0548 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("会诊意见");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0548
+ * @Description : 会诊结果单中会诊意见未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:39
+ */
+@Component
+public class CON0548 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("会诊意见")){
+                String consultationDateStr = consultationResultStructureMap.get("会诊意见");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0549.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0549
- * @Description : 会诊结果单中会诊医师未签名
- * @Author : 胡敬
- * @Date: 2020-03-28 13:37
- */
-@Component
-public class CON0549 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("医师签名");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0549
+ * @Description : 会诊结果单中会诊医师未签名
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:37
+ */
+@Component
+public class CON0549 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("医师签名")){
+                String consultationDateStr = consultationResultStructureMap.get("医师签名");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 43 - 40
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0550.java

@@ -1,41 +1,44 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0550
- * @Description : 会诊结果单中会诊日期及时间未填写
- * @Author : 胡敬
- * @Date: 2020-03-28 13:37
- */
-@Component
-public class CON0550 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("会诊日期及时间");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0550
+ * @Description : 会诊结果单中会诊日期及时间未填写
+ * @Author : 胡敬
+ * @Date: 2020-03-28 13:37
+ */
+@Component
+public class CON0550 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("会诊日期及时间")){
+                String consultationDateStr = consultationResultStructureMap.get("会诊日期及时间");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }

+ 51 - 48
kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0551.java

@@ -1,49 +1,52 @@
-package com.lantone.qc.kernel.catalogue.consultation;
-
-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 com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
-import com.lantone.qc.pub.util.StringUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CON0551
- * @Description : 会诊结果单中会诊日期及时间填写不规范
- * @Author : 胡敬
- * @Date: 2020-03-28 10:20
- */
-@Component
-public class CON0551 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if (consultationDocs.size() == 0) {
-            return;
-        }
-        for (ConsultationDoc consultationDoc : consultationDocs) {
-            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
-            if (consultationResultsDoc == null) {
-                continue;
-            }
-            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
-            String consultationDateStr = consultationResultStructureMap.get("会诊日期及时间");
-            if (CatalogueUtil.isEmpty(consultationDateStr)) {
-                continue;
-            }
-            Date consultationDate = StringUtil.parseDateTime(consultationDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
-
-            if (null == consultationDate) {
-                status.set("-1");
-                return;
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.consultation;
+
+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 com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0551
+ * @Description : 会诊结果单中会诊日期及时间填写不规范
+ * @Author : 胡敬
+ * @Date: 2020-03-28 10:20
+ */
+@Component
+public class CON0551 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if (consultationDocs.size() == 0) {
+            return;
+        }
+        for (ConsultationDoc consultationDoc : consultationDocs) {
+            ConsultationResultsDoc consultationResultsDoc = consultationDoc.getConsultationResultsDoc();
+            if (consultationResultsDoc == null) {
+                continue;
+            }
+            Map<String, String> consultationResultStructureMap = consultationResultsDoc.getStructureMap();
+            if(consultationResultStructureMap.containsKey("会诊日期及时间")){
+                String consultationDateStr = consultationResultStructureMap.get("会诊日期及时间");
+                if (CatalogueUtil.isEmpty(consultationDateStr)) {
+                    continue;
+                }
+                Date consultationDate = StringUtil.parseDateTime(consultationDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
+
+                if (null == consultationDate) {
+                    status.set("-1");
+                    return;
+                }
+            }
+
+        }
+    }
 }