Commit 7836084cd42edb6d8baeb246ce5f31f55ac914c7
1 parent
d3f69ac060
Exists in
dev
产妇转诊
Showing 1 changed file with 13 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
View file @
7836084
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | import com.alibaba.fastjson.JSONArray; |
| 5 | 5 | import com.alibaba.fastjson.JSONObject; |
| 6 | 6 | import com.lyms.platform.biz.service.*; |
| 7 | +import com.lyms.platform.common.base.PageInfo; | |
| 7 | 8 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 8 | 9 | import com.lyms.platform.common.enums.*; |
| 9 | 10 | import com.lyms.platform.common.exception.BusinessException; |
| ... | ... | @@ -529,7 +530,10 @@ |
| 529 | 530 | for (MedicalRecordVo recordVo : medicalRecordVoList) { |
| 530 | 531 | ApplyScreeningOutResult screeningOutResult = new ApplyScreeningOutResult(); |
| 531 | 532 | screeningOutResult.setName(recordVo.getName()); |
| 532 | - screeningOutResult.setAge("1"); | |
| 533 | + String age1 = recordVo.getAge().substring(0,8); | |
| 534 | + Date date = DateUtil.parseYYYYMMDD(age1); | |
| 535 | + int age = DateUtil.getYearSpace(new Date(),date); | |
| 536 | + screeningOutResult.setAge(String.valueOf(age)); | |
| 533 | 537 | screeningOutResult.setCardNo(recordVo.getCardNo()); |
| 534 | 538 | screeningOutResult.setDueWeek(recordVo.getDeliveryTime()); |
| 535 | 539 | screeningOutResult.setPhone(recordVo.getPhone()); |
| ... | ... | @@ -569,8 +573,8 @@ |
| 569 | 573 | applyScreeningService.queryReferralApplyScreeningWithQuery(query); |
| 570 | 574 | if (CollectionUtils.isNotEmpty(screeningModels)){ |
| 571 | 575 | screeningOutResult.setTransferredDepartment(screeningModels.get(0).getTransferredDepartment()); |
| 572 | - screeningOutResult.setCreated(screeningModels.get(0).getCreated().toString()); | |
| 573 | - screeningOutResult.setReceived(screeningModels.get(0).getCreated().toString()); | |
| 576 | + screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated())); | |
| 577 | + screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived())); | |
| 574 | 578 | screeningOutResult.setRecDoctor(screeningModels.get(0).getRecDoctor()); |
| 575 | 579 | screeningOutResult.setId(screeningModels.get(0).getId()); |
| 576 | 580 | screeningOutResult.setPid(screeningModels.get(0).getPid()); |
| ... | ... | @@ -579,7 +583,12 @@ |
| 579 | 583 | data.add(screeningOutResult); |
| 580 | 584 | } |
| 581 | 585 | } |
| 582 | - return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
| 586 | + PageInfo pageInfo = new PageInfo(); | |
| 587 | + pageInfo.setCount(medicalRecordVo.getCount()); | |
| 588 | + pageInfo.setPage(medicalRecordVo.getPage()); | |
| 589 | + pageInfo.setLimit(medicalRecordVo.getLimit()); | |
| 590 | + pageInfo.setLastPage(medicalRecordVo.getLastPage()); | |
| 591 | + return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(pageInfo); | |
| 583 | 592 | } |
| 584 | 593 | |
| 585 | 594 | private List queryRiskListName(List l) { |