jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4291bf27f4e587ebc79287cadb477c64a4fc8609

Authored by litao@lymsh.com
1 parent 43368f4a0d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

改需求

Showing 9 changed files with 150 additions and 55 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ 4291bf2
... ... @@ -6,6 +6,7 @@
6 6  
7 7 import java.util.Date;
8 8 import java.util.List;
  9 +import java.util.Map;
9 10  
10 11 /**
11 12 * 产前检查初诊模型
12 13  
... ... @@ -17,8 +18,25 @@
17 18  
18 19 private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
19 20  
20   - private List<String> treatmentOpinion2;
  21 + /** 处理意见 */
  22 + private Map<String, List<String>> treatmentOpinion2;
  23 + private List<String> treatmentOpinion2Types;
21 24  
  25 + public List<String> getTreatmentOpinion2Types() {
  26 + return treatmentOpinion2Types;
  27 + }
  28 +
  29 + public Map<String, List<String>> getTreatmentOpinion2() {
  30 + return treatmentOpinion2;
  31 + }
  32 +
  33 + public void setTreatmentOpinion2(Map<String, List<String>> treatmentOpinion2) {
  34 + this.treatmentOpinion2 = treatmentOpinion2;
  35 + }
  36 +
  37 + public void setTreatmentOpinion2Types(List<String> treatmentOpinion2Types) {
  38 + this.treatmentOpinion2Types = treatmentOpinion2Types;
  39 + }
22 40 //条码
23 41 private String barCode;
24 42 private String id;
... ... @@ -171,14 +189,6 @@
171 189  
172 190 //浮肿
173 191 private String edema;
174   -
175   - public List<String> getTreatmentOpinion2() {
176   - return treatmentOpinion2;
177   - }
178   -
179   - public void setTreatmentOpinion2(List<String> treatmentOpinion2) {
180   - this.treatmentOpinion2 = treatmentOpinion2;
181   - }
182 192  
183 193 public String getEdema() {
184 194 return edema;
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 4291bf2
... ... @@ -6,6 +6,7 @@
6 6  
7 7 import java.util.Date;
8 8 import java.util.List;
  9 +import java.util.Map;
9 10  
10 11 /**
11 12 * 产前检查
12 13  
... ... @@ -17,9 +18,26 @@
17 18  
18 19 private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid();
19 20  
20   - /**处理意见*/
21   - private List<String> treatmentOpinion2;
  21 + /** 处理意见 */
  22 + private Map<String, List<String>> treatmentOpinion2;
  23 + private List<String> treatmentOpinion2Types;
22 24  
  25 + public List<String> getTreatmentOpinion2Types() {
  26 + return treatmentOpinion2Types;
  27 + }
  28 +
  29 + public Map<String, List<String>> getTreatmentOpinion2() {
  30 + return treatmentOpinion2;
  31 + }
  32 +
  33 + public void setTreatmentOpinion2(Map<String, List<String>> treatmentOpinion2) {
  34 + this.treatmentOpinion2 = treatmentOpinion2;
  35 + }
  36 +
  37 + public void setTreatmentOpinion2Types(List<String> treatmentOpinion2Types) {
  38 + this.treatmentOpinion2Types = treatmentOpinion2Types;
  39 + }
  40 +
23 41 private String id;
24 42 private String barCode;
25 43 private String pid;
... ... @@ -131,14 +149,6 @@
131 149 private String s75gdgtt;
132 150 //甲状腺功能
133 151 private String jzxgn;
134   -
135   - public List<String> getTreatmentOpinion2() {
136   - return treatmentOpinion2;
137   - }
138   -
139   - public void setTreatmentOpinion2(List<String> treatmentOpinion2) {
140   - this.treatmentOpinion2 = treatmentOpinion2;
141   - }
142 152  
143 153 public String getZyqbd() {
144 154 return zyqbd;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 4291bf2
... ... @@ -21,6 +21,7 @@
21 21 import com.lyms.platform.pojo.*;
22 22 import com.lyms.platform.query.*;
23 23 import org.apache.commons.collections.CollectionUtils;
  24 +import org.apache.commons.collections.MapUtils;
24 25 import org.apache.commons.lang.StringUtils;
25 26 import org.apache.commons.lang.math.NumberUtils;
26 27 import org.slf4j.Logger;
... ... @@ -2095,7 +2096,19 @@
2095 2096 }
2096 2097 antenatalExaminationResult.setCheckDoctor(map1);
2097 2098 }
2098   - antenatalExaminationResult.setExaminationModel2(mongoUtil.findPlatValueList(examinationModel.getTreatmentOpinion2()));
  2099 +
  2100 + Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
  2101 + Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
  2102 + if(MapUtils.isNotEmpty(treatmentOpinion2)) {
  2103 + Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
  2104 + while (iterator.hasNext()) {
  2105 + Map.Entry<String, List<String>> map = iterator.next();
  2106 + restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList(map.getValue()));
  2107 + }
  2108 + }
  2109 + antenatalExaminationResult.setTreatmentOpinion2(restTreatmentOpinion2);
  2110 + antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
  2111 +
