From bf4f236238dff5d7905885737c753eef7c946aa7 Mon Sep 17 00:00:00 2001 From: haorp <754760654@qq.com> Date: Fri, 13 Jun 2025 09:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E8=BD=AC=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/ApplyScreeningController.java | 6 +++-- .../operate/web/facade/ApplyScreeningFacade.java | 30 +++++++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java index ea2fc31..b242da8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java @@ -63,8 +63,10 @@ public class ApplyScreeningController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/queryMedicalRecord") @ResponseBody - public BaseResponse queryMedicalRecord(@Valid ApplyScreeningQueryRequest screeningQueryRequest) { - return applyScreeningFacade.queryMedicalRecord(screeningQueryRequest); + @TokenRequired + public BaseResponse queryMedicalRecord(@Valid ApplyScreeningQueryRequest screeningQueryRequest, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return applyScreeningFacade.queryMedicalRecord(screeningQueryRequest,loginState.getId()); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java index ca09fd3..bd7b998 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java @@ -519,15 +519,19 @@ public class ApplyScreeningFacade { return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(referralApplyScreeningQuery.getPageInfo()); } - public BaseListResponse queryMedicalRecord(ApplyScreeningQueryRequest applyScreeningQueryRequest) { + public BaseListResponse queryMedicalRecord(ApplyScreeningQueryRequest applyScreeningQueryRequest,Integer userId) { List data = new ArrayList(); MedicalRecordVo medicalRecordVo = new MedicalRecordVo(); medicalRecordVo.setNeed("true"); medicalRecordVo.setLimit(applyScreeningQueryRequest.getLimit()); medicalRecordVo.setPage(applyScreeningQueryRequest.getPage()); + if(StringUtils.isNotEmpty(applyScreeningQueryRequest.getCardNo())){ + medicalRecordVo.setCardNo(applyScreeningQueryRequest.getCardNo()); + } List medicalRecordVoList = appointmentService.queryList(medicalRecordVo); if(CollectionUtils.isNotEmpty(medicalRecordVoList)){ for (MedicalRecordVo recordVo : medicalRecordVoList) { + Boolean ckFlag = true; // 判断是否为产科 ApplyScreeningOutResult screeningOutResult = new ApplyScreeningOutResult(); screeningOutResult.setName(recordVo.getName()); String age1 = recordVo.getAge().substring(0,8); @@ -535,8 +539,13 @@ public class ApplyScreeningFacade { int age = DateUtil.getYearSpace(new Date(),date); screeningOutResult.setAge(String.valueOf(age)); screeningOutResult.setCardNo(recordVo.getCardNo()); - screeningOutResult.setDueWeek(recordVo.getDeliveryTime()); + screeningOutResult.setDueDate(recordVo.getDeliveryTime()); screeningOutResult.setPhone(recordVo.getPhone()); + if(recordVo.getDepartment().contains("产科")){ + ckFlag = true; + }else{ + ckFlag = false; + } // 查建档 PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setCardNo(recordVo.getCardNo()); @@ -573,14 +582,26 @@ public class ApplyScreeningFacade { applyScreeningService.queryReferralApplyScreeningWithQuery(query); if (CollectionUtils.isNotEmpty(screeningModels)){ screeningOutResult.setTransferredDepartment(screeningModels.get(0).getTransferredDepartment()); + screeningOutResult.setOutDepartment(screeningModels.get(0).getOutDepartment()); screeningOutResult.setCreated(DateUtil.getYyyyMmDd(screeningModels.get(0).getCreated())); screeningOutResult.setReceived(DateUtil.getYyyyMmDd(screeningModels.get(0).getReceived())); - screeningOutResult.setRecDoctor(screeningModels.get(0).getRecDoctor()); + screeningOutResult.setApplyDoctor(screeningModels.get(0).getApplyDoctor()); screeningOutResult.setId(screeningModels.get(0).getId()); screeningOutResult.setPid(screeningModels.get(0).getPid()); } } - data.add(screeningOutResult); + Users serviceUsers = usersService.getUsers(userId); + if(null != serviceUsers){ + // 不是主任的就按当前账号医生分 + if(serviceUsers.getZhiChenId() != 4){ + if(userId.toString().equals(screeningOutResult.getApplyDoctor()) && ckFlag){ + data.add(screeningOutResult); + } + }else{ + // 是主任就全显示 + data.add(screeningOutResult); + } + } } } PageInfo pageInfo = new PageInfo(); @@ -680,6 +701,7 @@ public class ApplyScreeningFacade { referralApplyScreeningModel.setModified(new Date()); referralApplyScreeningModel.setName(patientBaseResult.getName()); referralApplyScreeningModel.setStatus(1); // 待确认 + referralApplyScreeningModel.setReason(patientBaseResult.getReason()); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setCardNo(patientBaseResult.getCardNo()); patientsQuery.setYn(1); -- 1.8.3.1