From 88059d1089eb2e633ec317a078992a4daaac6252 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 7 Dec 2017 17:49:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/ViewController.java | 4 +- .../operate/web/facade/RiskReportFacade.java | 2 +- .../platform/operate/web/facade/ViewFacade.java | 115 +++++++++++++-------- 3 files changed, 77 insertions(+), 44 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 7bc0da8..f910415 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -589,8 +589,8 @@ public class ViewController extends BaseController { @RequestMapping(value = "/findMatDeliverPrint", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findMatDeliverPrint(@RequestParam(required = true) String id) { - return viewFacade.findMatDeliverPrint(id); + public BaseObjectResponse findMatDeliverPrint(@RequestParam(required = true) String id,@RequestParam(required = true) String babyId) { + return viewFacade.findMatDeliverPrint(id,babyId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index fc88af3..a1e8d69 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -37,7 +37,7 @@ import java.util.concurrent.*; @Component public class RiskReportFacade { - private static final Map HighLevelMap = new HashMap(); + private static final Map HighLevelMap = new LinkedHashMap<>(); static { HighLevelMap.put("绿色预警", "低风险"); 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 153afc5..c254a3b 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 @@ -2428,6 +2428,7 @@ public class ViewFacade { if (CollectionUtils.isNotEmpty(data.getBaby())) { for (MaternalDeliverModel.Baby temp : data.getBaby()) { Map babyMap = new HashMap<>(); + babyMap.put("babyId",temp.getId()); babyMap.put("dueTime", temp.getDueTime()); babyMap.put("pregnancyOut", temp.getPregnancyOut() == null ? "" : RenShenJieJuEnums.getTitle(temp.getPregnancyOut())); babyMap.put("deformity", temp.getDeformity() == null ? "" : temp.getDeformity() == 1 ? "是" : "否"); @@ -3732,7 +3733,7 @@ public class ViewFacade { return RespBuilder.buildSuccess(); } - public BaseObjectResponse findMatDeliverPrint(String id) { + public BaseObjectResponse findMatDeliverPrint(String id,String babyId) { BaseObjectResponse br = new BaseObjectResponse(); MaternalDeliverModel data = matDeliverService.getOneMatDeliver(id); if (data == null || data.getYn() == YnEnums.NO.getId()) { @@ -3756,21 +3757,28 @@ public class ViewFacade { List> babyList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(data.getBaby())) { for (MaternalDeliverModel.Baby temp : data.getBaby()) { - Map babyMap = new HashMap<>(); + if (StringUtils.isNotEmpty(babyId) && babyId.equals(temp.getId())) + { + //性别 + map.put("babyGender", temp.getBabyGender() == null ? "" : SexEnum.getTextById( + Integer.parseInt(temp.getBabyGender()))); - //性别 - babyMap.put("babyGender", temp.getBabyGender() == null ? "" : SexEnum.getTextById( - Integer.parseInt(temp.getBabyGender()))); - //分娩时间 - babyMap.put("dueTime", temp.getDueTime()); - //体重 - babyMap.put("babyWeight", UnitUtils.unitSplice(temp.getBabyWeight(), UnitConstants.G)); - //身高 - babyMap.put("babyHeight", UnitUtils.unitSplice(temp.getBabyHeight(), UnitConstants.CM)); - //健康状态 - babyMap.put("babyHealthy", temp.getBabyHealthy()); + Date dueTime = DateUtil.parseYMDHM(temp.getDueTime()); + String time = DateUtil.getymdhm(dueTime); - babyList.add(babyMap); + //分娩时间 + map.put("dueTimeYear", time.substring(0,4)); + map.put("dueTimeMonth", time.substring(5, 6)); + map.put("dueTimeDay", time.substring(7, 8)); + map.put("dueTimeHour", time.substring(9, 10)); + map.put("dueTimeMinute",time.substring(11, 12)); + //体重 + map.put("babyWeight", temp.getBabyWeight() == null? "" : UnitUtils.unitSplice(temp.getBabyWeight(), UnitConstants.G)); + //身高 + map.put("babyHeight", temp.getBabyHeight() == null ? "" : UnitUtils.unitSplice(temp.getBabyHeight(), UnitConstants.CM)); + //健康状态 + map.put("babyHealthy", temp.getBabyHealthy()); + } } } @@ -3779,7 +3787,6 @@ public class ViewFacade { antExChuQuery.setParentId(patients.getId()); List list = antenatalExaminationService.queryAntExChu(antExChuQuery); - String tc = ""; String cc = ""; if (CollectionUtils.isNotEmpty(list)) @@ -3793,15 +3800,31 @@ public class ViewFacade { map.put("baby", babyList); //胎次 - map.put("tc", ""); + map.put("tc", tc); //产次 - map.put("cc", ""); + map.put("cc", cc); //双胎 - map.put("isShuangTai", ""); + map.put("tireNumber",data.getTireNumber()); + + String deliveryMode = "2"; //为2的时候剖宫产，其他的不选 + if (StringUtils.isNotEmpty(data.getDeliveryMode())) { + Map m = JsonUtil.str2Obj(data.getDeliveryMode(), Map.class); + String fmfs = null; + if (m != null) { + Object b = m.get("fmfs"); + if (b != null) { + fmfs = b.toString(); + if (fmfs != null) { + if (fmfs.equals("2")) { + } + } + } + } + } //生产状况 - map.put("scStatus", ""); + map.put("deliveryStatus", deliveryMode); //接生方法 map.put("jsff", ""); @@ -3811,51 +3834,57 @@ public class ViewFacade { //母亲姓名 - map.put("username", patients.getUsername()); + map.put("motherName", patients.getUsername()); + //母亲年龄 - map.put("age", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI)); + map.put("motheAge", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI)); + +// String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), +// patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); + String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); //母亲地址 - map.put("motherAddr", ""); + map.put("motherAddr", liveAddress); //父亲姓名 - map.put("fatherName",patients.getHusbandName()); + map.put("fatherName",patients.getHusbandName() == null ? "" : patients.getHusbandName()); //父亲年龄 - map.put("fatherAge", UnitUtils.unitSplice(DateUtil.getAge(patients.getHusbandBirth()), UnitConstants.SUI)); + map.put("fatherAge",patients.getHusbandBirth() == null ? "" : UnitUtils.unitSplice(DateUtil.getAge(patients.getHusbandBirth()), UnitConstants.SUI)); //父亲工作单位 - map.put("fatherWorkUnit", patients.getHworkUnit()); - - - //出生地点(县) - map.put("csAddress", ""); - + map.put("fatherWorkUnit", patients.getHworkUnit() == null ? "" : patients.getHworkUnit()); String fmHospital = ""; + String cityId = null; if (StringUtils.isNotEmpty(data.getFmHospital())) { if (com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) { Organization organization = organizationService.getOrganization(Integer.parseInt(data.getFmHospital())); if (organization != null && organization.getYn() == YnEnums.YES.getId()) { fmHospital = organization.getName(); + cityId = organization.getAreaId(); } } else { fmHospital = data.getFmHospital(); } - } + + //出生地点(县) + map.put("bornAddress", CommonsHelper.getName1(cityId,basicConfigService)); + //分娩医院 map.put("fmHospital", fmHospital); - //新生儿缺陷 - map.put("xseqx", ""); - - //诊断 - map.put("zhenDuan", ""); +// //新生儿缺陷 +// map.put("xseqx", ""); +// +// //诊断 +// map.put("zhenDuan", ""); //母亲身份证号码 map.put("motherCardNo", patients.getCardNo()); //父亲身份证号码 - map.put("motherCardNo", patients.getHcertificateNum()); + map.put("fatherCardNo", patients.getHcertificateNum() == null ? "" : patients.getHcertificateNum()); String deliverDoctor = ""; @@ -3873,17 +3902,21 @@ public class ViewFacade { //接生者 map.put("deliverDoctor", deliverDoctor); + + String qfDate = DateUtil.getYmd(new Date()); //签发日期 - map.put("qfDate", DateUtil.getyyyy_MM_dd(new Date())); + map.put("signDateYear", qfDate.substring(0,4)); + map.put("signDateMonth", qfDate.substring(5,6)); + map.put("signDateDay", qfDate.substring(7,8)); //母亲国籍 - map.put("motherGj", ""); + map.put("motherCountry", getBasicConfig(patients.getPcountryId())); //母亲民族 - map.put("motherMz", ""); + map.put("motherNation", getBasicConfig(patients.getPnationId())); //家庭住址 - map.put("homeAddress", ""); + map.put("homeAddress", liveAddress); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); -- 1.8.3.1