Commit 36b71b97f250b36340f41f559186fb32f6dfd6c1
1 parent
17ea036c3c
Exists in
master
and in
8 other branches
修改新电子病历
Showing 2 changed files with 10 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
36b71b9
| ... | ... | @@ -115,7 +115,10 @@ |
| 115 | 115 | referralApplyOrderModel.setSex(SexEnum.WOMAN.getId()); |
| 116 | 116 | referralApplyOrderModel.setBirth(patients.getBirth()); |
| 117 | 117 | referralApplyOrderModel.setExpVip(patients.getExpVip()); |
| 118 | - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 118 | + int days=-1; | |
| 119 | + if(patients.getType()==1){ | |
| 120 | + days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); | |
| 121 | + } | |
| 119 | 122 | HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); |
| 120 | 123 | referralApplyOrderModel.setrRisk(highScoreResult.getHighId()); |
| 121 | 124 | referralApplyOrderModel.setScore(highScoreResult.getScore()); |
| ... | ... | @@ -386,14 +389,6 @@ |
| 386 | 389 | referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage()); |
| 387 | 390 | referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit()); |
| 388 | 391 | referralApplyOrderQuery.setNeed("1"); |
| 389 | - | |
| 390 | - /* if(null!=applyOrderQueryRequest.getStartScore()){ | |
| 391 | - referralApplyOrderQuery.setScoreStart(applyOrderQueryRequest.getStartScore()); | |
| 392 | - } | |
| 393 | - | |
| 394 | - if(null!=applyOrderQueryRequest.getEndScore()){ | |
| 395 | - referralApplyOrderQuery.setScoreEnd(applyOrderQueryRequest.getEndScore()); | |
| 396 | - }*/ | |
| 397 | 392 | |
| 398 | 393 | |
| 399 | 394 | List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
View file @
36b71b9
| ... | ... | @@ -314,10 +314,14 @@ |
| 314 | 314 | setId(destModel.getId()); |
| 315 | 315 | setName(destModel.getName()); |
| 316 | 316 | setScore(destModel.getScore()); |
| 317 | -// setrLevel(destModel.getrLevel()); | |
| 318 | 317 | if(null!=destModel.getDueDate()){ |
| 319 | 318 | int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); |
| 320 | - setDueWeek(StringUtils.dueWeek(days)); | |
| 319 | + if(-1==days){ | |
| 320 | + setDueWeek("已分娩"); | |
| 321 | + }else{ | |
| 322 | + setDueWeek(StringUtils.dueWeek(days)); | |
| 323 | + } | |
| 324 | + | |
| 321 | 325 | } |
| 322 | 326 | setPid(destModel.getPid()); |
| 323 | 327 | if(null!=destModel.getDueWeek()){ |