Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,37 @@
+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 com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
+import com.lantone.qc.pub.model.doc.consultation.ConsultationRecordDoc;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : CON0289
+ * @Description : 会诊单会诊医师未签字
+ * @Author : kwz
+ * @Date: 2020-03-06 17:28
+ */
+@Component
+public class CON0289 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
+        if(consultationDocs !=  null && consultationDocs.size()>0){
+            for (ConsultationDoc cd:consultationDocs) {
+                ConsultationRecordDoc consultationRecordDoc = cd.getConsultationRecordDoc();
+                Map<String, String> structureMap = consultationRecordDoc.getStructureMap();
+                if(structureMap != null ){
+                    if(StringUtils.isEmpty(structureMap.get("医师签名"))){
+                        status.set("-1");
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -44,9 +44,10 @@ public class THR0144 extends QCCatalogue {
                     lastWardRoundTitle = WardRoundTitle;
                 }
             }
-            if (lastWardCRoundRecord.contains("出院") && !CatalogueUtil.isEmpty(lastWardRoundTitle)
+            if (!lastWardCRoundRecord.contains("出院")
+                    || (!CatalogueUtil.isEmpty(lastWardRoundTitle)
                     && !CatalogueUtil.subTitle(lastWardRoundTitle).contains(Content.indications)
-                    && !CatalogueUtil.subTitle(lastWardRoundTitle).contains(Content.director)) {
+                    && !CatalogueUtil.subTitle(lastWardRoundTitle).contains(Content.director))) {
                 status.set("-1");
             }
         }