shiyang / regional-platform

Download as
Browse Code »

Commit d8910b7b8ab52d1daebdd170bccd6a62e5f4aadf

Authored by jiangjiazhi
1 parent b6637152ba
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/AntenatalExaminationFacade.java View file @ d8910b7
... ... @@ -186,7 +186,7 @@
186 186 MaternalDeliverModel model = modelList.get(0);
187 187 dueDate = model.getDueDate();
188 188 }
189   - PostReviewQuery postReviewQuery = null;
  189 + PostReviewQuery postReviewQuery = new PostReviewQuery();;
190 190 if (StringUtils.isNotEmpty(dueDate)) {
191 191 Date date = DateUtil.parseYMD(dueDate);
192 192 //初诊记录
... ... @@ -215,7 +215,7 @@
215 215 data.add(new AntData(an, null != organization ? organization.getName() : ""));
216 216 }
217 217 }
218   - postReviewQuery = new PostReviewQuery();
  218 +
219 219 postReviewQuery.setYn(YnEnums.YES.getId());
220 220 if (list.size() - 1 > i) {
221 221 postReviewQuery.setStart(date);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java View file @ d8910b7
... ... @@ -122,12 +122,12 @@
122 122 setRemarks(patients.getMremark());
123 123 setRiskScore("60");
124 124  
125   - int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
126   - String week= (days/7)+"";
127   - int day = (days%7);
128   - this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
129 125 if(null!=patients.getLastMenses()){
130 126 setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
  127 + int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
  128 + String week= (days/7)+"";
  129 + int day = (days%7);
  130 + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
131 131 }
132 132 return this;
133 133 }