diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index 3211f7b..b401417 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -173,7 +173,7 @@ public class FolicAcidFacade { //妇女信息 archiveMap = new HashMap<>(); archiveMap.put("certificateNum", archiveModel.getCertificateNum()); - archiveMap.put("certificateTypeId", CommonsHelper.getName1(archiveModel.getCertificateTypeId(),basicConfigService)); + archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); archiveMap.put("username", archiveModel.getUsername()); archiveMap.put("birthday",archiveModel.getBirthday()); archiveMap.put("age", archiveModel.getAge()); @@ -212,8 +212,20 @@ public class FolicAcidFacade { folicAcidQuery.setNeed("y"); folicAcidQuery.setHospitalId(queryRequest.getHospitalId()); - folicAcidQuery.setDrawTimeStart(queryRequest.getDrawTimeStart()); - folicAcidQuery.setDrawTimeEnd(queryRequest.getDrawTimeEnd()); + + if(StringUtils.isNotEmpty(queryRequest.getDrawTime())){ + String[] dates = queryRequest.getDrawTime().split(" - "); + folicAcidQuery.setDrawTimeStart(DateUtil.parseYMD(dates[0])); + if(dates.length>=2){ + Date date= DateUtil.parseYMD(dates[1]); + if(null!=date){ + long d = date.getTime() + 86398000; + date = new Date(d); + } + folicAcidQuery.setDrawTimeEnd(date); + } + } + folicAcidQuery.setHighRisk(queryRequest.getHighRisk()); //省市区筛选机构 @@ -287,8 +299,19 @@ public class FolicAcidFacade { query.setYn(YnEnums.YES.getId()); String hospitalId = autoMatchFacade.getHospitalId(userId); query.setHospitalId(hospitalId); - query.setDrawTimeStart(queryRequest.getDrawTimeStart()); - query.setDrawTimeEnd(queryRequest.getDrawTimeEnd()); + + if(StringUtils.isNotEmpty(queryRequest.getDrawTime())){ + String[] dates = queryRequest.getDrawTime().split(" - "); + query.setDrawTimeStart(DateUtil.parseYMD(dates[0])); + if(dates.length>=2){ + Date date= DateUtil.parseYMD(dates[1]); + if(null!=date){ + long d = date.getTime() + 86398000; + date = new Date(d); + } + query.setDrawTimeEnd(date); + } + } query.setHighRisk(queryRequest.getHighRisk()); //省市区筛选机构 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 0502bbb..5d083d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.enums.PhysiologyStatusEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest; @@ -187,8 +188,19 @@ public class PremaritalCheckupFacade { query.setYn(YnEnums.YES.getId()); query.setCertificateNum(request.getCardNo()); query.setYiXueYiJian(request.getYiXueYiJian()); - query.setPremaritalUpTimeStart(request.getPremaritalUpTimeStart()); - query.setPremaritalUpTimeEnd(request.getPremaritalUpTimeEnd()); + + if(StringUtils.isNotEmpty(request.getPremaritalUpTime())){ + String[] dates = request.getPremaritalUpTime().split(" - "); + query.setPremaritalUpTimeStart(DateUtil.parseYMD(dates[0])); + if(dates.length>=2){ + Date date= DateUtil.parseYMD(dates[1]); + if(null!=date){ + long d = date.getTime() + 86398000; + date = new Date(d); + } + query.setPremaritalUpTimeEnd(date); + } + } query.setSexType(request.getSexType()); if (CollectionUtils.isNotEmpty(parentIds)){ @@ -210,7 +222,7 @@ public class PremaritalCheckupFacade { ResidentsArchiveModel model = residentsArchiveService.getResident(checkup.getParentId()); map.put("premaritalUpTime", checkup.getPremaritalUpTime()); map.put("username", model.getUsername()); - map.put("certificateNum",checkup.getCertificateNum()); + map.put("certificateNum",model.getCertificateNum()); map.put("phone", model.getPhone()); if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo()== PhysiologyStatusEnum.NORMAL.getId()){ map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java index c7bdd1f..d5015a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java @@ -26,10 +26,8 @@ public class FolicAcidQueryRequest extends BasePageQueryRequest { private String cityId; //区县 private String areaId; - //发放开始时间 - private Date drawTimeStart; - //结束时间 - private Date drawTimeEnd; + //领取时间 + private String drawTime; //高危因素 private String highRisk; @@ -97,20 +95,12 @@ public class FolicAcidQueryRequest extends BasePageQueryRequest { this.areaId = areaId; } - public Date getDrawTimeStart() { - return drawTimeStart; + public String getDrawTime() { + return drawTime; } - public void setDrawTimeStart(Date drawTimeStart) { - this.drawTimeStart = drawTimeStart; - } - - public Date getDrawTimeEnd() { - return drawTimeEnd; - } - - public void setDrawTimeEnd(Date drawTimeEnd) { - this.drawTimeEnd = drawTimeEnd; + public void setDrawTime(String drawTime) { + this.drawTime = drawTime; } public String getHighRisk() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java index c8644bf..b29477b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.request; +import com.lyms.platform.common.core.annotation.form.Form; + import java.util.Date; /** @@ -7,6 +9,7 @@ import java.util.Date; * * Created by Administrator on 2016/11/24 0024. */ +@Form public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{ private String id; @@ -18,10 +21,8 @@ public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{ private String username; //联系方式 private String phone; - //开始时间 - private Date premaritalUpTimeStart; - //结束时间 - private Date premaritalUpTimeEnd; + //检查时间 + private String premaritalUpTime; //医学意见 private Integer yiXueYiJian; //医院ID @@ -85,20 +86,12 @@ public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{ this.phone = phone; } - public Date getPremaritalUpTimeStart() { - return premaritalUpTimeStart; - } - - public void setPremaritalUpTimeStart(Date premaritalUpTimeStart) { - this.premaritalUpTimeStart = premaritalUpTimeStart; - } - - public Date getPremaritalUpTimeEnd() { - return premaritalUpTimeEnd; + public String getPremaritalUpTime() { + return premaritalUpTime; } - public void setPremaritalUpTimeEnd(Date premaritalUpTimeEnd) { - this.premaritalUpTimeEnd = premaritalUpTimeEnd; + public void setPremaritalUpTime(String premaritalUpTime) { + this.premaritalUpTime = premaritalUpTime; } public Integer getYiXueYiJian() {