Commit 03349dac634ad842eed38c71414943b1c72f3eed
1 parent
5a651c3a6d
Exists in
master
and in
1 other branch
增加胎盘枚举
Showing 6 changed files with 102 additions and 8 deletions
- platform-common/src/main/java/com/lyms/platform/common/enums/ConfigTypeEnums.java
- platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-common/src/main/java/com/lyms/platform/common/enums/ConfigTypeEnums.java
View file @
03349da
... | ... | @@ -21,8 +21,15 @@ |
21 | 21 | YDQJD("ydqjd",SystemConfig.YDQJD), |
22 | 22 | XX("xx",SystemConfig.XUEXING), |
23 | 23 | FXYS("fxys",SystemConfig.FXYS), |
24 | - GWFZ("gwfz",SystemConfig.GWFZ) | |
25 | - ; | |
24 | + GWFZ("gwfz",SystemConfig.GWFZ), | |
25 | + JZS("jzs",SystemConfig.JZS), | |
26 | + GRS("grs",SystemConfig.GRS), | |
27 | + YMJZS("ymjzs",SystemConfig.YMJZS), | |
28 | + YWGMS("ywgms",SystemConfig.YWGMS), | |
29 | + SSS("sss",SystemConfig.SSS), | |
30 | + YSFYS("ysfy",SystemConfig.YSFYS), | |
31 | + BCRS("bcrs",SystemConfig.BCRS); | |
32 | + | |
26 | 33 | |
27 | 34 | |
28 | 35 | private ConfigTypeEnums(String type,String value){ |
platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java
View file @
03349da
... | ... | @@ -44,5 +44,20 @@ |
44 | 44 | public static final String FXYS = "5769eef90cf22c3157577421"; |
45 | 45 | //高危分值 |
46 | 46 | public static final String GWFZ = "5769eef90cf22c3157577422"; |
47 | + | |
48 | + //家族史 | |
49 | + public static final String JZS = "5769eef90cf22c3157577422"; | |
50 | + //个人史 | |
51 | + public static final String GRS = "5769eef90cf22c3157577422"; | |
52 | + //疫苗接种史 | |
53 | + public static final String YMJZS = "5769eef90cf22c3157577422"; | |
54 | + //药物过敏史 | |
55 | + public static final String YWGMS = "5769eef90cf22c3157577422"; | |
56 | + //手术史 | |
57 | + public static final String SSS = "5769eef90cf22c3157577422"; | |
58 | + //叶酸服用 | |
59 | + public static final String YSFYS = "5769eef90cf22c3157577422"; | |
60 | + //本次妊娠 | |
61 | + public static final String BCRS = "5769eef90cf22c3157577422"; | |
47 | 62 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
View file @
03349da
... | ... | @@ -23,6 +23,7 @@ |
23 | 23 | @Autowired |
24 | 24 | private AntenatalExaminationFacade antenatalExaminationFacade; |
25 | 25 | |
26 | + | |
26 | 27 | /** |
27 | 28 | * 查询产前检查 |
28 | 29 | * |
... | ... | @@ -81,6 +82,11 @@ |
81 | 82 | @ResponseBody |
82 | 83 | public BaseResponse delOneAntById(@Valid AntExQueryRequest antExQueryRequest) { |
83 | 84 | return antenatalExaminationFacade.delOneAntEx(antExQueryRequest); |
85 | + } | |
86 | + @RequestMapping(method = RequestMethod.GET, value = "/antex/getenums") | |
87 | + @ResponseBody | |
88 | + public BaseResponse getEnums(){ | |
89 | + return antenatalExaminationFacade.getEnums(); | |
84 | 90 | } |
85 | 91 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
View file @
03349da
... | ... | @@ -132,10 +132,10 @@ |
132 | 132 | * |
133 | 133 | * @return 返回结果 |
134 | 134 | */ |
135 | - @RequestMapping(method = RequestMethod.GET, value = "/getHighRisk") | |
135 | + /* @RequestMapping(method = RequestMethod.GET, value = "/getHighRisk") | |
136 | 136 | @ResponseBody |
137 | 137 | public BaseResponse getHighRisk() { |
138 | 138 | return basicConfigFacade.getHighRisk(); |
139 | - } | |
139 | + }*/ | |
140 | 140 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
03349da
... | ... | @@ -3,10 +3,11 @@ |
3 | 3 | import com.lyms.platform.biz.service.AntenatalExaminationService; |
4 | 4 | import com.lyms.platform.biz.service.PatientsService; |
5 | 5 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
6 | -import com.lyms.platform.common.enums.YnEnums; | |
6 | +import com.lyms.platform.common.enums.*; | |
7 | 7 | import com.lyms.platform.common.result.BaseObjectResponse; |
8 | 8 | import com.lyms.platform.common.result.BaseResponse; |
9 | 9 | import com.lyms.platform.common.utils.Assert; |
10 | +import com.lyms.platform.common.utils.SystemConfig; | |
10 | 11 | import com.lyms.platform.operate.web.request.AntExAddRequest; |
11 | 12 | import com.lyms.platform.operate.web.request.AntExQueryRequest; |
12 | 13 | import com.lyms.platform.operate.web.request.AntExcAddRequest; |
13 | 14 | |
14 | 15 | |
... | ... | @@ -23,9 +24,14 @@ |
23 | 24 | import org.apache.commons.lang.StringUtils; |
24 | 25 | import org.springframework.beans.factory.annotation.Autowired; |
25 | 26 | import org.springframework.stereotype.Component; |
27 | +import org.springframework.web.bind.annotation.RequestMapping; | |
28 | +import org.springframework.web.bind.annotation.RequestMethod; | |
29 | +import org.springframework.web.bind.annotation.ResponseBody; | |
26 | 30 | |
27 | 31 | import java.util.ArrayList; |
32 | +import java.util.HashMap; | |
28 | 33 | import java.util.List; |
34 | +import java.util.Map; | |
29 | 35 | |
30 | 36 | /** |
31 | 37 | * 产前检查接口 |
... | ... | @@ -38,6 +44,8 @@ |
38 | 44 | private AntenatalExaminationService antenatalExaminationService; |
39 | 45 | @Autowired |
40 | 46 | private PatientsService patientsService; |
47 | + @Autowired | |
48 | + private BasicConfigFacade basicConfigFacade; | |
41 | 49 | |
42 | 50 | /** |
43 | 51 | * 增加一条产前检查 |
... | ... | @@ -180,6 +188,65 @@ |
180 | 188 | } |
181 | 189 | |
182 | 190 | return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
191 | + } | |
192 | + public BaseResponse getEnums(){ | |
193 | + Map<String,Object> map =new HashMap<>(); | |
194 | + map.put("getFetPosition",getFetPosition()); | |
195 | + map.put("getFetal",getFetal()); | |
196 | + map.put("getJoin",getJoin()); | |
197 | + map.put("getTaiPan",getTaiPan()); | |
198 | + map.put("getHighRisk",basicConfigFacade.getHighRisk()); | |
199 | + map.put("jws",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID)); | |
200 | + map.put("xx",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.XUEXING)); | |
201 | + map.put("ydqjd",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.YDQJD)); | |
202 | + map.put("fxys",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.FXYS)); | |
203 | + map.put("gwfz",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.GWFZ)); | |
204 | + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
205 | + } | |
206 | + | |
207 | + //胎方位 | |
208 | + public List<Object> getFetPosition(){ | |
209 | + List<Object> list = new ArrayList<>(); | |
210 | + for(FetalPositionEnums enums:FetalPositionEnums.values()){ | |
211 | + Map<String,Object> resultMap = new HashMap<>(); | |
212 | + resultMap.put("id",enums.getId()); | |
213 | + resultMap.put("name",enums.getName()); | |
214 | + list.add(resultMap); | |
215 | + } | |
216 | + return list; | |
217 | + } | |
218 | + //胎先露 | |
219 | + public List getFetal(){ | |
220 | + List<Object> list = new ArrayList<>(); | |
221 | + for(FetalEnums enums:FetalEnums.values()){ | |
222 | + Map<String,Object> resultMap = new HashMap<>(); | |
223 | + resultMap.put("id",enums.getId()); | |
224 | + resultMap.put("name",enums.getName()); | |
225 | + list.add(resultMap); | |
226 | + } | |
227 | + return list; | |
228 | + } | |
229 | + //衔接 | |
230 | + public List getJoin(){ | |
231 | + List<Object> list = new ArrayList<>(); | |
232 | + for(JoinEnums enums:JoinEnums.values()){ | |
233 | + Map<String,Object> resultMap = new HashMap<>(); | |
234 | + resultMap.put("id",enums.getId()); | |
235 | + resultMap.put("name",enums.getName()); | |
236 | + list.add(resultMap); | |
237 | + } | |
238 | + return list; | |
239 | + } | |
240 | + //胎盘 | |
241 | + public List getTaiPan(){ | |
242 | + List<Object> list = new ArrayList<>(); | |
243 | + for(TaiPanEnums enums:TaiPanEnums.values()){ | |
244 | + Map<String,Object> resultMap = new HashMap<>(); | |
245 | + resultMap.put("id",enums.getId()); | |
246 | + resultMap.put("name",enums.getName()); | |
247 | + list.add(resultMap); | |
248 | + } | |
249 | + return list; | |
183 | 250 | } |
184 | 251 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
View file @
03349da
... | ... | @@ -196,7 +196,7 @@ |
196 | 196 | return objectResponse; |
197 | 197 | } |
198 | 198 | |
199 | - public BaseResponse getHighRisk() { | |
199 | + public List getHighRisk() { | |
200 | 200 | BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); |
201 | 201 | basicConfigQuery.setYn(YnEnums.YES.getId()); |
202 | 202 | basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID); |
... | ... | @@ -211,8 +211,7 @@ |
211 | 211 | } |
212 | 212 | } |
213 | 213 | } |
214 | - | |
215 | - return new BaseObjectResponse().setData(convertToList(basicConfigs1)).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); | |
214 | + return basicConfigs1; | |
216 | 215 | } |
217 | 216 | |
218 | 217 | private List convertToList(List<BasicConfig> list) { |