shiyang / regional-platform

Download as
Browse Code »

Commit 342b5c1f3f888706825b426ff66ea34dd50e9f30

Authored by jiangjiazhi
1 parent ff9129aebb
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 2 changed files with 6 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 342b5c1
... ... @@ -206,8 +206,8 @@
206 206 patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType()));
207 207 }
208 208 patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
209   - patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capStart());
210   - patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capEnd());
  209 + patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
  210 + patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
211 211  
212 212 if(null!= riskPatientsQueryRequest.getStartAge()){
213 213 Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getStartAge());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ 342b5c1
... ... @@ -61,8 +61,8 @@
61 61  
62 62 public Date capStart() {
63 63 if (null != startDueWeek) {
64   - start = NumberUtils.toInt(startDueWeek, 0);
65   - Date endDate = DateUtil.addDay(new Date(), -(start*7));
  64 + int start = NumberUtils.toInt(startDueWeek, 0);
  65 + Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start*7)+6);
66 66 return endDate;
67 67 }
68 68 return null;
... ... @@ -70,8 +70,8 @@
70 70  
71 71 public Date capEnd() {
72 72 if (null != endDueWeek) {
73   - end = NumberUtils.toInt(endDueWeek, 0);
74   - Date endDate = DateUtil.addDay(new Date(), -(end*7));
  73 + int end = NumberUtils.toInt(endDueWeek, 0);
  74 + Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end*7));
75 75 return endDate;
76 76 }
77 77 return null;