Commit 4f6c5e53dc63d6e325b07457954b1c139ca25271
1 parent
72e16d1cda
Exists in
dev
产妇转诊
Showing 2 changed files with 17 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
View file @
4f6c5e5
| ... | ... | @@ -5,6 +5,7 @@ |
| 5 | 5 | import com.lyms.platform.common.annotation.TokenRequired; |
| 6 | 6 | import com.lyms.platform.common.base.BaseController; |
| 7 | 7 | import com.lyms.platform.common.base.LoginContext; |
| 8 | +import com.lyms.platform.common.base.PageInfo; | |
| 8 | 9 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 9 | 10 | import com.lyms.platform.common.enums.DiseaseTypeEnums; |
| 10 | 11 | import com.lyms.platform.common.enums.ServiceStatusEnums; |
| 11 | 12 | |
| 12 | 13 | |
| ... | ... | @@ -532,14 +533,24 @@ |
| 532 | 533 | } |
| 533 | 534 | QuanChanResult quanChanResult = new QuanChanResult(); |
| 534 | 535 | quanChanResult.setName(recordVo.getName()); |
| 535 | - quanChanResult.setAge(1); | |
| 536 | + String age1 = recordVo.getAge().substring(0,8); | |
| 537 | + Date date = DateUtil.parseYYYYMMDD(age1); | |
| 538 | + int age = DateUtil.getYearSpace(new Date(),date); | |
| 539 | + quanChanResult.setAge(age); | |
| 536 | 540 | quanChanResult.setDueWeek(recordVo.getDeliveryTime()); |
| 537 | - quanChanResult.setcTime("1"); | |
| 541 | + Date date2 = DateUtil.parseYMD(recordVo.getDeliveryTime()); | |
| 542 | + int day= DateUtil.getDays(date2,new Date()); | |
| 543 | + quanChanResult.setcTime(String.valueOf(day)); | |
| 538 | 544 | quanChanResult.setRealPhone(recordVo.getPhone()); |
| 539 | 545 | data.add(quanChanResult); |
| 540 | 546 | } |
| 541 | 547 | } |
| 542 | - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); | |
| 548 | + com.lyms.platform.common.base.PageInfo pageInfo = new PageInfo(); | |
| 549 | + pageInfo.setCount(medicalRecordVo.getCount()); | |
| 550 | + pageInfo.setPage(medicalRecordVo.getPage()); | |
| 551 | + pageInfo.setLimit(medicalRecordVo.getLimit()); | |
| 552 | + pageInfo.setLastPage(medicalRecordVo.getLastPage()); | |
| 553 | + return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(pageInfo); | |
| 543 | 554 | |
| 544 | 555 | } |
| 545 | 556 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
View file @
4f6c5e5
| ... | ... | @@ -612,6 +612,7 @@ |
| 612 | 612 | patientBaseResult.setVcCardNo(recordVo.getMdtrtId()); |
| 613 | 613 | patientBaseResult.setDueWeek(recordVo.getDeliveryTime()); |
| 614 | 614 | patientBaseResult.setCardNo(recordVo.getCardNo()); |
| 615 | + patientBaseResult.setSex(recordVo.getGender()); | |
| 615 | 616 | // 查建档 |
| 616 | 617 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 617 | 618 | patientsQuery.setCardNo(recordVo.getCardNo()); |
| ... | ... | @@ -704,6 +705,8 @@ |
| 704 | 705 | referralApplyScreeningModel.setrLevel(level); |
| 705 | 706 | // 高危风险因素 |
| 706 | 707 | referralApplyScreeningModel.setrRisk(queryRiskListName(patients.getRiskFactorId())); |
| 708 | + referralApplyScreeningModel.setParentId(patients.getId()); | |
| 709 | + referralApplyScreeningModel.setPid(patients.getPid()); | |
| 707 | 710 | } |
| 708 | 711 | |
| 709 | 712 | MedicalRecordVo medicalRecordVo = new MedicalRecordVo(); |