2099 2112 antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
2100 2113 antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
2101 2114 object = antenatalExaminationResult;
... ... @@ -2145,7 +2158,19 @@
2145 2158 applyOrderQuery.setYn(YnEnums.YES.getId());
2146 2159 antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
2147 2160 antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(), antExChuModel.getParentId()));
2148   - antexChuResult.setTreatmentOpinion2(mongoUtil.findPlatValueList(antExChuModel.getTreatmentOpinion2()));
  2161 +
  2162 + Map<String, List<String>> treatmentOpinion2 = antExChuModel.getTreatmentOpinion2();
  2163 + Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
  2164 + if(MapUtils.isNotEmpty(treatmentOpinion2)) {
  2165 + Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
  2166 + while (iterator.hasNext()) {
  2167 + Map.Entry<String, List<String>> map = iterator.next();
  2168 + restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList(map.getValue()));
  2169 + }
  2170 + }
  2171 + antexChuResult.setTreatmentOpinion2(restTreatmentOpinion2);
  2172 + antexChuResult.setTreatmentOpinion2Types(antExChuModel.getTreatmentOpinion2Types());
  2173 +
2149 2174 object = antexChuResult;
2150 2175 }
2151 2176 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 4291bf2
... ... @@ -1795,7 +1795,18 @@
1795 1795 map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
1796 1796 map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
1797 1797  
1798   - map.put("treatmentOpinion2", mongoUtil.findPlatValueList(data.getTreatmentOpinion2()));
  1798 + map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types());
  1799 + Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
  1800 + Map<String, List<String>> treatmentOpinion2 = data.getTreatmentOpinion2();
  1801 + if(MapUtils.isNotEmpty(treatmentOpinion2)) {
  1802 + Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
  1803 + while (iterator.hasNext()) {
  1804 + Map.Entry<String, List<String>> iter = iterator.next();
  1805 + restTreatmentOpinion2.put(iter.getKey(), mongoUtil.findPlatValueList(iter.getValue()));
  1806 + }
  1807 + }
  1808 + map.put("treatmentOpinion2", restTreatmentOpinion2);
  1809 + map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types());
