Commit 717d55b9a45a49bfde7b5a758b88dc51a5212bdf
1 parent
1167032733
Exists in
master
and in
6 other branches
修改电子病历
Showing 2 changed files with 20 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
717d55b
| ... | ... | @@ -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.getLastMenses(),data.getCheckTime())); | |
| 273 | + map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients)); | |
| 274 | 274 | String checkDoctor = ""; |
| 275 | 275 | |
| 276 | 276 | if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getProdDoctor())){ |
| ... | ... | @@ -622,7 +622,7 @@ |
| 622 | 622 | } |
| 623 | 623 | map.put("hospital", hospital); |
| 624 | 624 | map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(data.getNextCheckTime())); |
| 625 | - map.put("cDueWeek",ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckDate())); | |
| 625 | + map.put("cDueWeek",ResolveUtils.getPregnancyWeek(patients)); | |
| 626 | 626 | // map.put("cDueWeek", data.getcDueWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(Integer.parseInt(data.getcDueWeek()))); |
| 627 | 627 | |
| 628 | 628 | /* 复诊信息 */ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java
View file @
717d55b
| ... | ... | @@ -6,6 +6,7 @@ |
| 6 | 6 | import com.lyms.platform.common.utils.JsonUtil; |
| 7 | 7 | import com.lyms.platform.operate.web.result.HighScoreResult; |
| 8 | 8 | import com.lyms.platform.pojo.BasicConfig; |
| 9 | +import com.lyms.platform.pojo.Patients; | |
| 9 | 10 | import com.lyms.platform.query.BasicConfigQuery; |
| 10 | 11 | import org.apache.commons.collections.CollectionUtils; |
| 11 | 12 | import org.apache.commons.lang.StringUtils; |
| ... | ... | @@ -346,6 +347,23 @@ |
| 346 | 347 | |
| 347 | 348 | return com.lyms.platform.common.utils.StringUtils.dueWeek(day); |
| 348 | 349 | } |
| 350 | + | |
| 351 | + public static String getPregnancyWeek(Patients patients){ | |
| 352 | + String dueWeek=""; | |
| 353 | + if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { | |
| 354 | + dueWeek = "终止妊娠"; | |
| 355 | + } else if (3 == patients.getType()) { | |
| 356 | + dueWeek = "已分娩"; | |
| 357 | + } else { | |
| 358 | + if (null != patients.getLastMenses()) { | |
| 359 | + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 360 | + dueWeek = com.lyms.platform.common.utils.StringUtils.dueWeek(days); | |
| 361 | + } | |
| 362 | + } | |
| 363 | + return dueWeek; | |
| 364 | + } | |
| 365 | + | |
| 366 | + | |
| 349 | 367 | |
| 350 | 368 | |
| 351 | 369 |