diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index eebd0bb..1e03814 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -4608,31 +4608,26 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         //绿,黄,橙，红，紫
         int risk_green=0,risk_yellow=0,risk_orange=0,risk_red=0,risk_purple=0;
         //初诊
-        Criteria criteria = Criteria.where("checkTime").gte(startDate).lte(endDate)
-                .and("hospitalId").is(hospitalId)
-                .and("yn").is(YnEnums.YES.getId());
-        List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(criteria), AntExChuModel.class);
-        for (AntExChuModel antExChuModel : antExChuModels) {
-            //解析高危
-            List <Map <String, Object>> mapList=getRisk(antExChuModel.getHighrisk());
+        AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
+        antExRecordQuery.setType(2);
+        antExRecordQuery.setCheckTimeStart(startDate);
+        antExRecordQuery.setCheckTimeEnd(endDate);
+        antExRecordQuery.setHospitalId(hospitalId);
+        List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery);
+
+        for (AntExRecordModel antExRecordModel : antExRecordModelList) {
             //获取高危人数
-            for (Map<String, Object> stringObjectMap : mapList) {
-                switch (stringObjectMap.get("color").toString()){
-                    case "risk_green":
-                        risk_green++;
-                        break;
-                    case "risk_yellow":
-                        risk_yellow++;
-                        break;
-                    case "risk_orange":
-                        risk_orange++;
-                        break;
-                    case "risk_red":
-                        risk_red++;
-                        break;
-                    case "risk_purple":
-                        risk_purple++;
-                        break;
+            for (Object o : antExRecordModel.gethLevel()) {
+                if(o.toString().contains("e637b361-99cf-41eb-84f2-f0dab596e928")){
+                    risk_green++;
+                }else if(o.toString().contains("315107bd-91fe-42a1-9237-752f3c046a40")){
+                    risk_yellow++;
+                }else if(o.toString().contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")){
+                    risk_orange++;
+                }else if(o.toString().contains("eb146c03-b19f-4e28-b85f-fda574b2283b")){
+                    risk_red++;
+                }else if(o.toString().contains("224b2329-cb82-4da3-a071-8527f8283aab")){
+                    risk_purple++;
                 }
             }
         }
@@ -4694,11 +4689,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getNextCheckTime()));
             //高危因素
             List<Map<String, Object>> risk = getRisk(antExRecordModel.gethRisk());
+            StringBuffer bf=new StringBuffer();
             for (Map<String, Object> stringObjectMap : risk) {
                 if(stringObjectMap.get("color").equals(riskType)){
-                    map.put("highRiskResult", stringObjectMap.get("name"));
+                    bf.append(stringObjectMap.get("name"));
                 }
             }
+            map.put("highRiskResult", bf);
             antExRecordResult.add(map);
         }