From 0069c6ac8a4bc68354bf15690c7ab29d932d56bd Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 25 Jan 2022 11:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E7=94=9F=E5=8E=BF=E5=8C=BB=E9=99=A2?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A-2.3.2.=E4=BA=8C=E7=BA=A7=E6=BC=8F=E6=A3=80=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=EF=BC=8C2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/ReportServiceImpl.java        | 28 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

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 ba18861..4a6bf65 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
@@ -5035,6 +5035,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             Criteria criteria2 = Criteria.where("parentId").is(antExChuModel.getParentId())
                     .and("hospitalId").is(hospitalId)
                     .and("type").is(1)
+                    .and("dueStatus").in(0,2)
                     .and("yn").is(1);
             final long count = mongoTemplate.count(Query.query(criteria2), AntExRecordModel.class);
             if(count==0){
@@ -5078,16 +5079,37 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
     public BaseResponse getFinallyCheckOverdue(String hospitalId, Date startDate, Date endDate) {
         BaseResponse br = new BaseResponse();
         List <Map <String, Object>> mapList=new ArrayList<>();
-        Criteria criteria = Criteria.where("nextCheckTime")
+        Criteria criteria = Criteria.where("lastCTime")
                 .gte(startDate).lte(endDate)
-                .and("")
+                .and("nextCheckTime").lt(new Date())
+                .and("type").is(1)
                 .and("hospitalId").is(hospitalId)
                 .and("yn").is(1);
         AggregationOperation match = Aggregation.match(criteria);
-        AggregationOperation group = Aggregation.group("prodDoctor").count().as("count");
+        AggregationOperation group = Aggregation.group("lastCheckEmployeeId").count().as("count");
         Aggregation  aggregation= Aggregation.newAggregation(match, group);
         AggregationResults<HashMap> result =  mongoTemplate.aggregate(aggregation,"lyms_patient", HashMap.class);
+        int count=0;//逾期合计
+        for (HashMap mappedResult : result.getMappedResults()) {
+            Map <String, Object> map=new HashMap<>();
 
+            if (null!=mappedResult.get("_id")) {
+                //接生医生姓名
+                String doctor = "";
+                Users users = usersService.getUsers(Integer.parseInt(mappedResult.get("_id").toString()));
+                if (users != null && users.getYn() == YnEnums.YES.getId()) {
+                    doctor = users.getName();
+                }
+                map.put("name", doctor);
+                map.put("count", mappedResult.get("count"));
+                count+=Integer.parseInt(mappedResult.get("count").toString());
+                mapList.add(map);
+            }
+        }
+        Map<String, Object> totalMap=new HashedMap();
+        totalMap.put("name","合计（逾期未检）");
+        totalMap.put("count",count);
+        mapList.add(totalMap);
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
         br.setObject(mapList);
-- 
1.8.3.1