Merge remote-tracking branch 'origin/master'

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0026.java

@@ -25,8 +25,8 @@ public class BEH0026 extends QCCatalogue {
             long count = allergies.stream().filter(
                     i -> i != null
                             && StringUtil.isNotBlank(i.getName())
-                            && i.getAllergyFood() != null
-                            && StringUtil.isNotBlank(i.getAllergyFood().getName())
+//                            && i.getAllergyFood() != null
+//                            && StringUtil.isNotBlank(i.getAllergyFood().getName())
             ).count();
             if (count > 0) {
                 status.set("0");

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

@@ -4,10 +4,9 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 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.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,9 +19,8 @@ import java.util.Map;
 public class FIRP0182 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
-            List<Map<String, String>> pathologyDiagnose = (List) firstpageStructureMap.get(Content.pathologyDiagnose);
-            if (ListUtil.isNotEmpty(pathologyDiagnose)) {
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (StringUtil.isNotBlank(firstpageStructureMap.get(Content.pathologyDiagnose))) {
                 status.set("0");
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0328.java

@@ -21,7 +21,7 @@ public class PRE0328 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+       /* boolean isOperativePatient = true;//是手术患者(暂时默认是)
         if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
             if (ListUtil.isEmpty(operationDocs)) {
@@ -33,6 +33,15 @@ public class PRE0328 extends QCCatalogue {
                     }
                 }
             }
+        }*/
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs != null && operationDocs.size()>0){
+            for (OperationDoc operationDoc : operationDocs) {
+                if (operationDoc.getPreoperativeDiscussionDoc() == null) {
+                    status.set("-1");
+                    break;
+                }
+            }
         }
     }
 

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

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.changx;
 import com.google.common.collect.Lists;
 import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
+import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 
 import java.util.List;
@@ -18,9 +19,9 @@ public class ChangxDoctorAdviceDocTrans extends ModelDocTrans {
     @Override
     public List<DoctorAdviceDoc> extract(MedrecVo medrecVo) {
         List<DoctorAdviceDoc> retList = Lists.newArrayList();
-        List<Map<String, String>> contents = (List) medrecVo.getContent().get("content");
+        List<String> contents = (List) medrecVo.getContent().get("content");
         contents.forEach(content -> {
-            retList.add(getDoctorAdviceDoc(content));
+            retList.add(getDoctorAdviceDoc((Map) FastJsonUtils.getJsonToMap(content)));
         });
         return retList;
     }

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

@@ -28,7 +28,7 @@ public class ChangxFirstPageRecordDocTrans extends ModelDocTrans {
 //        structureExtMap.put(Content.outpatientEmergencyDiag, FastJsonUtils.getJsonToBean(content.get(Content.outpatientEmergencyDiag), Object.class));
         structureExtMap.put(Content.operative_information, FastJsonUtils.getJsonToBean(content.get(Content.operative_information), Object.class));
         structureExtMap.put(Content.dischargeDiag, FastJsonUtils.getJsonToBean(content.get(Content.dischargeDiag), Object.class));
-        structureExtMap.put(Content.pathologyDiagnose, FastJsonUtils.getJsonToBean(content.get(Content.pathologyDiagnose), Object.class));
+//        structureExtMap.put(Content.pathologyDiagnose, FastJsonUtils.getJsonToBean(content.get(Content.pathologyDiagnose), Object.class));
         firstPageRecordDoc.setStructureExtMap(structureExtMap);
         firstPageRecordDoc.setPageData(medrecVo.getContent());
 

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouFirstPageRecordDocTrans.java

@@ -32,7 +32,7 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
        /* structureExtMap.put(Content.outpatientEmergencyDiag, FastJsonUtils.getJsonToBean(content.get(Content.outpatientEmergencyDiag), Object.class));*/
         structureExtMap.put(Content.operative_information, FastJsonUtils.getJsonToBean(content.get(Content.operative_information), Object.class));
         structureExtMap.put(Content.dischargeDiag, FastJsonUtils.getJsonToBean(content.get(Content.dischargeDiag), Object.class));
-        structureExtMap.put(Content.pathologyDiagnose, FastJsonUtils.getJsonToBean(content.get(Content.pathologyDiagnose), Object.class));
+//        structureExtMap.put(Content.pathologyDiagnose, FastJsonUtils.getJsonToBean(content.get(Content.pathologyDiagnose), Object.class));
         firstPageRecordDoc.setStructureExtMap(structureExtMap);
         firstPageRecordDoc.setPageData(medrecVo.getContent());