hecc 2 роки тому
батько
коміт
116f0dfe9e

+ 8 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0191.java

@@ -39,19 +39,23 @@ public class FIRP0191 extends QCCatalogue {
         status.set("0");
         //获取病案首页
         FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();
+        if (null == firstPageRecordDoc){
+            return;
+        }
         //病案首页结构化
         Map<String, Object> firstPageRecordDocStructureMap = firstPageRecordDoc.getStructureExtMap();
+        if (firstPageRecordDocStructureMap.isEmpty()){
+            return;
+        }
         //获取有创操作记录
         List<InvasiveOperationDoc> invasiveOperationDocs = inputInfo.getInvasiveOperationDocs();
         //获取手术中的(术后首次病程及谈话记录、手术记录、手术安全核查表)
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
         //获取手术信息(手术信息的第一行为“主要手术及操作名称”)
         List<Map<String, String>> mapList = (List<Map<String, String>>) firstPageRecordDocStructureMap.get(Content.operative_information);
-        String operationName = mapList.get(0).get("名称");
+        //获取手术名称
+        String operationName = mapList.get(0).get(Content.operative_name);
         //病案首页和病案首页结构化数据任一为空则通过
-        if (null == firstPageRecordDoc || firstPageRecordDocStructureMap.isEmpty()) {
-            return;
-        }
         if (null != operationName) {
             return;
         }

+ 8 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02844.java

@@ -33,15 +33,22 @@ public class FIRP02844 extends QCCatalogue {
         status.set("0");
         //获取病案首页
         FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();
+        if (null == firstPageRecordDoc){
+            return;
+        }
         //病案首页结构化
         Map<String, Object> firstPageRecordDocStructureMap = firstPageRecordDoc.getStructureExtMap();
+        if (firstPageRecordDocStructureMap.isEmpty()){
+            return;
+        }
         //获取有创操作记录
         List<InvasiveOperationDoc> invasiveOperationDocs = inputInfo.getInvasiveOperationDocs();
         //获取手术中的(术后首次病程及谈话记录、手术记录、手术安全核查表)
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
         //获取手术信息(手术信息的第一行为“主要手术及操作编码”)
         List<Map<String, String>> mapList = (List<Map<String, String>>) firstPageRecordDocStructureMap.get(Content.operative_information);
-        String operationCode = mapList.get(0).get("编码");
+        //获取手术编码
+        String operationCode = mapList.get(0).get(Content.operative_code);
         //病案首页和病案首页结构化数据任一为空则通过
         if (null == firstPageRecordDoc || firstPageRecordDocStructureMap.isEmpty()) {
             return;