diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index c0d3bcb..02e4073 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -351,73 +351,87 @@ public class MatDeliverController extends BaseController{ } } -// Patients patients = patientsService.findOnePatientById(newBabyManagerQueryModel.getPatientId()); -// if (patients != null) -// { -// map.put("age", DateUtil.getAge(patients.getBirth())); -// -// //居住地 -// String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), -// patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); -// -// map.put("addressRegister",liveAddress); -// -// //户籍地址 -// String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), -// patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); -// -// map.put("addressRegister", addressRegister); -// -// //产后休养地 -// String postRest = CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(), -// patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService); -// map.put("postRest", postRest); -// -// HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); -// //妊娠期高危因素 -// map.put("risk", highScoreResult.gethighRiskStr()); -// -// map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName()); -// map.put("husbandName", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); -// -// AntExChuQuery antExChuQuery = new AntExChuQuery(); -// antExChuQuery.setYn(YnEnums.YES.getId()); -// antExChuQuery.setParentId(patients.getId()); -// List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); -// if (CollectionUtils.isNotEmpty(antExChuModels)) -// { -// AntExChuModel antExChuModel = antExChuModels.get(0); -// map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes()); -// map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); -// map.put("ts",antExChuModel.getTireNumber1() == null ? "" : antExChuModel.getTireNumber1()); -// } -// -// if (StringUtils.isNotEmpty(patients.getFmHospital())) -// { -// Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getFmHospital())); -// map.put("fmHospital",organization != null ? organization.getName() : ""); -// } -// map.put("husbandName", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); -// } + Integer deformity = newBabyManagerQueryModel.getDeformity(); + map.put("jx",deformity == null ? "" : (deformity == 1 ? "是" : "否")); + + Patients patients = patientsService.findOnePatientById(newBabyManagerQueryModel.getPatientId()); + if (patients != null) + { + + //居住地 + String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); + + map.put("addressRegister",liveAddress); + + //户籍地址 + String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); + + map.put("addressRegister", addressRegister); + + //产后休养地 + String postRest = CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(), + patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService); + map.put("postRest", postRest); + + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); + //妊娠期高危因素 + map.put("risk", highScoreResult.gethighRiskStr()); + + map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName()); + map.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); + + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setParentId(patients.getId()); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChuModels)) + { + AntExChuModel antExChuModel = antExChuModels.get(0); + map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes()); + map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); + map.put("ts",antExChuModel.getTireNumber1() == null ? "" : antExChuModel.getTireNumber1()); + } + + if (StringUtils.isNotEmpty(patients.getFmHospital())) + { + Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getFmHospital())); + map.put("fmHospital",organization != null ? organization.getName() : ""); + } + + map.put("mremark", patients.getMremark() == null ? "" : patients.getMremark()); + } list.add(map); } Map header = new LinkedHashMap<>(); - header.put("birthYMD", "分娩日期"); - header.put("birthHM", "娩出时间"); - header.put("name", "姓名"); - header.put("sex", "性别"); - header.put("birthDays", "出生天数"); - header.put("highRisk", "是否高危"); - header.put("dueWeek", "分娩孕周"); - header.put("dueType", "分娩方式"); - header.put("babyHeight", "出生身长/cm"); - header.put("babyWeight", "出生体重/g"); - header.put("mname", "母亲姓名"); - header.put("age", "母亲年龄"); - header.put("mcertNo", "母亲证件号"); + header.put("mname", "产妇姓名"); + header.put("age", "年龄"); + header.put("name", "儿童姓名"); + header.put("sex", "新生儿性别"); + header.put("babyHeight", "身长cm"); + header.put("babyWeight", "体重g"); + header.put("fmDate", "出生时间(具体到分)"); + header.put("addressRegister", "产妇户籍地"); + header.put("addressRegister","居住地"); + header.put("postRest", "产后休养地址"); + header.put("risk", "妊娠期高危因素"); header.put("mphone", "联系方式"); + header.put("mcertNo", "母亲证件号"); + header.put("husbandName", "丈夫姓名"); + header.put("husbandPhone", "丈夫联系电话"); + header.put("yc","孕次"); + header.put("cc","产次"); + header.put("ts","胎数"); + header.put("dueType", "分娩方式"); + header.put("dueWeek", "分娩孕周"); + header.put("jx", "外观是否正常"); header.put("deliverDoctor", "接生医生"); + header.put("birthDays", "出生天数"); + header.put("highRisk", "是否高危"); + header.put("fmHospital","接生医院"); + header.put("mremark", "备注"); httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("新生儿管理.xls").getBytes("UTF-8"), "ISO-8859-1")); ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index a6a5287..a6c1231 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2494,6 +2494,7 @@ public class MatDeliverFacade { if (CollectionUtils.isNotEmpty(babies)) { for (MaternalDeliverModel.Baby baby : babies) { if (baby.getId() != null && baby.getId().equals(babyModel.getId())) { + newBabyManagerQueryModel.setDeformity(baby.getDeformity()); String time = baby.getDueTime(); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(time)) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); @@ -2501,6 +2502,7 @@ public class MatDeliverFacade { Date date = format.parse(time); newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(date)); newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(date)); + newBabyManagerQueryModel.setFmDate(DateUtil.getyyyy_MM_dd(date) +" "+ new SimpleDateFormat("HH:mm").format(date)); } catch (ParseException e) { ExceptionUtils.catchException(e, "新生儿管理娩出时间格式异常" + time); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java index a7f3098..5c13d5d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java @@ -29,6 +29,9 @@ public class NewBabyManagerQueryModel { */ private String birthHM; + private String fmDate; + + /** * @auther HuJiaqi * @createTime 2016年12月08日 10时54分 @@ -135,6 +138,25 @@ public class NewBabyManagerQueryModel { */ private String deliverDoctor; + //畸形 0非畸形 1畸形 + private Integer deformity; + + public String getFmDate() { + return fmDate; + } + + public void setFmDate(String fmDate) { + this.fmDate = fmDate; + } + + public Integer getDeformity() { + return deformity; + } + + public void setDeformity(Integer deformity) { + this.deformity = deformity; + } + public String getApgarScore() { return apgarScore; }