1799 1810  
1800 1811 //早孕期病毒检测
1801 1812 // private String zyqbdjc;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 4291bf2
... ... @@ -16,8 +16,25 @@
16 16 @Form
17 17 public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminationModel> {
18 18 /** 处理意见 */
19   - private List<String> treatmentOpinion2;
  19 + private Map<String, List<String>> treatmentOpinion2;
  20 + private List<String> treatmentOpinion2Types;
20 21  
  22 + public List<String> getTreatmentOpinion2Types() {
  23 + return treatmentOpinion2Types;
  24 + }
  25 +
  26 + public Map<String, List<String>> getTreatmentOpinion2() {
  27 + return treatmentOpinion2;
  28 + }
  29 +
  30 + public void setTreatmentOpinion2(Map<String, List<String>> treatmentOpinion2) {
  31 + this.treatmentOpinion2 = treatmentOpinion2;
  32 + }
  33 +
  34 + public void setTreatmentOpinion2Types(List<String> treatmentOpinion2Types) {
  35 + this.treatmentOpinion2Types = treatmentOpinion2Types;
  36 + }
  37 +
21 38 // 访视记录id
22 39 private String id;
23 40  
... ... @@ -116,14 +133,6 @@
116 133 //甲状腺功能
117 134 private String jzxgn;
118 135  
119   - public List<String> getTreatmentOpinion2() {
120   - return treatmentOpinion2;
121   - }
122   -
123   - public void setTreatmentOpinion2(List<String> treatmentOpinion2) {
124   - this.treatmentOpinion2 = treatmentOpinion2;
125   - }
126   -
127 136 public String getZyqbdjc() {
128 137 return zyqbdjc;
129 138 }
... ... @@ -270,6 +279,7 @@
270 279 public AntenatalExaminationModel convertToDataModel() {
271 280 AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
272 281 examinationModel.setTreatmentOpinion2(treatmentOpinion2);
  282 + examinationModel.setTreatmentOpinion2Types(treatmentOpinion2Types);
273 283 examinationModel.setZyqbd(zyqbdjc);
274 284 examinationModel.setNtjc(ntjc);
275 285 examinationModel.setCjsc(cjsc);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 4291bf2
... ... @@ -20,18 +20,26 @@
20 20 @Form
21 21 public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
22 22  
  23 + private Map<String, List<String>> treatmentOpinion2;
  24 + private List<String> treatmentOpinion2Types;
23 25  
24   -
25   - private List<String> treatmentOpinion2;
26   -
27   - public List<String> getTreatmentOpinion2() {
  26 + public Map<String, List<String>> getTreatmentOpinion2() {
28 27 return treatmentOpinion2;
29 28 }
30 29  
31   - public void setTreatmentOpinion2(List<String> treatmentOpinion2) {
  30 + public void setTreatmentOpinion2(Map<String, List<String>> treatmentOpinion2) {
32 31 this.treatmentOpinion2 = treatmentOpinion2;
33 32 }
34 33  
  34 + public List<String> getTreatmentOpinion2Types() {
  35 + return treatmentOpinion2Types;
  36 + }
  37 +
  38 + public void setTreatmentOpinion2Types(List<String> treatmentOpinion2Types) {
  39 + this.treatmentOpinion2Types = treatmentOpinion2Types;
  40 + }
  41 +
  42 +
35 43 @FormParam
36 44 @NotEmpty(message = "孕妇id不能为空")
37 45 private String parentId;
38 46  
... ... @@ -1197,7 +1205,9 @@
1197 1205 @Override
1198 1206 public AntExChuModel convertToDataModel() {
1199 1207 AntExChuModel antExChuModel = new AntExChuModel();
  1208 +
1200 1209 antExChuModel.setTreatmentOpinion2(treatmentOpinion2);
  1210 + antExChuModel.setTreatmentOpinion2Types(treatmentOpinion2Types);
1201 1211  
1202 1212 antExChuModel.setAntExcAddOthers(antExcAddOthers);
1203 1213 antExChuModel.setSurvFetus(survFetus);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 4291bf2
... ... @@ -15,8 +15,26 @@
15 15 */
16 16 public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
17 17  
18   - private List<Map<String, Object>> examinationModel2;
  18 + /** 处理意见 */
  19 + private Map<String, List<Map<String, Object>>> treatmentOpinion2;
  20 + private List<String> treatmentOpinion2Types;
19 21  
  22 + public List<String> getTreatmentOpinion2Types() {
  23 + return treatmentOpinion2Types;
  24 + }
  25 +
  26 + public void setTreatmentOpinion2Types(List<String> treatmentOpinion2Types) {
  27 + this.treatmentOpinion2Types = treatmentOpinion2Types;
  28 + }
  29 +
  30 + public Map<String, List<Map<String, Object>>> getTreatmentOpinion2() {
  31 + return treatmentOpinion2;
  32 + }
  33 +
  34 + public void setTreatmentOpinion2(Map<String, List<Map<String, Object>>> treatmentOpinion2) {
  35 + this.treatmentOpinion2 = treatmentOpinion2;
  36 + }
  37 +
20 38 private String barCode;
21 39 private String id;
22 40 private String isSieve;
... ... @@ -104,14 +122,6 @@
104 122 private String s75gdgtt;
105 123 // //甲状腺功能
106 124 private String jzxgn;
107   -
108   - public List<Map<String, Object>> getExaminationModel2() {
109   - return examinationModel2;
110   - }
111   -
112   - public void setExaminationModel2(List<Map<String, Object>> examinationModel2) {
113   - this.examinationModel2 = examinationModel2;
114   - }
115 125  
116 126 public String getGongGaoSelect() {
117 127 return gongGaoSelect;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 4291bf2
... ... @@ -15,8 +15,25 @@
15 15 */
16 16 public class AntexChuResult {
17 17  
18   - private List<Map<String, Object>> treatmentOpinion2;
  18 + /** 处理意见 */
  19 + private Map<String, List<Map<String, Object>>> treatmentOpinion2;
  20 + private List<String> treatmentOpinion2Types;
19 21  
  22 + public List<String> getTreatmentOpinion2Types() {
  23 + return treatmentOpinion2Types;
  24 + }
  25 +
  26 + public Map<String, List<Map<String, Object>>> getTreatmentOpinion2() {
  27 + return treatmentOpinion2;
  28 + }
  29 +
  30 + public void setTreatmentOpinion2(Map<String, List<Map<String, Object>>> treatmentOpinion2) {
  31 + this.treatmentOpinion2 = treatmentOpinion2;
  32 + }
  33 +
  34 + public void setTreatmentOpinion2Types(List<String> treatmentOpinion2Types) {
  35 + this.treatmentOpinion2Types = treatmentOpinion2Types;
  36 + }
20 37 private String barCode;
21 38  
22 39 public String getBarCode() {
... ... @@ -291,14 +308,6 @@
291 308  
292 309 //浮肿
293 310 private String edema;
294   -
295   - public List<Map<String, Object>> getTreatmentOpinion2() {
296   - return treatmentOpinion2;
297   - }
298   -
299   - public void setTreatmentOpinion2(List<Map<String, Object>> treatmentOpinion2) {
300   - this.treatmentOpinion2 = treatmentOpinion2;
301   - }
302 311  
303 312 public String getEdema() {
304 313 return edema;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 4291bf2
... ... @@ -299,7 +299,7 @@
299 299 }
300 300  
301 301 public List<Map<String, Object>> findPlatValueList(List<String> ids) {
302   - if(CollectionUtils.isNotEmpty(ids)) {
  302 + if(CollectionUtils.isEmpty(ids)) {
303 303 return null;
304 304 }
305 305 List<Map<String, Object>> rest = new ArrayList<>();