shiyang / regional-platform

Download as
Browse Code »

Commit d88e551ef7e065e3cdcd5011f78d0d3574272e88

Authored by jiangjiazhi
2 parents 2c719948b0 b3368f3df1
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java View file @ d88e551
... ... @@ -173,7 +173,7 @@
173 173 //妇女信息
174 174 archiveMap = new HashMap<>();
175 175 archiveMap.put("certificateNum", archiveModel.getCertificateNum());
176   - archiveMap.put("certificateTypeId", CommonsHelper.getName1(archiveModel.getCertificateTypeId(),basicConfigService));
  176 + archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
177 177 archiveMap.put("username", archiveModel.getUsername());
178 178 archiveMap.put("birthday",archiveModel.getBirthday());
179 179 archiveMap.put("age", archiveModel.getAge());
... ... @@ -212,8 +212,20 @@
212 212 folicAcidQuery.setNeed("y");
213 213  
214 214 folicAcidQuery.setHospitalId(queryRequest.getHospitalId());
215   - folicAcidQuery.setDrawTimeStart(queryRequest.getDrawTimeStart());
216   - folicAcidQuery.setDrawTimeEnd(queryRequest.getDrawTimeEnd());
  215 +
  216 + if(StringUtils.isNotEmpty(queryRequest.getDrawTime())){
  217 + String[] dates = queryRequest.getDrawTime().split(" - ");
  218 + folicAcidQuery.setDrawTimeStart(DateUtil.parseYMD(dates[0]));
  219 + if(dates.length>=2){
  220 + Date date= DateUtil.parseYMD(dates[1]);
  221 + if(null!=date){
  222 + long d = date.getTime() + 86398000;
  223 + date = new Date(d);
  224 + }
  225 + folicAcidQuery.setDrawTimeEnd(date);
  226 + }
  227 + }
  228 +
217 229 folicAcidQuery.setHighRisk(queryRequest.getHighRisk());
218 230  
219 231 //省市区筛选机构
... ... @@ -287,8 +299,19 @@
287 299 query.setYn(YnEnums.YES.getId());
288 300 String hospitalId = autoMatchFacade.getHospitalId(userId);
289 301 query.setHospitalId(hospitalId);
290   - query.setDrawTimeStart(queryRequest.getDrawTimeStart());
291   - query.setDrawTimeEnd(queryRequest.getDrawTimeEnd());
  302 +
  303 + if(StringUtils.isNotEmpty(queryRequest.getDrawTime())){
  304 + String[] dates = queryRequest.getDrawTime().split(" - ");
  305 + query.setDrawTimeStart(DateUtil.parseYMD(dates[0]));
  306 + if(dates.length>=2){
  307 + Date date= DateUtil.parseYMD(dates[1]);
  308 + if(null!=date){
  309 + long d = date.getTime() + 86398000;
  310 + date = new Date(d);
  311 + }
  312 + query.setDrawTimeEnd(date);
  313 + }
  314 + }
292 315 query.setHighRisk(queryRequest.getHighRisk());
293 316  
294 317 //省市区筛选机构
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ d88e551
... ... @@ -10,6 +10,7 @@
10 10 import com.lyms.platform.common.enums.YnEnums;
11 11 import com.lyms.platform.common.result.BaseListResponse;
12 12 import com.lyms.platform.common.result.BaseObjectResponse;
  13 +import com.lyms.platform.common.result.BaseResponse;
13 14 import com.lyms.platform.common.utils.DateUtil;
14 15 import com.lyms.platform.common.utils.SystemConfig;
15 16 import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest;
... ... @@ -187,8 +188,19 @@
187 188 query.setYn(YnEnums.YES.getId());
188 189 query.setCertificateNum(request.getCardNo());
189 190 query.setYiXueYiJian(request.getYiXueYiJian());
190   - query.setPremaritalUpTimeStart(request.getPremaritalUpTimeStart());
191   - query.setPremaritalUpTimeEnd(request.getPremaritalUpTimeEnd());
  191 +
  192 + if(StringUtils.isNotEmpty(request.getPremaritalUpTime())){
  193 + String[] dates = request.getPremaritalUpTime().split(" - ");
  194 + query.setPremaritalUpTimeStart(DateUtil.parseYMD(dates[0]));
  195 + if(dates.length>=2){
  196 + Date date= DateUtil.parseYMD(dates[1]);
  197 + if(null!=date){
  198 + long d = date.getTime() + 86398000;
  199 + date = new Date(d);
  200 + }
  201 + query.setPremaritalUpTimeEnd(date);
  202 + }
  203 + }
