jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bcc84231358835081decd1ed075cd6be4bea20fa

Authored by wtt
1 parent 7abf732d84
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

户籍：本市（常住）、外地常住（暂住）、流动

Showing 2 changed files with 52 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ bcc8423
... ... @@ -1103,7 +1103,20 @@
1103 1103 //户籍：本市（常住）、外地常住（暂住）、流动
1104 1104 String basicConfig = getBasicConfig(patients.getPliveTypeId());
1105 1105 //keyPregnantWomenExcelModel.setAddress(basicConfig);
1106   - keyPregnantWomenExcelModel.setAddress( map.get("residence").toString());
  1106 +// keyPregnantWomenExcelModel.setAddress( map.get("residence").toString());
  1107 + if(basicConfig.contains("常住")){
  1108 + keyPregnantWomenExcelModel.setAddressbs("√");
  1109 + keyPregnantWomenExcelModel.setAddressld("");
  1110 + keyPregnantWomenExcelModel.setAddresswd("");
  1111 + }else if(basicConfig.contains("暂住")){
  1112 + keyPregnantWomenExcelModel.setAddressbs("");
  1113 + keyPregnantWomenExcelModel.setAddressld("");
  1114 + keyPregnantWomenExcelModel.setAddresswd("√");
  1115 + }else if(basicConfig.contains("流动")){
  1116 + keyPregnantWomenExcelModel.setAddressbs("");
  1117 + keyPregnantWomenExcelModel.setAddressld("√");
  1118 + keyPregnantWomenExcelModel.setAddresswd("");
  1119 + }
1107 1120  
1108 1121 //孕妇手机：产妇手机号==phone
1109 1122 keyPregnantWomenExcelModel.setPhone(patients.getPhone());
... ... @@ -1140,7 +1153,9 @@
1140 1153 header.put("number", "编号");
1141 1154 header.put("username", "姓名");
1142 1155 header.put("age", "年龄");
1143   - header.put("address", "户籍");
  1156 + header.put("addressbs", "户籍/本市");
  1157 + header.put("addresswd", "外地/常驻");
  1158 + header.put("addressld", "流动");
1144 1159 header.put("pregnancyTimes", "孕次");
1145 1160 header.put("prodTime", "产次");
1146 1161 header.put("dueDate", "预产期");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/KeyPregnantWomenExcelModel.java View file @ bcc8423
... ... @@ -9,6 +9,8 @@
9 9  
10 10 public class KeyPregnantWomenExcelModel {
11 11  
  12 +
  13 +
12 14 //接受日期：空
13 15 private String acceptanceTime;
14 16 //下发日期：空
15 17  
16 18  
... ... @@ -26,10 +28,19 @@
26 28 private Integer age;
27 29  
28 30 /**
29   - *户籍：本市（常住）、外地常住（暂住）、流动 ==address
  31 + *、户籍：本市（常住）
30 32 */
31   - private String address;
  33 + private String addressbs;
  34 + /*
  35 + 外地常住（暂住）、
  36 + */
  37 + private String addresswd;
  38 + /*
  39 + 流动
  40 + */
  41 + private String addressld;
32 42  
  43 +
33 44 /*
34 45 孕次：怀孕次数== 查看母子实现
35 46 */
36 47  
37 48  
38 49  
39 50  
40 51  
... ... @@ -83,17 +94,30 @@
83 94 this.age = age;
84 95 }
85 96  
86   - public String getAddress() {
87   - return address;
  97 + public String getAddressbs() {
  98 + return addressbs;
88 99 }
89 100  
90   - public void setAddress(String address) {
91   - this.address = address;
  101 + public void setAddressbs(String addressbs) {
  102 + this.addressbs = addressbs;
92 103 }
93 104  
  105 + public String getAddresswd() {
  106 + return addresswd;
  107 + }
94 108  
  109 + public void setAddresswd(String addresswd) {
  110 + this.addresswd = addresswd;
  111 + }
95 112  
  113 + public String getAddressld() {
  114 + return addressld;
  115 + }
96 116  
  117 + public void setAddressld(String addressld) {
  118 + this.addressld = addressld;
  119 + }
  120 +
97 121 public String getPregnancyTimes() {
98 122 return pregnancyTimes;
99 123 }
... ... @@ -206,9 +230,11 @@
206 230 ", number='" + number + '\'' +
207 231 ", username='" + username + '\'' +
208 232 ", age=" + age +
209   - ", address='" + address + '\'' +
210   - ", pregnancyTimes=" + pregnancyTimes +
211   - ", prodTime=" + prodTime +
  233 + ", addressbs='" + addressbs + '\'' +
  234 + ", addresswd='" + addresswd + '\'' +
  235 + ", addressld='" + addressld + '\'' +
  236 + ", pregnancyTimes='" + pregnancyTimes + '\'' +
  237 + ", prodTime='" + prodTime + '\'' +
212 238 ", dueDate='" + dueDate + '\'' +
213 239 ", addressRegister='" + addressRegister + '\'' +
214 240 ", phone='" + phone + '\'' +