shiyang / regional-platform

Download as
Browse Code »

Commit 1820a42b1980073ab5a8e0d1218183c9efd62fa2

Authored by liquanyu
1 parent 3b3dfd7985
Exists in master and in 1 other branch nobuildprocess

add conde

Showing 7 changed files with 111 additions and 22 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 1820a42
... ... @@ -102,7 +102,7 @@
102 102 private Integer serviceStatus;
103 103  
104 104 //体验会员 false非会员 true会员
105   - private boolean isExpVip;
  105 + private boolean expVip;
106 106  
107 107 //会员截止时间
108 108 private Date vipEndTime;
109 109  
... ... @@ -117,11 +117,11 @@
117 117 }
118 118  
119 119 public boolean isExpVip() {
120   - return isExpVip;
  120 + return expVip;
121 121 }
122 122  
123   - public void setIsExpVip(boolean isExpVip) {
124   - this.isExpVip = isExpVip;
  123 + public void setExpVip(boolean expVip) {
  124 + this.expVip = expVip;
125 125 }
126 126  
127 127 public Date getVipEndTime() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ 1820a42
... ... @@ -99,6 +99,23 @@
99 99  
100 100  
101 101 /**
  102 + * 查询儿童建档记录就诊卡号，母亲身份证
  103 + * @param idCard
  104 + * @param vcCardNo
  105 + * @return
  106 + */
  107 + @RequestMapping(value = "/queryBabyBuildRecord", method = RequestMethod.GET)
  108 + @ResponseBody
  109 + public BaseObjectResponse queryBabyBuildRecord(@RequestParam("idCard")String idCard,@RequestParam("vcCardNo")String vcCardNo){
  110 + BookbuildingQueryRequest param = new BookbuildingQueryRequest();
  111 + param.setIdCard(idCard);
  112 + param.setVcCardNo(vcCardNo);
  113 + return babyBookbuildingFacade.queryBabyBuildRecord(param);
  114 + }
  115 +
  116 +
  117 +
  118 + /**
102 119 * 查询儿童建档页面基础数据
103 120 * @return
104 121 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 1820a42
... ... @@ -16,10 +16,7 @@
16 16 import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
17 17 import com.lyms.platform.operate.web.request.BookbuildingQueryRequest;
18 18 import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest;
19   -import com.lyms.platform.operate.web.result.BabyBuildResult;
20   -import com.lyms.platform.operate.web.result.BasicConfigResult;
21   -import com.lyms.platform.operate.web.result.BookbuildingRecordResult;
22   -import com.lyms.platform.operate.web.result.PregnantInfoResult;
  19 +import com.lyms.platform.operate.web.result.*;
23 20 import com.lyms.platform.pojo.BabyModel;
24 21 import com.lyms.platform.pojo.BasicConfig;
25 22 import com.lyms.platform.pojo.Patients;
... ... @@ -29,10 +26,7 @@
29 26 import org.springframework.beans.factory.annotation.Autowired;
30 27 import org.springframework.stereotype.Component;
31 28  
32   -import java.util.ArrayList;
33   -import java.util.HashMap;
34   -import java.util.List;
35   -import java.util.Map;
  29 +import java.util.*;
36 30  
37 31 /**
38 32 *
... ... @@ -295,6 +289,37 @@
295 289 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
296 290 objectResponse.setErrormsg("成功");
297 291  
  292 + return objectResponse;
  293 + }
  294 +
  295 + public BaseObjectResponse queryBabyBuildRecord(BookbuildingQueryRequest param) {
  296 +
  297 + List<BabyInfoResult> results = new ArrayList<>();
  298 + if (!StringUtils.isEmpty(param.getVcCardNo()) || !StringUtils.isEmpty(param.getIdCard()))
  299 + {
  300 + BabyModelQuery babyQuery = new BabyModelQuery();
  301 + babyQuery.setMcertNo(param.getIdCard());
  302 + babyQuery.setVcCardNo(param.getVcCardNo());
  303 + babyQuery.setYn(YnEnums.YES.getId());
  304 +
  305 + List<BabyModel> models = babyBookbuildingService.queryBabyBuildById(babyQuery);
  306 + if (models != null && models.size() > 0)
  307 + {
  308 + for(BabyModel model : models)
  309 + {
  310 +
  311 + BabyInfoResult result = new BabyInfoResult();
  312 + result.setId(model.getId());
  313 + result.setName(model.getName());
  314 + result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
  315 + }
  316 +
  317 + }
  318 + }
  319 +
  320 + BaseObjectResponse objectResponse = new BaseObjectResponse();
  321 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  322 + objectResponse.setErrormsg("成功");
298 323 return objectResponse;
299 324 }
300 325 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 1820a42
... ... @@ -236,7 +236,7 @@
236 236  
237 237 patient.setServiceStatus(yunRequest.getServiceStatus());
238 238 patient.setVipEndTime(DateUtil.parseYMD(yunRequest.getVipEndTime()));
239   - patient.setIsExpVip(yunRequest.isExpVip());
  239 + patient.setExpVip(yunRequest.isExpVip());
240 240  
241 241 patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
242 242 patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate()));
... ... @@ -319,7 +319,7 @@
319 319  
320 320 result.setServiceStatus(p.getServiceStatus());
321 321 result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime()));
322   - result.setIsExpVip(p.isExpVip());
  322 + result.setExpVip(p.isExpVip());
323 323  
324 324  
325 325 //院内信息
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java View file @ 1820a42
... ... @@ -117,7 +117,7 @@
117 117 private Integer serviceStatus;
118 118  
119 119 //体验会员 false非会员 true会员
120   - private boolean isExpVip;
  120 + private boolean expVip;
121 121  
122 122 //会员截止时间
123 123 private String vipEndTime;
124 124  
... ... @@ -131,11 +131,11 @@
131 131 }
132 132  
133 133 public boolean isExpVip() {
134   - return isExpVip;
  134 + return expVip;
135 135 }
136 136  
137   - public void setIsExpVip(boolean isExpVip) {
138   - this.isExpVip = isExpVip;
  137 + public void setExpVip(boolean expVip) {
  138 + this.expVip = expVip;
139 139 }
140 140  
141 141 public String getVipEndTime() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java View file @ 1820a42
  1 +package com.lyms.platform.operate.web.result;
  2 +
  3 +import java.util.Map;
  4 +
  5 +/**
  6 + * Created by Administrator on 2016/6/21.
  7 + */
  8 +public class BabyInfoResult {
  9 +
  10 + private String id;
  11 + private String name;
  12 + private String monthAge;
  13 +
  14 + private Map<String,String> buildRecords;
  15 +
  16 + public Map<String, String> getBuildRecords() {
  17 + return buildRecords;
  18 + }
  19 +
  20 + public void setBuildRecords(Map<String, String> buildRecords) {
  21 + this.buildRecords = buildRecords;
  22 + }
  23 +
  24 + public String getId() {
  25 + return id;
  26 + }
  27 +
  28 + public void setId(String id) {
  29 + this.id = id;
  30 + }
  31 +
  32 + public String getName() {
  33 + return name;
  34 + }
  35 +
  36 + public void setName(String name) {
  37 + this.name = name;
  38 + }
  39 +
  40 + public String getMonthAge() {
  41 + return monthAge;
  42 + }
  43 +
  44 + public void setMonthAge(String monthAge) {
  45 + this.monthAge = monthAge;
  46 + }
  47 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java View file @ 1820a42
... ... @@ -113,7 +113,7 @@
113 113 private Integer serviceStatus;
114 114  
115 115 //体验会员 false非会员 true会员
116   - private boolean isExpVip;
  116 + private boolean expVip;
117 117  
118 118 //会员截止时间
119 119 private String vipEndTime;
120 120  
... ... @@ -127,11 +127,11 @@
127 127 }
128 128  
129 129 public boolean isExpVip() {
130   - return isExpVip;
  130 + return expVip;
131 131 }
132 132  
133   - public void setIsExpVip(boolean isExpVip) {
134   - this.isExpVip = isExpVip;
  133 + public void setExpVip(boolean expVip) {
  134 + this.expVip = expVip;
135 135 }
136 136  
137 137 public String getVipEndTime() {