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

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

@@ -0,0 +1,33 @@
+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 : FIRP02904
+ * @Description : 过敏药物未填写
+ * @Author : 胡敬
+ * @Date: 2020-06-04 16:13
+ */
+@Component
+public class FIRP02904 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (inputInfo.getFirstPageRecordDoc() == null) {
+            status.set("0");
+            return;
+        }
+        if (inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String name = firstpageStructureMap.get(Content.allergyDrug);
+            if (!CatalogueUtil.isEmpty(name)) {
+                status.set("0");
+            }
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+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 : FIRP02905
+ * @Description : 接收机构名称未填写
+ * @Author : 胡敬
+ * @Date: 2020-06-04 16:14
+ */
+@Component
+public class FIRP02905 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (inputInfo.getFirstPageRecordDoc() == null) {
+            status.set("0");
+            return;
+        }
+        if (inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String name = firstpageStructureMap.get(Content.receivingOrganization);
+            if (!CatalogueUtil.isEmpty(name)) {
+                status.set("0");
+            }
+        }
+    }
+}

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

@@ -178,6 +178,7 @@ public class Content {
     public static final String dischargeTime = "出院时间";
     public static final String outDept = "出院科别";
     public static final String outHouse = "出院病房";
+    public static final String receivingOrganization = "接收机构名称";
     public static final String actualStay = "实际住院天数";//病案首页用
     public static final String drugAllergy = "药物过敏";
     public static final String allergyDrug = "过敏药物";

trans/src/main/java/com/lantone/qc/trans/changx/ChangxClinicalBloodDocTrans.java

@@ -41,7 +41,7 @@ public class ChangxClinicalBloodDocTrans extends ModelDocTrans {
         if (StringUtil.isBlank(text)) {
             text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region");
         }
-        Map<String, String> cutWordMap = Preproc.getCutWordMap(true, sourceTitles, text);
+        Map<String, String> cutWordMap = Preproc.getCutWordMap(true, sourceTitles, "");
         cutWordMap.putAll(structureMap);
         if (StringUtil.isNotBlank(structureMap.get("输注种类、血型、数量"))) {
             cutWordMap.put("输血成分及数量", structureMap.get("输注种类、血型、数量"));
@@ -73,6 +73,7 @@ public class ChangxClinicalBloodDocTrans extends ModelDocTrans {
             "输注结束=",
             "输注种类、血型、数量=",
             "输注过程=",
+            "++++复选框=输注方式",
             "签名++++=记录医师",
             "签名时间="
     );