Forráskód Böngészése

标准化解析数据bug调整

chengyao 4 éve
szülő
commit
49702821e7

+ 2 - 2
src/main/java/com/diagbot/enums/CacheKeyEnum.java

@@ -22,8 +22,8 @@ public enum CacheKeyEnum implements KeyedString {
     RESCUE_NOTE("抢救记录", "medRescueNote"),
     CRISIS_NOTE("危急值记录", "medCrisisNote"),
     LEAVE_HOSPITAL("出院小结", "medLeaveHospital"),
-    CONSULTATION_APPLY("会诊申请单", "aMedConsultationApply"),
-    CONSULTATION_RESULT("会诊结果单", "aMedConsultationResult"),
+    CONSULTATION_APPLY("会诊申请单", "medConsultationApply"),
+    CONSULTATION_RESULT("会诊结果单", "medConsultationResult"),
     CONSULTATION_NOTE("会诊单", "medConsultationNote");
     /*
     FIRST_RECORD(2, "aMedFirstRecordFacade"),

+ 4 - 1
src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -296,10 +296,13 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     });
                     Map<String, Object> map = new HashMap<String, Object>();
                     List<Map<String, Object>> returnData = new ArrayList<>();
+                    String keyNname = ModeIdEnum.getName(Integer.parseInt(modeId.toString()));
+                    Map<String, List<Map<String, Object>>> returnMap = new HashMap<>();
                     for (AColumnContentVO aColumnContentVO : content) {
                         try {
                             Map<String, Object> objectMap = MapUtil.objectToMap(aColumnContentVO);
                             returnData.add(objectMap);
+                            returnMap.put(keyNname, returnData);
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -307,7 +310,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
                     map.put("content", returnData);
                     MedrecVo medrecVo = new MedrecVo();
-                    medrecVo.setTitle(ModeIdEnum.getName(Integer.parseInt(modeId.toString())));
+                    medrecVo.setTitle(keyNname);
                     medrecVo.setContent(map);
                     medreclist.add(medrecVo);
                 });