解析格式调整

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

@@ -125,74 +125,72 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         }
         List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
         Boolean flag = true;
-        if(hisDataDealVO.getModeId().size()>1){
+        if (hisDataDealVO.getModeId().size() > 1) {
             flag = false;
-        }
-
-
-        Map<String, Object> content = new HashMap<>();
-        for (MedicalRecord medicalRecord : medicalRecordList) {
-            RecordDataVO recordContentVO_7 = new RecordDataVO();
-            BeanUtil.copyProperties(medicalRecord, recordContentVO_7);
-            recordContentVO_7.setModeId(7l);
-            List<RecordContentDTO> recordContentFac_7 = medicalRecordFacade.getRecordData(recordContentVO_7);
-            specialDataWithKey(encryptFlag, recordContentFac_7);
-            List<Map<String, Object>> returnData = new ArrayList<>();
-            Map<String, List<Map<String, Object>>> returnMap = new HashMap<>();
-            if (ListUtil.isNotEmpty(recordContentFac_7)) {
-                for (RecordContentDTO recordContentDTO : recordContentFac_7) {
-                    try {
-                        Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
-                        returnData.add(objectMap);
-                        returnMap.put("会诊记录",returnData);
-                    } catch (Exception e) {
-                        e.printStackTrace();
+            Map<String, Object> content = new HashMap<>();
+            for (MedicalRecord medicalRecord : medicalRecordList) {
+                RecordDataVO recordContentVO_7 = new RecordDataVO();
+                BeanUtil.copyProperties(medicalRecord, recordContentVO_7);
+                recordContentVO_7.setModeId(7l);
+                List<RecordContentDTO> recordContentFac_7 = medicalRecordFacade.getRecordData(recordContentVO_7);
+                specialDataWithKey(encryptFlag, recordContentFac_7);
+                List<Map<String, Object>> returnData = new ArrayList<>();
+                Map<String, List<Map<String, Object>>> returnMap = new HashMap<>();
+                if (ListUtil.isNotEmpty(recordContentFac_7)) {
+                    for (RecordContentDTO recordContentDTO : recordContentFac_7) {
+                        try {
+                            Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
+                            returnData.add(objectMap);
+                            returnMap.put("会诊记录", returnData);
+                        } 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);
-            specialDataWithKey(encryptFlag, recordContentFac_30);
-            if (ListUtil.isNotEmpty(recordContentFac_30)) {
-                for (RecordContentDTO recordContentDTO : recordContentFac_30) {
-                    try {
-                        Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
-                        returnData.add(objectMap);
-                        returnMap.put("会诊申请单",returnData);
-                    } 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);
+                specialDataWithKey(encryptFlag, recordContentFac_30);
+                if (ListUtil.isNotEmpty(recordContentFac_30)) {
+                    for (RecordContentDTO recordContentDTO : recordContentFac_30) {
+                        try {
+                            Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
+                            returnData.add(objectMap);
+                            returnMap.put("会诊申请单", returnData);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                 }
-            }
 
-            RecordDataVO recordContentVO_31 = new RecordDataVO();
-            BeanUtil.copyProperties(medicalRecord, recordContentVO_31);
-            recordContentVO_31.setModeId(31l);
-            List<RecordContentDTO> recordContentFac_31 = medicalRecordFacade.getRecordData(recordContentVO_31);
-            specialDataWithKey(encryptFlag, recordContentFac_31);
-            if (ListUtil.isNotEmpty(recordContentFac_31)) {
-                for (RecordContentDTO recordContentDTO : recordContentFac_31) {
-                    try {
-                        Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
-                        returnData.add(objectMap);
-                        returnMap.put("会诊结果单",returnData);
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                RecordDataVO recordContentVO_31 = new RecordDataVO();
+                BeanUtil.copyProperties(medicalRecord, recordContentVO_31);
+                recordContentVO_31.setModeId(31l);
+                List<RecordContentDTO> recordContentFac_31 = medicalRecordFacade.getRecordData(recordContentVO_31);
+                specialDataWithKey(encryptFlag, recordContentFac_31);
+                if (ListUtil.isNotEmpty(recordContentFac_31)) {
+                    for (RecordContentDTO recordContentDTO : recordContentFac_31) {
+                        try {
+                            Map<String, Object> objectMap = MapUtil.objectToMap(recordContentDTO);
+                            returnData.add(objectMap);
+                            returnMap.put("会诊结果单", returnData);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                 }
-            }
-            content.put("content", returnMap);
-            MedrecVo medrecVo = new MedrecVo();
-            medrecVo.setHospitalId(medicalRecord.getHospitalId());
-            medrecVo.setContent(content);
-        if(recordContentVO_31.getModeId()==7l||recordContentVO_30.getModeId()==30l||recordContentVO_31.getModeId()==31l){
-            medrecVo.setTitle("会诊");
-        }
-            splicingParam(null, medrecVo);
+                content.put("content", returnMap);
+                MedrecVo medrecVo = new MedrecVo();
+                medrecVo.setHospitalId(medicalRecord.getHospitalId());
+                medrecVo.setContent(content);
+                if (recordContentVO_31.getModeId() == 7l || recordContentVO_30.getModeId() == 30l || recordContentVO_31.getModeId() == 31l) {
+                    medrecVo.setTitle("会诊");
+                }
+                splicingParam(null, medrecVo);
 
+            }
         }
 
         if (flag) {
@@ -235,7 +233,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     }
 
 
-
     /**
      * 特殊公共方法处理数据
      *