jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1879b8060801ea5fc67f349f2839f2eaa13a1087

Authored by baohanddd
2 parents d879a9f9b5 068e141b4e
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 9 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/ExpYunEnums.java View file @ 1879b80
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +import java.util.ArrayList;
  4 +import java.util.HashMap;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +
  8 +/**
  9 + *
  10 + * 孕妇体验类型
  11 + *
  12 + * @author Administrator
  13 + *
  14 + */
  15 +public enum ExpYunEnums {
  16 +
  17 + SGY(0,"体验3个月服务"),ETFW(1,"体验孕期服务");
  18 +
  19 + private ExpYunEnums(int id, String name) {
  20 + this.id = id;
  21 + this.name = name;
  22 + }
  23 +
  24 + public static String getNameById(int id){
  25 + for(ExpYunEnums sex : values()){
  26 + if(id==sex.id){
  27 + return sex.getName();
  28 + }
  29 + }
  30 + return "";
  31 + }
  32 +
  33 + public static List<Map> getExpYunEnums() {
  34 + List<Map> list = new ArrayList<>();
  35 + for (ExpYunEnums e : ExpYunEnums.values()) {
  36 + Map rootMap = new HashMap();
  37 + rootMap.put("id", e.getId());
  38 + rootMap.put("name", e.getName());
  39 + list.add(rootMap);
  40 + }
  41 + return list;
  42 + }
  43 +
  44 + private int id;
  45 +
  46 + private String name;
  47 +
  48 + public int getId() {
  49 + return id;
  50 + }
  51 +
  52 + public String getName() {
  53 + return name;
  54 + }
  55 +}
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 1879b80
... ... @@ -216,6 +216,16 @@
216 216 //丈夫文化程度Id
217 217 private String hlevelTypeId;
218 218  
  219 + //体验类型
  220 + private Integer expType;
  221 +
  222 + public Integer getExpType() {
  223 + return expType;
  224 + }
  225 +
  226 + public void setExpType(Integer expType) {
  227 + this.expType = expType;
  228 + }
219 229  
220 230 public String getPlevelTypeId() {
221 231 return plevelTypeId;
platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java View file @ 1879b80
... ... @@ -109,6 +109,7 @@
109 109 writeString(response, "success");
110 110 }else if("addSieveJob".equals(sid)){
111 111 patientsService.addSieveJob();
  112 + writeString(response, "success");
112 113 }
113 114  
114 115 else {
platform-data-api/src/main/resources/log4j.properties View file @ 1879b80
... ... @@ -11,4 +11,14 @@
11 11 log4j.appender.FILEOUT.Append=true
12 12 log4j.appender.FILEOUT.layout=org.apache.log4j.PatternLayout
13 13 log4j.appender.FILEOUT.layout.ConversionPattern=[%-5p]_%d{yyyy-MM-dd HH:mm:ss} :%m%n
  14 +
  15 +
  16 +log4j.logger.task= INFO, task
  17 +log4j.appender.task=org.apache.log4j.DailyRollingFileAppender
  18 +log4j.appender.task.File=${catalina.base}/logs/task.log
  19 +log4j.appender.task.DatePattern='.'yyyy-MM-dd
  20 +log4j.appender.task.MaxFileSize=1024000KB
  21 +log4j.appender.task.MaxBackupIndex=10
  22 +log4j.appender.task.layout=org.apache.log4j.PatternLayout
  23 +log4j.appender.task.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] [%c] [%p] - %m%n
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ 1879b80
... ... @@ -133,7 +133,7 @@
133 133 @RequestMapping(value = "/queryDiagnose", method = RequestMethod.GET)
134 134 @ResponseBody
135 135 public BaseObjectResponse queryDiagnose(@RequestParam(required = true)String keyword) throws UnsupportedEncodingException {
136   - keyword = new String(keyword.getBytes("ISO-8859-1"),"UTF-8");
  136 + // keyword = new String(keyword.getBytes("ISO-8859-1"),"UTF-8");
137 137 return babyBookbuildingFacade.queryDiagnose(keyword);
138 138 }
139 139  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ 1879b80
... ... @@ -17,7 +17,9 @@
17 17 import org.springframework.stereotype.Controller;
18 18 import org.springframework.web.bind.annotation.*;
19 19  
  20 +import javax.validation.Valid;
20 21  
  22 +
