解析数据结构调整

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -154,89 +154,90 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
         }
 
+        if(!flag) {
+            if (log != null && log == 7l) {
+                specialDataWithKey2(encryptFlag, medicalRecord_7);
 
-        if (log == 7l) {
-            specialDataWithKey2(encryptFlag, medicalRecord_7);
-
-        }
-        if (log == 30l) {
-            specialDataWithKey2(encryptFlag, medicalRecord_30);
-        }
-        if (log == 31l) {
-            specialDataWithKey2(encryptFlag, medicalRecord_31);
-        }
+            }
+            if (log != null && log == 30l) {
+                specialDataWithKey2(encryptFlag, medicalRecord_30);
+            }
+            if (log != null && log == 31l) {
+                specialDataWithKey2(encryptFlag, medicalRecord_31);
+            }
 
-        Map<String, Object> content = new HashMap<>();
-        for (MedicalRecord medicalRecord : medicalRecordList) {
+            Map<String, Object> content = new HashMap<>();
+            for (MedicalRecord medicalRecord : medicalRecordList) {
 
-            Map<String, Object> listMap = new HashMap<>();
+                Map<String, Object> listMap = new HashMap<>();
 //            List<MedicalRecordContent> recIdList_7 = null;
 //            List<MedicalRecordContent> recIdList_30 = null;
 //            List<MedicalRecordContent> recIdList_31 = null;
-            RecordDataVO recordContentVO_7 = new RecordDataVO();
-            BeanUtil.copyProperties(medicalRecord, recordContentVO_7);
-            recordContentVO_7.setModeId(7l);
-            List<RecordContentDTO> recordContentFac_7 = medicalRecordFacade.getRecordData(recordContentVO_7);
+                RecordDataVO recordContentVO_7 = new RecordDataVO();
+                BeanUtil.copyProperties(medicalRecord, recordContentVO_7);
+                recordContentVO_7.setModeId(7l);
+                List<RecordContentDTO> recordContentFac_7 = medicalRecordFacade.getRecordData(recordContentVO_7);
 //            recIdList_7 = BeanUtil.listCopyTo(recordContentFac_7, MedicalRecordContent.class);
-            List<Map<String, Object>> returnData = new ArrayList<>();
-            if (ListUtil.isNotEmpty(recordContentFac_7)) {
-                for (RecordContentDTO recordContentDTO : recordContentFac_7) {
-                    try {
-                        Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
-                        returnData.add(objectMap);
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                List<Map<String, Object>> returnData = new ArrayList<>();
+                if (ListUtil.isNotEmpty(recordContentFac_7)) {
+                    for (RecordContentDTO recordContentDTO : recordContentFac_7) {
+                        try {
+                            Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
+                            returnData.add(objectMap);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
-                }
 
-            }
+                }
 
 
-            RecordDataVO recordContentVO_30 = new RecordDataVO();
-            BeanUtil.copyProperties(medicalRecord, recordContentVO_30);
-            recordContentVO_30.setModeId(30l);
-            List<RecordContentDTO> recordContentFac_30 = medicalRecordFacade.getRecordData(recordContentVO_30);
+                RecordDataVO recordContentVO_30 = new RecordDataVO();
+                BeanUtil.copyProperties(medicalRecord, recordContentVO_30);
+                recordContentVO_30.setModeId(30l);
+                List<RecordContentDTO> recordContentFac_30 = medicalRecordFacade.getRecordData(recordContentVO_30);
 //            recIdList_30 = BeanUtil.listCopyTo(recordContentFac_30, MedicalRecordContent.class);
-            if (ListUtil.isNotEmpty(recordContentFac_30)) {
-                for (RecordContentDTO recordContentDTO : recordContentFac_30) {
-                    try {
-                        Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
-                        returnData.add(objectMap);
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                if (ListUtil.isNotEmpty(recordContentFac_30)) {
+                    for (RecordContentDTO recordContentDTO : recordContentFac_30) {
+                        try {
+                            Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
+                            returnData.add(objectMap);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
-                }
 
-            }
+                }
 
-            RecordDataVO recordContentVO_31 = new RecordDataVO();
-            BeanUtil.copyProperties(medicalRecord, recordContentVO_31);
-            recordContentVO_31.setModeId(31l);
+                RecordDataVO recordContentVO_31 = new RecordDataVO();
+                BeanUtil.copyProperties(medicalRecord, recordContentVO_31);
+                recordContentVO_31.setModeId(31l);
 
-            List<RecordContentDTO> recordContentFac_31 = medicalRecordFacade.getRecordData(recordContentVO_31);
+                List<RecordContentDTO> recordContentFac_31 = medicalRecordFacade.getRecordData(recordContentVO_31);
 //            recIdList_31 = BeanUtil.listCopyTo(recordContentFac_31, MedicalRecordContent.class);
-            if (ListUtil.isNotEmpty(recordContentFac_31)) {
-
-                for (RecordContentDTO recordContentDTO :recordContentFac_31) {
-                    try {
-                        Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
-                        returnData.add(objectMap);
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                if (ListUtil.isNotEmpty(recordContentFac_31)) {
+
+                    for (RecordContentDTO recordContentDTO : recordContentFac_31) {
+                        try {
+                            Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
+                            returnData.add(objectMap);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                 }
-            }
 
 
-            content.put("content", returnData);
-            MedrecVo medrecVo = new MedrecVo();
-            medrecVo.setContent(content);
-            medrecVo.setTitle("会诊");
-            splicingParam(null,medrecVo);
+                content.put("content", returnData);
+                MedrecVo medrecVo = new MedrecVo();
+                medrecVo.setHospitalId(medicalRecord.getHospitalId());
+                medrecVo.setContent(content);
+                medrecVo.setTitle("会诊");
+                splicingParam(null, medrecVo);
 
+            }
         }
 
-
         if (flag) {
             medicalRecordList.forEach(medicalRecord -> {
 
@@ -325,7 +326,9 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             QueryVo queryVo = new QueryVo();
             List<MedrecVo> medreclist = Lists.newArrayList();
             medreclist.add(medrec);
-        queryVo.setMedrec(medreclist);
+            queryVo.setMedrec(medreclist);
+            queryVo.setHospitalId(String.valueOf(medrec.getHospitalId()));
+            queryVo.setCid(basHospitalInfoFacade.getHosCode(medrec.getHospitalId()));
             columnFacade.analyseRec(queryVo);
         } if(null == medrec) {
             try {

src/main/java/com/diagbot/vo/MedrecVo.java

@@ -16,6 +16,7 @@ import java.util.Map;
 @Setter
 public class MedrecVo {
     private String title;
+    private Long hospitalId;
     private Map<String, Object> content;
     private List<String> label;
 }