liquanyu / regional-platform

Download as
Browse Code »

Commit 6f48f3ebfbbd3e617c8bc0107cb9511c1fff04a7

Authored by litao@lymsh.com
1 parent 84b8d158eb
Exists in master and in 1 other branch dev

增加处理意见

Showing 10 changed files with 110 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ 6f48f3e
... ... @@ -16,6 +16,9 @@
16 16 public class AntExChuModel extends BaseModel {
17 17  
18 18 private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
  19 +
  20 + private List<String> treatmentOpinion2;
  21 +
19 22 //条码
20 23 private String barCode;
21 24 private String id;
... ... @@ -168,6 +171,14 @@
168 171  
169 172 //浮肿
170 173 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 + }
171 182  
172 183 public String getEdema() {
173 184 return edema;
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 6f48f3e
... ... @@ -17,6 +17,9 @@
17 17  
18 18 private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid();
19 19  
  20 + /**处理意见*/
  21 + private List<String> treatmentOpinion2;
  22 +
20 23 private String id;
21 24 private String barCode;
22 25 private String pid;
... ... @@ -128,6 +131,14 @@
128 131 private String s75gdgtt;
129 132 //甲状腺功能
130 133 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 + }
131 142  
132 143 public String getZyqbd() {
133 144 return zyqbd;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 6f48f3e
... ... @@ -12,6 +12,7 @@
12 12 import com.lyms.platform.operate.web.request.*;
13 13 import com.lyms.platform.operate.web.result.*;
14 14 import com.lyms.platform.operate.web.utils.InitDataUtils;
  15 +import com.lyms.platform.operate.web.utils.MongoUtil;
15 16 import com.lyms.platform.permission.model.Organization;
16 17 import com.lyms.platform.permission.model.Users;
17 18 import com.lyms.platform.permission.service.CouponService;
... ... @@ -79,6 +80,9 @@
79 80 private SieveService sieveService;
80 81 @Autowired
81 82 private DischargeAbstractMotherService dischargeAbstractMotherService;
  83 + @Autowired
  84 + private MongoUtil mongoUtil;
  85 +
82 86 /**
83 87 * 处理区域隐藏建档
84 88 *
... ... @@ -2091,6 +2095,7 @@
2091 2095 }
2092 2096 antenatalExaminationResult.setCheckDoctor(map1);
2093 2097 }
  2098 + antenatalExaminationResult.setExaminationModel2(mongoUtil.findPlatValueList(examinationModel.getTreatmentOpinion2()));
2094 2099 antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
2095 2100 antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
2096 2101 object = antenatalExaminationResult;
... ... @@ -2140,6 +2145,7 @@
2140 2145 applyOrderQuery.setYn(YnEnums.YES.getId());
2141 2146 antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
2142 2147 antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(), antExChuModel.getParentId()));
  2148 + antexChuResult.setTreatmentOpinion2(mongoUtil.findPlatValueList(antExChuModel.getTreatmentOpinion2()));
2143 2149 object = antexChuResult;
2144 2150 }
2145 2151 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 6f48f3e
... ... @@ -79,6 +79,8 @@
79 79  
80 80 @Autowired
81 81 private CouponService couponService;
  82 + @Autowired
  83 + private MongoUtil mongoUtil;
82 84  
83 85 /**
84 86 * 建档查询
... ... @@ -1793,8 +1795,7 @@
1793 1795 map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
1794 1796 map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
1795 1797  
1796   -
1797   -
  1798 + map.put("treatmentOpinion2", mongoUtil.findPlatValueList(data.getTreatmentOpinion2()));
1798 1799  
1799 1800 //早孕期病毒检测
1800 1801 // private String zyqbdjc;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 6f48f3e
... ... @@ -15,6 +15,9 @@
15 15 */
16 16 @Form
17 17 public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminationModel> {
  18 + /** 处理意见 */
  19 + private List<String> treatmentOpinion2;
  20 +
18 21 // 访视记录id
19 22 private String id;
20 23  
... ... @@ -82,6 +85,8 @@
82 85 private String typeYc;
83 86 //处理意见
84 87 private String treatmentOpinion;
  88 +
  89 +
85 90 //指导
86 91 private String guide;
87 92 //产检医生
... ... @@ -111,6 +116,14 @@
111 116 //甲状腺功能
112 117 private String jzxgn;
113 118  
  119 + public List<String> getTreatmentOpinion2() {
  120 + return treatmentOpinion2;
  121 + }
  122 +
  123 + public void setTreatmentOpinion2(List<String> treatmentOpinion2) {
  124 + this.treatmentOpinion2 = treatmentOpinion2;
  125 + }
  126 +
114 127 public String getZyqbdjc() {
115 128 return zyqbdjc;
116 129 }
... ... @@ -256,6 +269,7 @@
256 269 @Override
257 270 public AntenatalExaminationModel convertToDataModel() {
258 271 AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
  272 + examinationModel.setTreatmentOpinion2(treatmentOpinion2);
259 273 examinationModel.setZyqbd(zyqbdjc);
260 274 examinationModel.setNtjc(ntjc);
261 275 examinationModel.setCjsc(cjsc);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 6f48f3e
... ... @@ -19,6 +19,19 @@
19 19 */
20 20 @Form
21 21 public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
  22 +
  23 +
  24 +
  25 + private List<String> treatmentOpinion2;
  26 +
  27 + public List<String> getTreatmentOpinion2() {
  28 + return treatmentOpinion2;
  29 + }
  30 +
  31 + public void setTreatmentOpinion2(List<String> treatmentOpinion2) {
  32 + this.treatmentOpinion2 = treatmentOpinion2;
  33 + }
  34 +
22 35 @FormParam
23 36 @NotEmpty(message = "孕妇id不能为空")
24 37 private String parentId;
... ... @@ -1184,6 +1197,7 @@
1184 1197 @Override
1185 1198 public AntExChuModel convertToDataModel() {
1186 1199 AntExChuModel antExChuModel = new AntExChuModel();
  1200 + antExChuModel.setTreatmentOpinion2(treatmentOpinion2);
1187 1201  
1188 1202 antExChuModel.setAntExcAddOthers(antExcAddOthers);
1189 1203 antExChuModel.setSurvFetus(survFetus);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 6f48f3e
... ... @@ -14,6 +14,9 @@
14 14 * Created by Administrator on 2016/6/15 0015.
15 15 */
16 16 public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
  17 +
  18 + private List<Map<String, Object>> examinationModel2;
  19 +
17 20 private String barCode;
18 21 private String id;
19 22 private String isSieve;
... ... @@ -101,6 +104,14 @@
101 104 private String s75gdgtt;
102 105 // //甲状腺功能
103 106 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 + }
104 115  
105 116 public String getGongGaoSelect() {
106 117 return gongGaoSelect;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 6f48f3e
... ... @@ -14,6 +14,9 @@
14 14 * Created by Administrator on 2016/6/20 0020.
15 15 */
16 16 public class AntexChuResult {
  17 +
  18 + private List<Map<String, Object>> treatmentOpinion2;
  19 +
17 20 private String barCode;
18 21  
19 22 public String getBarCode() {
... ... @@ -288,6 +291,14 @@
288 291  
289 292 //浮肿
290 293 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 + }
291 302  
292 303 public String getEdema() {
293 304 return edema;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ 6f48f3e
... ... @@ -9,6 +9,7 @@
9 9 import java.util.ArrayList;
10 10 import java.util.Date;
11 11 import java.util.List;
  12 +import java.util.Map;
12 13  
13 14 /**
14 15 * 产前筛查列表返回对象
... ... @@ -19,6 +20,9 @@
19 20  
20 21 private String id;
21 22  
  23 + /** 处理意见 */
  24 + private List<Map<String, Object>> treatmentOpinion2;
  25 +
22 26 private String pid;
23 27 //名字
24 28 private String name;
... ... @@ -52,6 +56,14 @@
52 56 private String isH = "0";
53 57 //<!---------基本信息----------->
54 58  
  59 +
  60 + public List<Map<String, Object>> getTreatmentOpinion2() {
  61 + return treatmentOpinion2;
  62 + }
  63 +
  64 + public void setTreatmentOpinion2(List<Map<String, Object>> treatmentOpinion2) {
  65 + this.treatmentOpinion2 = treatmentOpinion2;
  66 + }
55 67  
56 68 public String getPid() {
57 69 return pid;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 6f48f3e
... ... @@ -297,5 +297,22 @@
297 297 }
298 298 return rest;
299 299 }
  300 +
  301 + public List<Map<String, Object>> findPlatValueList(List<String> ids) {
  302 + if(CollectionUtils.isNotEmpty(ids)) {
  303 + return null;
  304 + }
  305 + List<Map<String, Object>> rest = new ArrayList<>();
  306 + for (String id : ids) {
  307 + PlantformConfigModel platformConfig = getPlatformConfig(id);
  308 + if(platformConfig != null) {
  309 + Map<String, Object> tempMap = new HashedMap();
  310 + tempMap.put("id", platformConfig.getId());
  311 + tempMap.put("name", platformConfig.getValue());
  312 + rest.add(tempMap);
  313 + }
  314 + }
  315 + return rest;
  316 + }
300 317 }