192 204 query.setSexType(request.getSexType());
193 205  
194 206 if (CollectionUtils.isNotEmpty(parentIds)){
... ... @@ -210,7 +222,7 @@
210 222 ResidentsArchiveModel model = residentsArchiveService.getResident(checkup.getParentId());
211 223 map.put("premaritalUpTime", checkup.getPremaritalUpTime());
212 224 map.put("username", model.getUsername());
213   - map.put("certificateNum",checkup.getCertificateNum());
  225 + map.put("certificateNum",model.getCertificateNum());
214 226 map.put("phone", model.getPhone());
215 227 if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo()== PhysiologyStatusEnum.NORMAL.getId()){
216 228 map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java View file @ d88e551
... ... @@ -26,10 +26,8 @@
26 26 private String cityId;
27 27 //区县
28 28 private String areaId;
29   - //发放开始时间
30   - private Date drawTimeStart;
31   - //结束时间
32   - private Date drawTimeEnd;
  29 + //领取时间
  30 + private String drawTime;
33 31 //高危因素
34 32 private String highRisk;
35 33  
36 34  
... ... @@ -97,20 +95,12 @@
97 95 this.areaId = areaId;
98 96 }
99 97  
100   - public Date getDrawTimeStart() {
101   - return drawTimeStart;
  98 + public String getDrawTime() {
  99 + return drawTime;
102 100 }
103 101  
104   - public void setDrawTimeStart(Date drawTimeStart) {
105   - this.drawTimeStart = drawTimeStart;
106   - }
107   -
108   - public Date getDrawTimeEnd() {
109   - return drawTimeEnd;
110   - }
111   -
112   - public void setDrawTimeEnd(Date drawTimeEnd) {
113   - this.drawTimeEnd = drawTimeEnd;
  102 + public void setDrawTime(String drawTime) {
  103 + this.drawTime = drawTime;
114 104 }
115 105  
116 106 public String getHighRisk() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java View file @ d88e551
1 1 package com.lyms.platform.operate.web.request;
2 2  
  3 +import com.lyms.platform.common.core.annotation.form.Form;
  4 +
3 5 import java.util.Date;
4 6  
5 7 /**
... ... @@ -7,6 +9,7 @@
7 9 *
8 10 * Created by Administrator on 2016/11/24 0024.
9 11 */
  12 +@Form
10 13 public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{
11 14  
12 15 private String id;
... ... @@ -18,10 +21,8 @@
18 21 private String username;
19 22 //联系方式
20 23 private String phone;
21   - //开始时间
22   - private Date premaritalUpTimeStart;
23   - //结束时间
24   - private Date premaritalUpTimeEnd;
  24 + //检查时间
  25 + private String premaritalUpTime;
25 26 //医学意见
26 27 private Integer yiXueYiJian;
27 28 //医院ID
28 29  
... ... @@ -85,20 +86,12 @@
85 86 this.phone = phone;
86 87 }
87 88  
88   - public Date getPremaritalUpTimeStart() {
89   - return premaritalUpTimeStart;
  89 + public String getPremaritalUpTime() {
  90 + return premaritalUpTime;
90 91 }
91 92  
92   - public void setPremaritalUpTimeStart(Date premaritalUpTimeStart) {
93   - this.premaritalUpTimeStart = premaritalUpTimeStart;
94   - }
95   -
96   - public Date getPremaritalUpTimeEnd() {
97   - return premaritalUpTimeEnd;
98   - }
99   -
100   - public void setPremaritalUpTimeEnd(Date premaritalUpTimeEnd) {
101   - this.premaritalUpTimeEnd = premaritalUpTimeEnd;
  93 + public void setPremaritalUpTime(String premaritalUpTime) {
  94 + this.premaritalUpTime = premaritalUpTime;
102 95 }
103 96  
104 97 public Integer getYiXueYiJian() {