jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2e71866e29932fc9862cc22809092aa01c320177

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

重点孕妇登记表导出——居住地址 只有最后具体门牌号

Showing 2 changed files with 27 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 2e71866
... ... @@ -1078,19 +1078,33 @@
1078 1078 keyPregnantWomenExcelModel.setUsername(patients.getUsername());
1079 1079 //年龄：产妇年龄 ==age
1080 1080 keyPregnantWomenExcelModel.setAge(patients.getAge());
1081   - //户籍：本市（常住）、外地常住（暂住）、流动
1082   - String basicConfig = getBasicConfig(patients.getPliveTypeId());
1083   - keyPregnantWomenExcelModel.setAddress(basicConfig);
1084 1081  
  1082 +
1085 1083 AntExChuModel data = antExService.findOne(patients.getId());
  1084 +
  1085 +
  1086 + AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录
  1087 + antExChuQuery.setParentId(patients.getId());
  1088 + List<AntExChuModel> antExChulist = antExService.queryAntExChu(antExChuQuery);
  1089 + AntExChuModel data2 = antExService.findOne(antExChulist.get(0).getId());//data2.getProdTime()
  1090 +
1086 1091 //孕次：怀孕次数== 查看母子实现
1087   - keyPregnantWomenExcelModel.setPregnancyTimes(data == null ? 0 : (data.getPregnancyTimes() == null ? 0 : data.getPregnancyTimes()));
  1092 + keyPregnantWomenExcelModel.setPregnancyTimes(data2 == null ? "" : (data2.getPregnancyTimes() == null ? "" : data2.getPregnancyTimes().toString()));
1088 1093 //产次：生产次数== 查看母子实现
1089   - keyPregnantWomenExcelModel.setProdTime(data == null ? 0 : (data.getProdTime() == null ? 0 : data.getProdTime() + 1));
  1094 + keyPregnantWomenExcelModel.setProdTime(data2 == null ? "" : (data2.getProdTime() == null ? "" : data2.getProdTime().toString()));
  1095 +
1090 1096 //预产期：产妇预产期==dueDate
1091 1097 keyPregnantWomenExcelModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
  1098 +
1092 1099 //居住地址：现住地址== addressRegister（孕妇居住地）addressPostRest（产后休养地）
1093   - keyPregnantWomenExcelModel.setAddressRegister(patients.getAddressRegister());
  1100 + Map<String, Object> map = viewFacade.getPatientViewData(patients, patients.getId());
  1101 + keyPregnantWomenExcelModel.setAddressRegister(map.get("register").toString());
  1102 +
  1103 + //户籍：本市（常住）、外地常住（暂住）、流动
  1104 + String basicConfig = getBasicConfig(patients.getPliveTypeId());
  1105 + //keyPregnantWomenExcelModel.setAddress(basicConfig);
  1106 + keyPregnantWomenExcelModel.setAddress( map.get("residence").toString());
  1107 +
1094 1108 //孕妇手机：产妇手机号==phone
1095 1109 keyPregnantWomenExcelModel.setPhone(patients.getPhone());
1096 1110 //丈夫手机：丈夫手机号==husbandPhone
... ... @@ -1121,7 +1135,7 @@
1121 1135  
1122 1136 //2:excel导出
1123 1137 Map<String, String> header = new LinkedHashMap<>();
1124   - header.put("acceptanceTime", "接受日期");
  1138 + header.put("acceptanceTime", "接收日期");
1125 1139 header.put("issuedTime", "下发日期");
1126 1140 header.put("number", "编号");
1127 1141 header.put("username", "姓名");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/KeyPregnantWomenExcelModel.java View file @ 2e71866
... ... @@ -33,11 +33,11 @@
33 33 /*
34 34 孕次：怀孕次数== 查看母子实现
35 35 */
36   - private Integer pregnancyTimes;
  36 + private String pregnancyTimes;
37 37 /*
38 38 产次：生产次数== 查看母子实现（对象中有）
39 39 */
40   - private Integer prodTime;
  40 + private String prodTime;
41 41 /*
42 42 预产期：产妇预产期==dueDate
43 43 */
44 44  
45 45  
46 46  
... ... @@ -94,19 +94,19 @@
94 94  
95 95  
96 96  
97   - public Integer getPregnancyTimes() {
  97 + public String getPregnancyTimes() {
98 98 return pregnancyTimes;
99 99 }
100 100  
101   - public void setPregnancyTimes(Integer pregnancyTimes) {
  101 + public void setPregnancyTimes(String pregnancyTimes) {
102 102 this.pregnancyTimes = pregnancyTimes;
103 103 }
104 104  
105   - public Integer getProdTime() {
  105 + public String getProdTime() {
106 106 return prodTime;
107 107 }
108 108  
109   - public void setProdTime(Integer prodTime) {
  109 + public void setProdTime(String prodTime) {
110 110 this.prodTime = prodTime;
111 111 }
112 112