From 375639c6255822d3e5721621fcd657ebbd664b3e Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 11 Nov 2022 16:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8D=AB=E7=94=9F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/PatientSyncMysqlFacade.java | 32 ++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
index 5d9b56b..68258b4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
@@ -3484,9 +3484,11 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
             }
         }
         hospitalDate.put("data18",data17_data2+"%");
+
+
         //产后访视人数
         int data19= (int)mongoTemplate.count(new Query(Criteria.
-                where("hospitalId").is(hospitalId).and("visitDate").lte(endDate)),MatdeliverFollowModel.class);
+                where("hospitalId").is(hospitalId).and("checkTime").lte(endDate).and("yn").is(1)),PostReviewModel.class);
 
         int lastDate19= null==hospitalDate.get("data19")?0:Integer.parseInt(hospitalDate.get("data19").toString());
         hospitalDate.put("data19",data19+lastDate19);
@@ -3501,6 +3503,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
             }
         }
         hospitalDate.put("data20",data19_data2+"%");
+
         //孕产妇系统管理人数
         hospitalDate.put("data21",data19);
         //孕产妇系统管理率%
@@ -3978,38 +3981,33 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
         if (CollectionUtils.isNotEmpty(hospitalIds))
         {
             Criteria criteria = Criteria.
-                    where("hospitalId").in(hospitalIds).and("visitDate").lte(endDate);
+                    where("hospitalId").in(hospitalIds).and("checkTime").lte(endDate).and("yn").is(1);
 
-            PageResult pageResult = findMongoPage(MatdeliverFollowModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "visitDate")), page, limit);
-            List <MatdeliverFollowModel> followModels = (List <MatdeliverFollowModel>) pageResult.getGrid();
-            if (CollectionUtils.isNotEmpty(followModels))
+            PageResult pageResult = findMongoPage(PostReviewModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "visitDate")), page, limit);
+            List <PostReviewModel> postReviewModels = (List <PostReviewModel>) pageResult.getGrid();
+            if (CollectionUtils.isNotEmpty(postReviewModels))
             {
-                for (MatdeliverFollowModel followModel :  followModels)
+                for (PostReviewModel post :  postReviewModels)
                 {
                     Map result = new HashMap();
-                    MaternalDeliverModel maternalDeliverModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(followModel.getDeliverId())), MaternalDeliverModel.class);
 
-                    if (maternalDeliverModel == null)
-                    {
-                        continue;
-                    }
-                    Patients model = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
+                    Patients model = patientsService.findOnePatientById(post.getParentId());
                     if (model == null)
                     {
                         continue;
                     }
                     result.put("username",model.getUsername());
-                    result.put("age",DateUtil.getAge2(model.getBirth(),followModel.getVisitDate()));
-                    result.put("chDay",DateUtil.getDays(maternalDeliverModel.getDueDate1(),followModel.getVisitDate()));
-                    result.put("fsDate",DateUtil.getyyyy_MM_dd(followModel.getVisitDate()));
+                    result.put("age",DateUtil.getAge2(model.getBirth(),post.getCheckTime()));
+                    result.put("chDay",post.getDay());
+                    result.put("fsDate",DateUtil.getyyyy_MM_dd(post.getCheckTime()));
                     result.put("phone",model.getPhone());
                     result.put("cardNo",model.getCardNo());
                     result.put("address", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
                             model.getAreaId(), model.getStreetId(), model.getAddress(),
                             basicConfigService));
-                    String fsHospital = organizationService.getOrganization(Integer.parseInt(followModel.getHospitalId())).getName();
+                    String fsHospital = organizationService.getOrganization(Integer.parseInt(post.getHospitalId())).getName();
                     result.put("fsHospital",fsHospital);
-                    result.put("fsId",followModel.getId());
+                    result.put("fsId",post.getId());
                     results.add(result);
                 }
             }
-- 
1.8.3.1