Commit ccd7e8b20436d6d146359d3e9f246e467f8c9c30
1 parent
1630a95b61
Exists in
master
and in
8 other branches
修改新电子病历
Showing 2 changed files with 16 additions and 20 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
ccd7e8b
| ... | ... | @@ -214,12 +214,17 @@ |
| 214 | 214 | patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel()); |
| 215 | 215 | patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd()); |
| 216 | 216 | patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart()); |
| 217 | - if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTimeEnd())){ | |
| 218 | - patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(riskPatientsQueryRequest.getBuildTimeEnd())); | |
| 217 | + if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTime())){ | |
| 218 | + | |
| 219 | + String nextDateStr = riskPatientsQueryRequest.getBuildTime(); | |
| 220 | + String[] dates = nextDateStr.split(" - "); | |
| 221 | + | |
| 222 | + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(dates[0])); | |
| 223 | + if(dates.length==2){ | |
| 224 | + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(dates[1])); | |
| 225 | + } | |
| 219 | 226 | } |
| 220 | - if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTimeStart())){ | |
| 221 | - patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(riskPatientsQueryRequest.getBuildTimeStart())); | |
| 222 | - } | |
| 227 | + | |
| 223 | 228 | |
| 224 | 229 | if (null != riskPatientsQueryRequest.getStartAge()) { |
| 225 | 230 | Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getStartAge()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
View file @
ccd7e8b
| ... | ... | @@ -61,28 +61,19 @@ |
| 61 | 61 | //体验会员 0非会员 1会员 |
| 62 | 62 | @FormParam |
| 63 | 63 | private Integer expVip; |
| 64 | - //建档时间开始 | |
| 65 | - private String buildTimeStart; | |
| 64 | + //建档时间 | |
| 65 | + private String buildTime; | |
| 66 | 66 | // |
| 67 | - private String buildTimeEnd; | |
| 68 | 67 | |
| 69 | 68 | // 0 高危孕妇 1 全部孕妇 2全部产妇 |
| 70 | 69 | private Integer queryType; |
| 71 | 70 | |
| 72 | - public String getBuildTimeEnd() { | |
| 73 | - return buildTimeEnd; | |
| 71 | + public String getBuildTime() { | |
| 72 | + return buildTime; | |
| 74 | 73 | } |
| 75 | 74 | |
| 76 | - public void setBuildTimeEnd(String buildTimeEnd) { | |
| 77 | - this.buildTimeEnd = buildTimeEnd; | |
| 78 | - } | |
| 79 | - | |
| 80 | - public String getBuildTimeStart() { | |
| 81 | - return buildTimeStart; | |
| 82 | - } | |
| 83 | - | |
| 84 | - public void setBuildTimeStart(String buildTimeStart) { | |
| 85 | - this.buildTimeStart = buildTimeStart; | |
| 75 | + public void setBuildTime(String buildTime) { | |
| 76 | + this.buildTime = buildTime; | |
| 86 | 77 | } |
| 87 | 78 | |
| 88 | 79 | public Integer getQueryType() { |