jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4b3bed9ddb1f0e898d21728f5577cbe0bc60e800

Authored by jiangjiazhi
2 parents b58dab0028 546908d8ac
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ 4b3bed9
... ... @@ -277,7 +277,7 @@
277 277 //血型
278 278 private String xueXing;
279 279 //RH血型
280   - private String RHXueXing;
  280 + private String rhxueXing;
281 281 //血糖
282 282 private String xueTang;
283 283 /* 肝功能 */
284 284  
... ... @@ -1303,12 +1303,12 @@
1303 1303 this.xueXing = xueXing;
1304 1304 }
1305 1305  
1306   - public String getRHXueXing() {
1307   - return RHXueXing;
  1306 + public String getRhxueXing() {
  1307 + return rhxueXing;
1308 1308 }
1309 1309  
1310   - public void setRHXueXing(String RHXueXing) {
1311   - this.RHXueXing = RHXueXing;
  1310 + public void setRhxueXing(String rhxueXing) {
  1311 + this.rhxueXing = rhxueXing;
1312 1312 }
1313 1313  
1314 1314 public String getXueTang() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java View file @ 4b3bed9
... ... @@ -30,44 +30,41 @@
30 30 //发放
31 31 @RequestMapping(value = "/addOrUpdateFolicAcid", method = RequestMethod.POST)
32 32 @ResponseBody
33   -// @TokenRequired
  33 + @TokenRequired
34 34 public BaseResponse addOrUpdateFolicAcid(@RequestBody FolicAcidAddRequest folicAcidAddRequest,
35 35 HttpServletRequest request) {
36 36 //获取当前登录用户ID
37   -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
38   -
39   - return folicAcidFacade.addOrUpdateFolicAcid(folicAcidAddRequest,1);
  37 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  38 + return folicAcidFacade.addOrUpdateFolicAcid(folicAcidAddRequest,loginState.getId());
40 39 }
41 40  
42 41 //获取单个发放记录
43 42 @RequestMapping(value = "/getFolicAcid", method = RequestMethod.GET)
44 43 @ResponseBody
45   -// @TokenRequired
  44 + @TokenRequired
46 45 public BaseObjectResponse getFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest,
47 46 HttpServletRequest request) {
48   -
49 47 return folicAcidFacade.getFolicAcid(folicAcidQueryRequest);
50 48 }
51 49  
52 50 //叶酸发放管理
53 51 @RequestMapping(value = "/queryFolicAcid", method = RequestMethod.GET)
54 52 @ResponseBody
55   -// @TokenRequired
  53 + @TokenRequired
56 54 public BaseListResponse queryFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest,
57 55 HttpServletRequest request) {
58   -
59 56 return folicAcidFacade.queryFolicAcid(folicAcidQueryRequest);
60 57 }
61 58  
62   - //
63   - @RequestMapping(value = "/folicAcidExport", method = RequestMethod.GET)
64   - @ResponseBody
65   -// @TokenRequired
66   - public BaseListResponse folicAcidExport(@Valid FolicAcidQueryRequest folicAcidQueryRequest,
67   - HttpServletRequest request) {
68   -
69   - return folicAcidFacade.queryFolicAcid(folicAcidQueryRequest);
70   - }
  59 +// //
  60 +// @RequestMapping(value = "/folicAcidExport", method = RequestMethod.GET)
  61 +// @ResponseBody
  62 +//// @TokenRequired
  63 +// public BaseListResponse folicAcidExport(@Valid FolicAcidQueryRequest folicAcidQueryRequest,
  64 +// HttpServletRequest request) {
  65 +//
  66 +// return folicAcidFacade.queryFolicAcid(folicAcidQueryRequest);
  67 +// }
71 68  
72 69 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 4b3bed9
... ... @@ -424,7 +424,7 @@
424 424  
425 425 /* 血型 */
426 426 checkup.setXueXing(addRequest.getXueXing());
427   - checkup.setRHXueXing(addRequest.getRhXueXing());
  427 + checkup.setRhxueXing(addRequest.getRhxueXing());
428 428 checkup.setXueTang(addRequest.getXueTang());
429 429  
430 430 /* 肝功能 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java View file @ 4b3bed9
... ... @@ -266,7 +266,7 @@
266 266 //血型
267 267 private String xueXing;
268 268 //RH血型
269   - private String rhXueXing;
  269 + private String rhxueXing;
270 270 //血糖
271 271 private String xueTang;
272 272 /* 肝功能 */
273 273  
... ... @@ -1261,12 +1261,12 @@
1261 1261 this.xueXing = xueXing;
1262 1262 }
1263 1263  
1264   - public String getRhXueXing() {
1265   - return rhXueXing;
  1264 + public String getRhxueXing() {
  1265 + return rhxueXing;
1266 1266 }
1267 1267  
1268   - public void setRhXueXing(String rhXueXing) {
1269   - this.rhXueXing = rhXueXing;
  1268 + public void setRhxueXing(String rhxueXing) {
  1269 + this.rhxueXing = rhxueXing;
1270 1270 }
1271 1271  
1272 1272 public String getXueTang() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/WomenGuideSmsRequest.java View file @ 4b3bed9
  1 +package com.lyms.platform.operate.web.request;
  2 +
  3 +import com.lyms.platform.common.core.annotation.form.Form;
  4 +import com.lyms.platform.common.core.annotation.form.FormParam;
  5 +import org.hibernate.validator.constraints.NotBlank;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * Created by Administrator on 2016/12/7 0007.
  11 + */
  12 +@Form
  13 +public class WomenGuideSmsRequest {
  14 +
  15 + //短信内容
  16 + @FormParam
  17 + @NotBlank(message = "短信内容不能为空")
  18 + private String smsContent;
  19 +
  20 + //妇女IDs
  21 + private List<String> ids;
  22 + //1 妇女 2: 孕妇 3: 产妇
  23 + private String type;
  24 +
  25 + public String getSmsContent() {
  26 + return smsContent;
  27 + }
  28 +
  29 + public void setSmsContent(String smsContent) {
  30 + this.smsContent = smsContent;
  31 + }
  32 +
  33 + public List<String> getIds() {
  34 + return ids;
  35 + }
  36 +
  37 + public void setIds(List<String> ids) {
  38 + this.ids = ids;
  39 + }
  40 +
  41 + public String getType() {
  42 + return type;
  43 + }
  44 +
  45 + public void setType(String type) {
  46 + this.type = type;
  47 + }
  48 +}