From 55f1d8391121deb5054e114f2adcf0bfb76553b1 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 14 Feb 2020 16:38:54 +0800
Subject: [PATCH] update code

---
 .../operate/web/facade/AntenatalExaminationFacade.java       | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index a5e4b9b..41b8d92 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -5489,6 +5489,8 @@ public class AntenatalExaminationFacade {
 
 
     public BaseResponse getAutoRiskRecord(AntExManagerQueryRequest antExManagerQueryRequest, Integer id) {
+        List riskList = new ArrayList();
+        BaseQuery baseQuery = new BaseQuery();
 
         PatientsQuery patientsQuery = new PatientsQuery();
         List<Patients> patientses = null;
@@ -5505,6 +5507,10 @@ public class AntenatalExaminationFacade {
                 patientIds.add(pat.getId());
             }
         }
+        else
+        {
+            return  new BaseListResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo());
+        }
 
         Query query = new Query();
         if (CollectionUtils.isNotEmpty(patientIds)) {
@@ -5527,18 +5533,18 @@ public class AntenatalExaminationFacade {
         }
 
         if (antExManagerQueryRequest.getRiskFactorId() != null) {
-            query.addCriteria(Criteria.where("hRisk").in(antExManagerQueryRequest.getRiskFactorId()));
+            query.addCriteria(Criteria.where("hRisk").in(com.lyms.platform.common.utils.StringUtils.covertToList(antExManagerQueryRequest.getRiskFactorId(), String.class)));
         }
 
         long count = mongoTemplate.count(query, AutoRiskRecord.class);
 
-        BaseQuery baseQuery = new BaseQuery();
+
         baseQuery.mysqlBuild((int) count);
         baseQuery.setPage(antExManagerQueryRequest.getPage());
         baseQuery.setLimit(antExManagerQueryRequest.getLimit());
 
         query.skip(baseQuery.getOffset()).limit(antExManagerQueryRequest.getLimit());
-        List riskList = new ArrayList();
+
         System.out.println(query.toString());
         List<AutoRiskRecord> models = mongoTemplate.find(query.with(new Sort(Sort.Direction.DESC, "created")), AutoRiskRecord.class);
         System.out.println(models);
-- 
1.8.3.1