查询患者历史数据图表返回值错乱修复

ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/RecordHistoryDataResp.java

@@ -9,20 +9,20 @@ public class RecordHistoryDataResp
     private List<Integer> shexiaList;
     private List<Date> dateList;
 
-    private HashMap<String, ArrayList<String>> historyDataMap;
+    private HashMap<String, ArrayList<Object>> historyDataMap;
 
-    public RecordHistoryDataResp()
-    {
-    }
-
-    public HashMap<String, ArrayList<String>> getHistoryDataMap() {
+    public HashMap<String, ArrayList<Object>> getHistoryDataMap() {
         return historyDataMap;
     }
 
-    public void setHistoryDataMap(HashMap<String, ArrayList<String>> historyDataMap) {
+    public void setHistoryDataMap(HashMap<String, ArrayList<Object>> historyDataMap) {
         this.historyDataMap = historyDataMap;
     }
 
+    public RecordHistoryDataResp()
+    {
+    }
+
     public List<Integer> getShezhiList()
     {
         return shezhiList;

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRecordServiceImpl.java

@@ -178,7 +178,7 @@ public class TRecordServiceImpl implements ITRecordService
             return jsonObject;
         }).filter(Objects::nonNull).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(result)){
-            HashMap<String, ArrayList<String>> map = new HashMap<>();
+            HashMap<String, ArrayList<Object>> map = new HashMap<>();
             result.forEach(jsonObject -> {
                 getJsonData(jsonObject.getJSONObject("data"), "data", map, jsonKeyList);
             });
@@ -195,24 +195,29 @@ public class TRecordServiceImpl implements ITRecordService
      * @param historyDataMap 历史数据
      * @param removeKeyList  删除键列表
      */
-    private static void getJsonData(Object obj, String listName, HashMap<String, ArrayList<String>> historyDataMap, List<String> removeKeyList) {
+    private static void getJsonData(Object obj, String listName, HashMap<String, ArrayList<Object>> historyDataMap, List<String> removeKeyList) {
         // aiResult结果集中只包括JSONObject,不包括JSONArray
         if (obj instanceof JSONObject) {
             for (Map.Entry<String, Object> entry : ((JSONObject) obj).entrySet()) {
-                if (!(entry.getValue() instanceof String)) {
+                if ((entry.getValue() instanceof JSONObject)) {
                     getJsonData(entry.getValue(), entry.getKey(), historyDataMap, removeKeyList);
                 } else {
-                    // 去除
+                    // 去除带图片字段
                     if (removeKeyList.contains(listName)) {
                         continue;
                     }
-                    ArrayList<String> list;
+                    //sz_avg_purple: { "anomaly": 0, "v": "正常" }
+                    // anomaly属于预留字段，暂时无用; 各个任务中的字段v是任务实际值
+                    if (!"v".equals(entry.getKey())) {
+                        continue;
+                    }
+                    ArrayList<Object> list;
                     if (null == historyDataMap.get(listName)) {
                         list = new ArrayList<>();
                     } else {
                         list = historyDataMap.get(listName);
                     }
-                    list.add((String) entry.getValue());
+                    list.add(entry.getValue());
                     historyDataMap.put(listName, list);
                 }
             }