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 aea311e..a511408 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 @@ -1103,7 +1103,20 @@ public class PatientFacade { //户籍:本市(常住)、外地常住(暂住)、流动 String basicConfig = getBasicConfig(patients.getPliveTypeId()); //keyPregnantWomenExcelModel.setAddress(basicConfig); - keyPregnantWomenExcelModel.setAddress( map.get("residence").toString()); +// keyPregnantWomenExcelModel.setAddress( map.get("residence").toString()); + if(basicConfig.contains("常住")){ + keyPregnantWomenExcelModel.setAddressbs("√"); + keyPregnantWomenExcelModel.setAddressld(""); + keyPregnantWomenExcelModel.setAddresswd(""); + }else if(basicConfig.contains("暂住")){ + keyPregnantWomenExcelModel.setAddressbs(""); + keyPregnantWomenExcelModel.setAddressld(""); + keyPregnantWomenExcelModel.setAddresswd("√"); + }else if(basicConfig.contains("流动")){ + keyPregnantWomenExcelModel.setAddressbs(""); + keyPregnantWomenExcelModel.setAddressld("√"); + keyPregnantWomenExcelModel.setAddresswd(""); + } //孕妇手机:产妇手机号==phone keyPregnantWomenExcelModel.setPhone(patients.getPhone()); @@ -1140,7 +1153,9 @@ public class PatientFacade { header.put("number", "编号"); header.put("username", "姓名"); header.put("age", "年龄"); - header.put("address", "户籍"); + header.put("addressbs", "户籍/本市"); + header.put("addresswd", "外地/常驻"); + header.put("addressld", "流动"); header.put("pregnancyTimes", "孕次"); header.put("prodTime", "产次"); header.put("dueDate", "预产期"); 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 87ed73b..46d5975 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 @@ -9,6 +9,8 @@ import org.springframework.data.mongodb.core.mapping.Document; public class KeyPregnantWomenExcelModel { + + //接受日期:空 private String acceptanceTime; //下发日期:空 @@ -26,9 +28,18 @@ public class KeyPregnantWomenExcelModel { private Integer age; /** - *户籍:本市(常住)、外地常住(暂住)、流动 ==address + *、户籍:本市(常住) + */ + private String addressbs; + /* + 外地常住(暂住)、 + */ + private String addresswd; + /* + 流动 */ - private String address; + private String addressld; + /* 孕次:怀孕次数== 查看母子实现 @@ -83,16 +94,29 @@ public class KeyPregnantWomenExcelModel { this.age = age; } - public String getAddress() { - return address; + public String getAddressbs() { + return addressbs; + } + + public void setAddressbs(String addressbs) { + this.addressbs = addressbs; } - public void setAddress(String address) { - this.address = address; + public String getAddresswd() { + return addresswd; } + public void setAddresswd(String addresswd) { + this.addresswd = addresswd; + } + public String getAddressld() { + return addressld; + } + public void setAddressld(String addressld) { + this.addressld = addressld; + } public String getPregnancyTimes() { return pregnancyTimes; @@ -206,9 +230,11 @@ public class KeyPregnantWomenExcelModel { ", number='" + number + '\'' + ", username='" + username + '\'' + ", age=" + age + - ", address='" + address + '\'' + - ", pregnancyTimes=" + pregnancyTimes + - ", prodTime=" + prodTime + + ", addressbs='" + addressbs + '\'' + + ", addresswd='" + addresswd + '\'' + + ", addressld='" + addressld + '\'' + + ", pregnancyTimes='" + pregnancyTimes + '\'' + + ", prodTime='" + prodTime + '\'' + ", dueDate='" + dueDate + '\'' + ", addressRegister='" + addressRegister + '\'' + ", phone='" + phone + '\'' +