Browse Source

返回数据结构修改

xgb 17 hours ago
parent
commit
737de48125

+ 6 - 1
fs-service/src/main/java/com/fs/his/service/impl/FsUserHealthDataServiceImpl.java

@@ -108,11 +108,13 @@ public class FsUserHealthDataServiceImpl extends ServiceImpl<FsUserHealthDataMap
 
         // 如果测量等级是空 需要查询各等级(无-0,轻微-1,严重-2) 数量
         if (fsUserHealthData.getLevel() == null) {
+            Map<String, Object> count = new HashMap<>();
             for (int i = 0; i < 3; i++) {
                 fsUserHealthData.setLevel(i);
                 int num = selectFsUserHealthDataListCount(fsUserHealthData);
                 data.put("count" + i, num);
             }
+            data.put("count", count);
         }
         return data;
     }
@@ -160,13 +162,16 @@ public class FsUserHealthDataServiceImpl extends ServiceImpl<FsUserHealthDataMap
         Map<String, Object> data = new HashMap<>();
         data.put("data", new PageInfo<>(list));
 
+
         // 如果测量等级是空 需要查询各等级(无-0,轻微-1,严重-2) 数量
         if (fsUserHealthData.getLevel() == null) {
+            Map<String, Object> count = new HashMap<>();
             for (int i = 0; i < 3; i++) {
                 fsUserHealthData.setLevel(i);
                 int num = selectFsUserHealthDataListCount(fsUserHealthData);
-                data.put("count" + i, num);
+                count.put("count" + i, num);
             }
+            data.put("count", count);
         }
 
         return data;