入院床位号/是否尸检(病案首页)更新

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

@@ -5,6 +5,7 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -20,10 +21,10 @@ public class FIRP0186 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
-            String outWay = firstpageStructureMap.get(Content.outWay).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+//            String outWay = firstpageStructureMap.get(Content.outWay).toString();
             String deadAutopsy = firstpageStructureMap.get(Content.deadAutopsy).toString();
-            if (!CatalogueUtil.isEmpty(outWay) && outWay.contains("死亡") && CatalogueUtil.isEmpty(deadAutopsy)){
+            if (StringUtils.isEmpty(deadAutopsy)){
                 status.set("-1");
             }
         }

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

@@ -173,7 +173,7 @@ public class Content {
     public static final String admisTime = "入院时间"; //病案首页用
     public static final String admitDept = "入院科别";
     public static final String admitHouse = "入院病房";
-    public static final String admitBedNumber = "入院床号";
+    public static final String admitBedNumber = "入院床位号码";
     public static final String transferDept = "转科科别";
     public static final String dischargeTime = "出院时间";
     public static final String outDept = "出院科别";