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 54fb4db..41ce325 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 @@ -1078,19 +1078,33 @@ public class PatientFacade { keyPregnantWomenExcelModel.setUsername(patients.getUsername()); //年龄:产妇年龄 ==age keyPregnantWomenExcelModel.setAge(patients.getAge()); - //户籍:本市(常住)、外地常住(暂住)、流动 - String basicConfig = getBasicConfig(patients.getPliveTypeId()); - keyPregnantWomenExcelModel.setAddress(basicConfig); + AntExChuModel data = antExService.findOne(patients.getId()); + + + AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录 + antExChuQuery.setParentId(patients.getId()); + List antExChulist = antExService.queryAntExChu(antExChuQuery); + AntExChuModel data2 = antExService.findOne(antExChulist.get(0).getId());//data2.getProdTime() + //孕次:怀孕次数== 查看母子实现 - keyPregnantWomenExcelModel.setPregnancyTimes(data == null ? 0 : (data.getPregnancyTimes() == null ? 0 : data.getPregnancyTimes())); + keyPregnantWomenExcelModel.setPregnancyTimes(data2 == null ? "" : (data2.getPregnancyTimes() == null ? "" : data2.getPregnancyTimes().toString())); //产次:生产次数== 查看母子实现 - keyPregnantWomenExcelModel.setProdTime(data == null ? 0 : (data.getProdTime() == null ? 0 : data.getProdTime() + 1)); + keyPregnantWomenExcelModel.setProdTime(data2 == null ? "" : (data2.getProdTime() == null ? "" : data2.getProdTime().toString())); + //预产期:产妇预产期==dueDate keyPregnantWomenExcelModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + //居住地址:现住地址== addressRegister(孕妇居住地)addressPostRest(产后休养地) - keyPregnantWomenExcelModel.setAddressRegister(patients.getAddressRegister()); + Map map = viewFacade.getPatientViewData(patients, patients.getId()); + keyPregnantWomenExcelModel.setAddressRegister(map.get("register").toString()); + + //户籍:本市(常住)、外地常住(暂住)、流动 + String basicConfig = getBasicConfig(patients.getPliveTypeId()); + //keyPregnantWomenExcelModel.setAddress(basicConfig); + keyPregnantWomenExcelModel.setAddress( map.get("residence").toString()); + //孕妇手机:产妇手机号==phone keyPregnantWomenExcelModel.setPhone(patients.getPhone()); //丈夫手机:丈夫手机号==husbandPhone @@ -1121,7 +1135,7 @@ public class PatientFacade { //2:excel导出 Map header = new LinkedHashMap<>(); - header.put("acceptanceTime", "接受日期"); + header.put("acceptanceTime", "接收日期"); header.put("issuedTime", "下发日期"); header.put("number", "编号"); header.put("username", "姓名"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/KeyPregnantWomenExcelModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/KeyPregnantWomenExcelModel.java index 819a224..87ed73b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/KeyPregnantWomenExcelModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/KeyPregnantWomenExcelModel.java @@ -33,11 +33,11 @@ public class KeyPregnantWomenExcelModel { /* 孕次:怀孕次数== 查看母子实现 */ - private Integer pregnancyTimes; + private String pregnancyTimes; /* 产次:生产次数== 查看母子实现(对象中有) */ - private Integer prodTime; + private String prodTime; /* 预产期:产妇预产期==dueDate */ @@ -94,19 +94,19 @@ public class KeyPregnantWomenExcelModel { - public Integer getPregnancyTimes() { + public String getPregnancyTimes() { return pregnancyTimes; } - public void setPregnancyTimes(Integer pregnancyTimes) { + public void setPregnancyTimes(String pregnancyTimes) { this.pregnancyTimes = pregnancyTimes; } - public Integer getProdTime() { + public String getProdTime() { return prodTime; } - public void setProdTime(Integer prodTime) { + public void setProdTime(String prodTime) { this.prodTime = prodTime; }