21 23 /**
22 24 * 儿保检查
23 25 */
... ... @@ -39,7 +41,7 @@
39 41 */
40 42 @RequestMapping(method = RequestMethod.POST, value = "/addOrUpBabyCheck")
41 43 @ResponseBody
42   - public BaseResponse addOrUpBabyCheck(@RequestBody BabyCheckRequest request) {
  44 + public BaseResponse addOrUpBabyCheck(@Valid @RequestBody BabyCheckRequest request) {
43 45 if (request != null && !StringUtils.isEmpty(request.getId()))
44 46 {
45 47 return babyCheckFacade.updateBabyCheck(request);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java View file @ 1879b80
... ... @@ -11,6 +11,7 @@
11 11 import org.springframework.stereotype.Controller;
12 12 import org.springframework.web.bind.annotation.*;
13 13  
  14 +import javax.validation.Valid;
14 15 import java.util.List;
15 16 import java.util.Map;
16 17  
17 18  
... ... @@ -30,9 +31,9 @@
30 31 * @param request
31 32 * @return
32 33 */
33   - @RequestMapping(method = RequestMethod.POST, value = "/addSmsConfig")
  34 + @RequestMapping(method = RequestMethod.POST, value = "/addOrUpSmsConfig")
34 35 @ResponseBody
35   - public BaseResponse addSmsConfig(@RequestBody SmsConfigRequest request) {
  36 + public BaseResponse addOrUpSmsConfig(@Valid @RequestBody SmsConfigRequest request) {
36 37 if (!StringUtils.isEmpty(request.getId()))
37 38 {
38 39 return smsConfigFacade.updateSmsConfig(request);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java View file @ 1879b80
... ... @@ -13,7 +13,9 @@
13 13 import org.springframework.stereotype.Controller;
14 14 import org.springframework.web.bind.annotation.*;
15 15  
  16 +import javax.validation.Valid;
16 17  
  18 +
17 19 /**
18 20 * 消息模板配置配置
19 21 * Created by lqy on 2016/6/27.
... ... @@ -31,7 +33,7 @@
31 33 */
32 34 @RequestMapping(method = RequestMethod.POST, value = "/addOrUpSmsTemplate")
33 35 @ResponseBody
34   - public BaseResponse addOrUpSmsTemplate(@RequestBody SmsTemplateRequest request) {
  36 + public BaseResponse addOrUpSmsTemplate(@Valid @RequestBody SmsTemplateRequest request) {
35 37 if (!StringUtils.isEmpty(request.getId()))
36 38 {
37 39 return smsTemplateFacade.updateSmsTemplate(request);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 1879b80
1 1 package com.lyms.platform.operate.web.facade;
2 2  
3 3 import com.lyms.platform.biz.service.BasicConfigService;
4   -import com.lyms.platform.common.enums.ServiceStatusEnums;
5   -import com.lyms.platform.common.enums.ServiceTypeEnums;
6   -import com.lyms.platform.common.enums.YnEnums;
  4 +import com.lyms.platform.common.enums.*;
7 5 import com.lyms.platform.common.result.BaseListResponse;
8 6 import com.lyms.platform.common.utils.StringUtils;
9 7 import com.lyms.platform.common.utils.SystemConfig;
... ... @@ -188,6 +186,10 @@
188 186 List serviceStatus = ServiceStatusEnums.getServiceStatusList();
189 187 typeMap.put("serviceStatus", serviceStatus);
190 188  
  189 + //孕妇体验类型
  190 + List expYunEnums = ExpYunEnums.getExpYunEnums();
  191 + typeMap.put("expYunEnums", expYunEnums);
  192 +
191 193 list.add(typeMap);
192 194  
193 195  
... ... @@ -273,6 +275,28 @@
273 275 patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId());
274 276  
275 277 patient.setServiceStatus(yunRequest.getServiceStatus());
  278 +
  279 + if (yunRequest.getExpType() != null)
  280 + {
  281 + if (yunRequest.getExpType() == ExpYunEnums.SGY.getId())
  282 + {
  283 + Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(yunRequest.getBookbuildingDate()),3);
  284 + Date dueDate = DateUtil.parseYMD(yunRequest.getDueDate());
  285 + if (vipEndTime.getTime() > dueDate.getTime())
  286 + {
  287 + vipEndTime = dueDate;
  288 + }
  289 + patient.setVipEndTime(vipEndTime);
  290 + }
  291 + else
  292 + {
  293 + Date vipEndTime = DateUtil.parseYMD(yunRequest.getDueDate());
  294 + patient.setVipEndTime(vipEndTime);
  295 + }
  296 + patient.setExpType(yunRequest.getExpType());
  297 + }
  298 +
  299 +
276 300 patient.setVipEndTime(DateUtil.parseYMD(yunRequest.getVipEndTime()));
277 301 patient.setExpVip(yunRequest.getExpVip());
278 302 patient.setMremark(yunRequest.getMremark());
... ... @@ -286,6 +310,8 @@
286 310 patient.setVcCardNo(yunRequest.getVcCardNo());
287 311 patient.setHospitalId(yunRequest.getHospitalId());
288 312 patient.setYn(YnEnums.YES.getId());
  313 +
  314 +
289 315  
290 316 patient.setBuildType(0);
291 317