From 603b5ddfb7e2b0cf9afcbcdd654cd74470d9ee71 Mon Sep 17 00:00:00 2001 From: wtt Date: Sat, 1 Jun 2019 22:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=AD=95=E5=A6=87=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E8=A1=A8=E5=AF=BC=E5=87=BA=E2=80=94=E2=80=94=E5=AD=95?= =?UTF-8?q?=E4=BA=A7=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 13 +++++++++---- 1 file changed, 9 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 f9d593b..9c30b45 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 @@ -1512,11 +1512,19 @@ public class PatientFacade { BeanUtils.copy(patients, healthHandbookExcelModel); //女方姓名：孕妇姓名 ==username healthHandbookExcelModel.setUsername(patients.getUsername()); + //身份证号码：孕妇身份证号码 ==cardNo healthHandbookExcelModel.setCardNo(patients.getCardNo()); //发放机构：当前机构名称== 当前机构名称 String hospitalName = couponMapper.getHospitalName(patients.getHospitalId()); healthHandbookExcelModel.setOrganization(hospitalName == null ? "诸城市人民医院" : hospitalName); + //镇街、村居或单位：现住地址 + healthHandbookExcelModel.setAddress(patients.getAddress()); + //孩次：分娩儿童数 + AntExChuModel data = antExService.findOne(patients.getId()); + Integer i = data.getProdTime() + 1; + healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : i.toString())); + /*//孕期：当前使用有孕== 有孕 if(patients!=null && patients.getId()!=null){ //镇街、村居或单位：现住地址 @@ -1537,10 +1545,7 @@ public class PatientFacade { }else{ healthHandbookExcelModel.setAddress(""); healthHandbookExcelModel.setChildTime(""); - } - - - + }*/ //孕期：当前使用有孕== 有孕 healthHandbookExcelModel.setGestation(healthHandbookExcelModel.getGestation()); -- 1.8.3.1