From bc2d17a75c25f3d5f1aa901f54ea1c1c637f99cf Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 31 Oct 2018 15:09:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=94=9F=E5=8C=BB=E5=AD=A6=E8=AF=81?= =?UTF-8?q?=E6=98=8E=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ViewFacade.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 32076dd..483aae1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2381,6 +2381,24 @@ public class ViewFacade { map.put("fmWeek", checkWeek(patients)); map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("mremark", patients.getMremark()); + map.put("motherCountry", getBasicConfig(patients.getPcountryId()));//母亲国籍 + map.put("motherNation", getBasicConfig(patients.getPnationId()));//母亲民族 + map.put("mcardtype", getBasicConfig(patients.getPcerteTypeId()));//母亲证件类型 + map.put("mcardnum", patients.getCardNo());//母亲证件号码 + //居住地址 + map.put("address", CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + + //父亲姓名 + map.put("hname",patients.getHusbandName()); + //父亲国籍 + map.put("fatherCountry", getBasicConfig(patients.getHcountryId())); + //父亲民族 + map.put("fatherNation", getBasicConfig(patients.getHnationId())); + //父亲证件类型 + map.put("fcardtype", getBasicConfig(patients.getHcertificateTypeId())); + //父亲证件号码 + map.put("fcardnum", StringUtils.isNotEmpty(patients.getHcertificateNum()) ? patients.getHcertificateNum() : ""); //高危因素 // HighScoreResult highScoreResult = null; @@ -2764,6 +2782,12 @@ public class ViewFacade { babyMap.put("deformity", temp.getDeformity() == null ? "" : temp.getDeformity() == 1 ? "是" : "否"); babyMap.put("babyGender", temp.getBabyGender() == null ? "" : SexEnum.getTextById( Integer.parseInt(temp.getBabyGender()))); + if(0 == Integer.parseInt(temp.getBabyGender())){ + babyMap.put("newBabyName",patients.getUsername()+"之女"); + }else{ + babyMap.put("newBabyName",patients.getUsername()+"之子"); + } + babyMap.put("babyWeight", UnitUtils.unitSplice(temp.getBabyWeight(), UnitConstants.G)); babyMap.put("babyHeight", UnitUtils.unitSplice(temp.getBabyHeight(), UnitConstants.CM)); babyMap.put("babyHealthy", temp.getBabyHealthy()); -- 1.8.3.1