From 71988314b183d0bea51256ae3bcedd7d55ddc0fa Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Sat, 1 Jun 2019 19:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8D=E5=AD=90=E5=BB=BA=E6=A1=A3=E6=89=8B?=
 =?UTF-8?q?=E5=86=8C=E5=AF=BC=E5=87=BA=E2=80=94=E2=80=94=E5=AD=A9=E6=AC=A1?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20=E6=AF=8D=E5=AD=90=E5=81=A5=E5=BA=B7?=
 =?UTF-8?q?=E6=89=8B=E5=86=8C=E5=AF=BC=E5=87=BA=E2=80=94=E2=80=94=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=20=E6=96=87=E6=A1=A3=E6=8F=90=E4=BE=9B=E7=9A=84?=
 =?UTF-8?q?=E6=98=AF=20=E7=8E=B0=E5=B1=85=E4=BD=8F=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/PatientFacade.java   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index a6d4634..54fb4db 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -24,6 +24,7 @@ import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.pojo.*;
+import com.lyms.platform.query.AntExChuQuery;
 import com.lyms.platform.query.BabyModelQuery;
 import com.lyms.platform.query.DataPermissionsModelQuery;
 import com.lyms.platform.query.PatientsQuery;
@@ -88,7 +89,8 @@ public class PatientFacade {
     private SmsConfigFacade smsConfigFacade;
     @Autowired
     private MatDeliverService matDeliverService;
-
+    @Autowired
+    private ViewFacade viewFacade;
     @Autowired
     private SyncDataService syncDataService;
     @Autowired
@@ -1502,10 +1504,15 @@ public class PatientFacade {
                 String hospitalName = couponMapper.getHospitalName(patients.getHospitalId());
                 healthHandbookExcelModel.setOrganization(hospitalName == null ? "诸城市人民医院" : hospitalName);
                 //镇街、村居或单位：现住地址
-                healthHandbookExcelModel.setAddress(patients.getAddress());
+                Map<String, Object> map = viewFacade.getPatientViewData(patients, patients.getId());
+                healthHandbookExcelModel.setAddress(map.get("register").toString());
                 //孩次：分娩儿童数
-                AntExChuModel data = antExService.findOne(patients.getId());
-                healthHandbookExcelModel.setChildTime(data == null ? 1 : (data.getProdTime() == null ? 1 : data.getProdTime() + 1));
+                AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录
+                antExChuQuery.setParentId(patients.getId());
+                List<AntExChuModel> antExChulist = antExService.queryAntExChu(antExChuQuery);
+
+                AntExChuModel data = antExService.findOne(antExChulist.get(0).getId());
+                healthHandbookExcelModel.setChildTime(data == null ? 0 : (data.getProdTime() == null ? 0 : data.getProdTime() + 1));
                 //孕期：当前使用有孕== 有孕
                 healthHandbookExcelModel.setGestation(healthHandbookExcelModel.getGestation());
                 //发放日期：当前日期
-- 
1.8.3.1