liquanyu / regional-platform

Download as
Browse Code »

Commit 9d7f66ec8779556b9f025b5d6d454e860cac4d14

Authored by liquanyu
1 parent 559009f984
Exists in master and in 1 other branch dev

微量元素

Showing 1 changed file with 10 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java View file @ 9d7f66e
... ... @@ -146,8 +146,8 @@
146 146 data.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated()));
147 147 data.put("microelements", model.getMicroelements());
148 148 data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));
149   -
150   - int week = DateUtil.getWeek(pat.getLastMenses(),model.getCreated());
  149 + Date lastMenses = DateUtil.addDay(pat.getLastMenses(),1);
  150 + int week = DateUtil.getWeek(lastMenses,model.getCreated());
151 151 Map<String,List<String>> contents = new HashMap<>();
152 152 boolean isNormal = false;
153 153  
154 154  
155 155  
... ... @@ -182,16 +182,16 @@
182 182  
183 183 String nextCheckDate = "";
184 184 String nextCheckWeek = "";
185   - Date lastMenses = DateUtil.addDay(pat.getLastMenses(),1);
  185 +
186 186 if (isNormal) {
187 187 if (week < 13)
188 188 {
189   - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,13));
  189 + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),13));
190 190 nextCheckWeek = "孕13周前后";
191 191 }
192 192 else if (week >= 13 && week < 28)
193 193 {
194   - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,28));
  194 + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),28));
195 195 nextCheckWeek = "孕28周前后";
196 196 }
197 197 }
198 198  
199 199  
200 200  
201 201  
... ... @@ -199,27 +199,27 @@
199 199 {
200 200 if (week < 8)
201 201 {
202   - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,8));
  202 + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),8));
203 203 nextCheckWeek = "孕8周前后";
204 204 }
205 205 else if (week >= 8 && week < 13)
206 206 {
207   - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,13));
  207 + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),13));
208 208 nextCheckWeek = "孕13周前后";
209 209 }
210 210 else if (week >= 13 && week < 20)
211 211 {
212   - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,20));
  212 + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),20));
213 213 nextCheckWeek = "孕20周前后";
214 214 }
215 215 else if (week >= 20 && week < 28)
216 216 {
217   - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,28));
  217 + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),28));
218 218 nextCheckWeek = "孕28周前后";
219 219 }
220 220 else if (week >= 28 && week < 36)
221 221 {
222   - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,36));
  222 + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),36));
223 223 nextCheckWeek = "孕36周前后";
224 224 }
225 225 }