From 47f8143e265475bc1b115eae7be419b9ede98e26 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 25 Mar 2020 13:39:54 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/query/AntExRecordQuery.java  | 33 ++++++++++++++++++++++
 .../operate/web/facade/HealthChargeFacade.java     | 23 +++++++++++----
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
index 77e8a5e..b10c966 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
@@ -74,6 +74,22 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery
 
     private Boolean isOpinion;
 
+    public Date getNextCheckTimeStart() {
+        return nextCheckTimeStart;
+    }
+
+    public void setNextCheckTimeStart(Date nextCheckTimeStart) {
+        this.nextCheckTimeStart = nextCheckTimeStart;
+    }
+
+    public Date getNextCheckTimeEnd() {
+        return nextCheckTimeEnd;
+    }
+
+    public void setNextCheckTimeEnd(Date nextCheckTimeEnd) {
+        this.nextCheckTimeEnd = nextCheckTimeEnd;
+    }
+
     public Boolean getIsOpinion() {
         return isOpinion;
     }
@@ -676,6 +692,23 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery
                 c = Criteria.where("checkTime").lte(checkTimeEnd);
             }
         }
+
+        if (null != nextCheckTimeStart) {
+            if (null != c) {
+                c = c.and("nextCheckTime").gte(nextCheckTimeStart);
+            } else {
+                c = Criteria.where("nextCheckTime").gte(nextCheckTimeStart);
+            }
+        }
+
+        if (null != nextCheckTimeEnd) {
+            if (null != c) {
+                c = c.lte(nextCheckTimeEnd);
+            } else {
+                c = Criteria.where("nextCheckTime").lte(nextCheckTimeEnd);
+            }
+        }
+
         if (null != checkTimeLt) {
             if (null != c) {
                 c = c.lt(checkTimeLt);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java
index ebde91f..d58a98f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.platform.biz.service.BabyBookbuildingService;
 import com.lyms.platform.biz.service.ChargeRecordService;
 import com.lyms.platform.biz.service.HealthChargeService;
 import com.lyms.platform.biz.service.PatientsService;
@@ -53,6 +54,9 @@ public class HealthChargeFacade {
     @Autowired
     private UsersService usersService;
 
+    @Autowired
+    private BabyBookbuildingService babyBookbuildingService;
+
     /**
      * 新增字段：报表解读人 孕妇/儿童
      *
@@ -263,16 +267,25 @@ public class HealthChargeFacade {
             Patients patients = patientsService.findOnePatientById(model.getForeignId());
             if (patients == null)
             {
-                return null;
+                BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getForeignId());
+                if (babyModel == null)
+                {
+                    return null;
+                }
+                map.put("userName",babyModel.getName());
+                map.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated()));
+            }
+            else
+            {
+                map.put("userName", patients.getUsername());
+                map.put("age",DateUtil.getAge(patients.getBirth(), model.getCreated()));
+                map.put("week",patients.getType() == 3 ? "已分娩": DateUtil.getWeekDesc(patients.getLastMenses(),model.getCreated()));
             }
-            map.put("userName", patients.getUsername());
-            map.put("age",DateUtil.getAge(patients.getBirth(), model.getCreated()));
-            map.put("week",patients.getType() == 3 ? "已分娩": DateUtil.getWeekDesc(patients.getLastMenses(),model.getCreated()));
         }
         else
         {
             //获取临时用户信息
-            getTemporaryUserInfo(map,model.getForeignId(),model.getCreated());
+            getTemporaryUserInfo(map, model.getForeignId(), model.getCreated());
         }
         map.put("status", model.getStatus() == 1 ? "未结算" : "已结算");
         map.put("type", model.getType() == 1 ? "标准报告" : "高危报告");
-- 
1.8.3.1