jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8934d28d671672f654864e1d713deb698da424fc

Authored by jiangjiazhi
1 parent 61242b1306
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

修改新电子病历

Showing 3 changed files with 29 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 8934d28
... ... @@ -113,6 +113,8 @@
113 113 */
114 114 private Date lastMensesEnd;
115 115  
  116 +
  117 +
116 118 /**
117 119 * 地址
118 120 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 8934d28
... ... @@ -202,6 +202,7 @@
202 202 patientsQuery.setLikeName(riskPatientsQueryRequest.getName());
203 203 patientsQuery.sethScore(riskPatientsQueryRequest.gethScore());
204 204 patientsQuery.setrFactor(riskPatientsQueryRequest.getrFactor());
  205 + Date currentDate = DateUtil.formatDate(new Date());
205 206 if (null != riskPatientsQueryRequest.getServiceType()) {
206 207 patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType()));
207 208 }
208 209  
209 210  
... ... @@ -210,12 +211,18 @@
210 211 patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
211 212  
212 213 if(null!= riskPatientsQueryRequest.getStartAge()){
213   - Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getStartAge());
  214 + Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getStartAge());
214 215 patientsQuery.setBirthEnd(date);
215 216 }
216 217 if(null!= riskPatientsQueryRequest.getEndAge()){
217   - Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getEndAge());
  218 + Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getEndAge());
218 219 patientsQuery.setBirthStart(date);
  220 + }
  221 + if(null!=riskPatientsQueryRequest.getStartChsj()){
  222 + patientsQuery.setFmDateEnd(DateUtil.addDay(currentDate, -riskPatientsQueryRequest.getStartChsj()));
  223 + }
  224 + if(null!=riskPatientsQueryRequest.getEndChsj()){
  225 + patientsQuery.setFmDateStart(DateUtil.addDay(currentDate, -riskPatientsQueryRequest.getEndChsj()));
219 226 }
220 227  
221 228 patientsQuery.setLimit(riskPatientsQueryRequest.getLimit());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ 8934d28
... ... @@ -35,8 +35,9 @@
35 35 @FormParam
36 36 private Integer startAge;
37 37 private Integer endAge;
  38 + private Integer endChsj;
  39 + private Integer startChsj;
38 40  
39   -
40 41 //风险等级
41 42 @FormParam
42 43 private String rLevel;
... ... @@ -58,6 +59,22 @@
58 59 //体验会员 0非会员 1会员
59 60 @FormParam
60 61 private Integer expVip;
  62 +
  63 + public Integer getEndChsj() {
  64 + return endChsj;
  65 + }
  66 +
  67 + public void setEndChsj(Integer endChsj) {
  68 + this.endChsj = endChsj;
  69 + }
  70 +
  71 + public Integer getStartChsj() {
  72 + return startChsj;
  73 + }
  74 +
  75 + public void setStartChsj(Integer startChsj) {
  76 + this.startChsj = startChsj;
  77 + }
61 78  
62 79 public Date capStart() {
63 80 if (null != startDueWeek) {