Commit bc2d17a75c25f3d5f1aa901f54ea1c1c637f99cf
1 parent
a573a9d5a7
Exists in
master
and in
6 other branches
出生医学证明字段添加
Showing 1 changed file with 24 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
bc2d17a
| ... | ... | @@ -2381,7 +2381,25 @@ |
| 2381 | 2381 | map.put("fmWeek", checkWeek(patients)); |
| 2382 | 2382 | map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); |
| 2383 | 2383 | map.put("mremark", patients.getMremark()); |
| 2384 | + map.put("motherCountry", getBasicConfig(patients.getPcountryId()));//母亲国籍 | |
| 2385 | + map.put("motherNation", getBasicConfig(patients.getPnationId()));//母亲民族 | |
| 2386 | + map.put("mcardtype", getBasicConfig(patients.getPcerteTypeId()));//母亲证件类型 | |
| 2387 | + map.put("mcardnum", patients.getCardNo());//母亲证件号码 | |
| 2388 | + //居住地址 | |
| 2389 | + map.put("address", CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), | |
| 2390 | + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); | |
| 2384 | 2391 | |
| 2392 | + //父亲姓名 | |
| 2393 | + map.put("hname",patients.getHusbandName()); | |
| 2394 | + //父亲国籍 | |
| 2395 | + map.put("fatherCountry", getBasicConfig(patients.getHcountryId())); | |
| 2396 | + //父亲民族 | |
| 2397 | + map.put("fatherNation", getBasicConfig(patients.getHnationId())); | |
| 2398 | + //父亲证件类型 | |
| 2399 | + map.put("fcardtype", getBasicConfig(patients.getHcertificateTypeId())); | |
| 2400 | + //父亲证件号码 | |
| 2401 | + map.put("fcardnum", StringUtils.isNotEmpty(patients.getHcertificateNum()) ? patients.getHcertificateNum() : ""); | |
| 2402 | + | |
| 2385 | 2403 | //高危因素 |
| 2386 | 2404 | // HighScoreResult highScoreResult = null; |
| 2387 | 2405 | // if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) { |
| ... | ... | @@ -2764,6 +2782,12 @@ |
| 2764 | 2782 | babyMap.put("deformity", temp.getDeformity() == null ? "" : temp.getDeformity() == 1 ? "是" : "否"); |
| 2765 | 2783 | babyMap.put("babyGender", temp.getBabyGender() == null ? "" : SexEnum.getTextById( |
| 2766 | 2784 | Integer.parseInt(temp.getBabyGender()))); |
| 2785 | + if(0 == Integer.parseInt(temp.getBabyGender())){ | |
| 2786 | + babyMap.put("newBabyName",patients.getUsername()+"之女"); | |
| 2787 | + }else{ | |
| 2788 | + babyMap.put("newBabyName",patients.getUsername()+"之子"); | |
| 2789 | + } | |
| 2790 | + | |
| 2767 | 2791 | babyMap.put("babyWeight", UnitUtils.unitSplice(temp.getBabyWeight(), UnitConstants.G)); |
| 2768 | 2792 | babyMap.put("babyHeight", UnitUtils.unitSplice(temp.getBabyHeight(), UnitConstants.CM)); |
| 2769 | 2793 | babyMap.put("babyHealthy", temp.getBabyHealthy()); |