Commit d6b8dfa19ecc12b5d6a3ccba693f0ec90877499f
1 parent
cbaeb0d526
Exists in
master
and in
1 other branch
修改电子病历
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
d6b8dfa
... | ... | @@ -270,7 +270,7 @@ |
270 | 270 | //产检基本信息 |
271 | 271 | map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckTime())); |
272 | 272 | //产检孕周 |
273 | - map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients)); | |
273 | + map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckTime())); | |
274 | 274 | String checkDoctor = ""; |
275 | 275 | |
276 | 276 | if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getProdDoctor())){ |
... | ... | @@ -601,7 +601,7 @@ |
601 | 601 | |
602 | 602 | //产检基本信息 |
603 | 603 | map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckDate())); |
604 | - map.put("currentDueDate",checkWeek(patients)); | |
604 | + map.put("currentDueDate",ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate())); | |
605 | 605 | |
606 | 606 | String checkDoctor = ""; |
607 | 607 |