From 81bbc5c280586fb71ba1e860af1d504f275cfa32 Mon Sep 17 00:00:00 2001 From: chenqi Date: Thu, 18 Jun 2026 20:15:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DNPE+=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=AF=94=E8=BE=83+=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3+?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/core/common/utils/SecurityUtils.java | 11 +++++++++ .../impl/AdjustPriceServiceImpl.java | 6 ++--- .../impl/DoctorScheduleAppServiceImpl.java | 2 +- .../impl/LocationAppServiceImpl.java | 2 +- .../impl/PractitionerAppServiceImpl.java | 4 ++-- .../chargemanage/dto/ChargeItemFormData.java | 4 ++-- .../chargemanage/dto/PricingProjectDto.java | 2 +- .../check/controller/ExamApplyController.java | 4 ++-- .../impl/SurgeryAppServiceImpl.java | 2 +- .../appservice/impl/CommonServiceImpl.java | 6 ++--- .../impl/ConsultationAppServiceImpl.java | 18 +++++++------- .../DoctorStationAdviceAppServiceImpl.java | 10 ++++---- ...orStationChineseMedicalAppServiceImpl.java | 10 ++++---- .../DoctorStationDiagnosisAppServiceImpl.java | 8 +++---- .../impl/DoctorStationMainAppServiceImpl.java | 4 ++-- .../impl/ReservationRecordAppServiceImpl.java | 4 ++-- .../impl/TodayOutpatientServiceImpl.java | 4 ++-- .../controller/PendingEmrController.java | 4 ++-- .../web/doctorstation/dto/AdviceSaveDto.java | 2 +- .../web/doctorstation/utils/AdviceUtils.java | 4 ++-- .../AdvancePaymentManageAppServiceImpl.java | 4 ++-- .../InHospitalRegisterAppServiceImpl.java | 16 ++++++------- .../impl/AdviceProcessAppServiceImpl.java | 8 +++---- .../impl/EncounterAutoRollAppServiceImpl.java | 2 +- .../impl/MedicineSummaryAppServiceImpl.java | 2 +- .../OrgDeviceStockTakeAppServiceImpl.java | 2 +- .../impl/DepositAppServiceImpl.java | 2 +- .../impl/NursingRecordAppServiceImpl.java | 6 ++--- .../impl/LossReportFormAppServiceImpl.java | 2 +- .../ProductStocktakingAppServiceImpl.java | 4 ++-- .../impl/ProductTransferAppServiceImpl.java | 6 ++--- .../impl/PurchaseInventoryAppServiceImpl.java | 2 +- .../impl/PurchaseReturnAppServiceImpl.java | 2 +- .../impl/RequisitionIssueAppServiceImpl.java | 2 +- .../impl/ReturnIssueAppServiceImpl.java | 2 +- ...viewPrescriptionRecordsAppServiceImpl.java | 2 +- .../OutpatientInfusionAppServiceImpl.java | 4 ++-- .../OutpatientTreatmentAppServiceImpl.java | 2 +- .../impl/PaymentRecServiceImpl.java | 24 +++++++++---------- .../impl/IOrderGroupAppServiceImpl.java | 4 ++-- .../OrdersGroupPackageAppServiceImpl.java | 4 ++-- ...nHospitalReturnMedicineAppServiceImpl.java | 2 +- .../MedicalDeviceDispenseAppServiceImpl.java | 4 ++-- .../impl/ReturnMedicineAppServiceImpl.java | 2 +- ...SummaryDispenseMedicineAppServiceImpl.java | 6 ++--- ...WesternMedicineDispenseAppServiceImpl.java | 4 ++-- .../impl/EmrQualityAppServiceImpl.java | 3 +++ .../QualityBusinessAnalyticsController.java | 4 ++++ .../impl/AdviceManageAppServiceImpl.java | 6 ++--- .../impl/NurseManageServiceImpl.java | 4 ++-- .../impl/RequestFormManageAppServiceImpl.java | 4 ++-- .../impl/SpecialAdviceAppServiceImpl.java | 6 ++--- .../impl/ReportDimensionAppServiceImpl.java | 9 +++---- .../web/system/controller/HomeController.java | 2 +- .../service/impl/YbElepBaseServiceImpl.java | 2 +- .../ybmanage/service/impl/YbServiceImpl.java | 2 +- .../impl/ChangePriceRecordServiceImpl.java | 4 ++-- .../service/impl/ChargeItemServiceImpl.java | 2 +- .../service/impl/ConditionServiceImpl.java | 2 +- .../impl/ProcedurePerformerServiceImpl.java | 2 +- .../impl/ServiceRequestServiceImpl.java | 6 ++--- .../impl/SupplyDeliveryServiceImpl.java | 2 +- .../impl/SupplyRequestServiceImpl.java | 6 ++--- .../com/healthlink/his/yb/service/YbDao.java | 2 +- 64 files changed, 159 insertions(+), 140 deletions(-) diff --git a/healthlink-his-server/core-common/src/main/java/com/core/common/utils/SecurityUtils.java b/healthlink-his-server/core-common/src/main/java/com/core/common/utils/SecurityUtils.java index f9aa93980..98604d0a5 100755 --- a/healthlink-his-server/core-common/src/main/java/com/core/common/utils/SecurityUtils.java +++ b/healthlink-his-server/core-common/src/main/java/com/core/common/utils/SecurityUtils.java @@ -21,6 +21,17 @@ import java.util.stream.Collectors; */ public class SecurityUtils { + /** + * 获取医务人员ID + **/ + public static Long getPractitionerId() { + try { + return getLoginUser().getPractitionerId(); + } catch (Exception e) { + throw new ServiceException("获取医务人员ID异常", HttpStatus.UNAUTHORIZED); + } + } + /** * 用户ID **/ diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java index 975e9861b..a83f2eb9e 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java @@ -92,7 +92,7 @@ public class AdjustPriceServiceImpl implements IAdjustPriceService { // 单据号 String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.CHANGE_PRICE_BUZ.getPrefix()); // 当前人 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 根据表单提交的tab 进入不同的 execute if (AdjustPriceEnum.MEDICINE.getCode().equals(categoryType) || AdjustPriceEnum.CONSUMABLES.getCode().equals(categoryType)) { @@ -122,7 +122,7 @@ public class AdjustPriceServiceImpl implements IAdjustPriceService { // 单据号 String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.CHANGE_PRICE_BUZ.getPrefix()); // 当前人 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 根据表单提交的tab 进入不同的 execute if (AdjustPriceEnum.MEDICINE.getCode().equals(categoryType) || AdjustPriceEnum.CONSUMABLES.getCode().equals(categoryType)) { @@ -156,7 +156,7 @@ public class AdjustPriceServiceImpl implements IAdjustPriceService { @Override public R searchChangePriceSubmitDataToPage(AdjustPriceManagerSearchParam adjustPriceManagerSearchParam, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) { - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); HashSet searchFields = new HashSet<>(); searchFields.add(CommonConstants.FieldName.BusNo); // 构建查询条件 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java index 522de7824..96baf6379 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java @@ -77,7 +77,7 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService { String todayStr = LocalDate.now().toString(); // yyyy-MM-dd // 从 SecurityUtils 获取当前登录医生ID - Long currentDoctorId = SecurityUtils.getLoginUser().getPractitionerId(); + Long currentDoctorId = SecurityUtils.getPractitionerId(); if (currentDoctorId != null) { List list = doctorScheduleMapper.selectTodayMySchedule(todayStr, diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java index 3d5709847..a1e16226b 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/LocationAppServiceImpl.java @@ -347,7 +347,7 @@ public class LocationAppServiceImpl implements ILocationAppService { } if (Whether.YES.getCode().equals(isInHospital)) { // 当前登录者的id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); List locationIds = practitionerRoleService.getLocationIdsByPractitionerId(practitionerId); queryWrapper.in(Location::getId, locationIds); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java index 7ea64c371..d1b8531f6 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java @@ -489,7 +489,7 @@ public class PractitionerAppServiceImpl implements IPractitionerAppService { @Override public List getSelectableOrgList() { // 参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); return practitionerAppAppMapper.getSelectableOrgList(practitionerId); } @@ -502,7 +502,7 @@ public class PractitionerAppServiceImpl implements IPractitionerAppService { @Override public R switchOrg(Long orgId) { // 参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); Practitioner practitioner = new Practitioner(); practitioner.setId(practitionerId); practitioner.setOrgId(orgId); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ChargeItemFormData.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ChargeItemFormData.java index 0ab7ad64c..8caece35b 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ChargeItemFormData.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/ChargeItemFormData.java @@ -82,8 +82,8 @@ public class ChargeItemFormData { this.statusEnum = ChargeItemStatus.PLANNED.getValue(); this.contextEnum = ChargeItemContext.REGISTER.getValue(); this.occurrenceTime = new Date(); - this.performerId = SecurityUtils.getLoginUser().getPractitionerId(); - this.entererId = SecurityUtils.getLoginUser().getPractitionerId(); + this.performerId = SecurityUtils.getPractitionerId(); + this.entererId = SecurityUtils.getPractitionerId(); this.enteredDate = new Date(); this.serviceTable = CommonConstants.TableName.ADM_HEALTHCARE_SERVICE; } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PricingProjectDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PricingProjectDto.java index 0c35b13a3..26367ee9d 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PricingProjectDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/dto/PricingProjectDto.java @@ -144,7 +144,7 @@ public class PricingProjectDto { this.statusEnum = RequestStatus.ACTIVE.getValue(); this.categoryEnum = EncounterClass.AMB.getValue(); this.therapyEnum = TherapyTimeType.TEMPORARY.getValue(); - this.practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + this.practitionerId = SecurityUtils.getPractitionerId(); this.orgId = SecurityUtils.getLoginUser().getOrgId(); // 开方人科室 } } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java index 56a951fbc..28bc6aeb3 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/check/controller/ExamApplyController.java @@ -201,7 +201,7 @@ public class ExamApplyController extends BaseController { Integer tenantId = null; String currentUsername = "system"; try { - currentUserId = SecurityUtils.getLoginUser().getPractitionerId(); + currentUserId = SecurityUtils.getPractitionerId(); currentOrgId = SecurityUtils.getLoginUser().getOrgId(); tenantId = SecurityUtils.getLoginUser().getTenantId(); currentUsername = SecurityUtils.getUsername(); @@ -406,7 +406,7 @@ public class ExamApplyController extends BaseController { Integer tenantId = null; String currentUsername = "system"; try { - currentUserId = SecurityUtils.getLoginUser().getPractitionerId(); + currentUserId = SecurityUtils.getPractitionerId(); currentOrgId = SecurityUtils.getLoginUser().getOrgId(); tenantId = SecurityUtils.getLoginUser().getTenantId(); currentUsername = SecurityUtils.getUsername(); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java index cbee84acb..883c45e9b 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java @@ -275,7 +275,7 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService { // 当前登录账号的科室id Long orgId = SecurityUtils.getLoginUser().getOrgId(); // 当前参与者ID - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 当前用户ID Long userId = SecurityUtils.getLoginUser().getUserId(); // 当前时间 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java index 2df47b5bc..c0e7adacc 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java @@ -129,7 +129,7 @@ public class CommonServiceImpl implements ICommonService { public List getInventoryPharmacyList() { // 用户id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 根据用户id获得管理库房信息 List locationIds = practitionerRoleService.getLocationIdsByPractitionerId(practitionerId); @@ -192,7 +192,7 @@ public class CommonServiceImpl implements ICommonService { @Override public List getInventoryCabinetList() { // 用户id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 根据用户id获得管理库房信息 List locationIds = practitionerRoleService.getLocationIdsByPractitionerId(practitionerId); @@ -465,7 +465,7 @@ public class CommonServiceImpl implements ICommonService { @Override public List getPractitionerWard() { // 获取当前登录用户信息 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); Long currentOrgId = SecurityUtils.getLoginUser().getOrgId(); log.info("getPractitionerWard - practitionerId: {}, currentOrgId: {}", practitionerId, currentOrgId); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java index 5084b98ab..8b7d09715 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/appservice/impl/ConsultationAppServiceImpl.java @@ -308,7 +308,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { // 如果前端没有传递申请医生ID，使用当前登录用户 if (entity.getRequestingPhysicianId() == null) { - entity.setRequestingPhysicianId(SecurityUtils.getLoginUser().getPractitionerId()); + entity.setRequestingPhysicianId(SecurityUtils.getPractitionerId()); } // 设置邀请对象文本（拼接所有医生名称） @@ -333,7 +333,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { if (Boolean.TRUE.equals(dto.getSubmitFlag())) { entity.setConsultationStatus(ConsultationStatusEnum.SUBMITTED.getCode()); entity.setConfirmingPhysician(SecurityUtils.getLoginUser().getUser().getNickName()); - entity.setConfirmingPhysicianId(SecurityUtils.getLoginUser().getPractitionerId()); + entity.setConfirmingPhysicianId(SecurityUtils.getPractitionerId()); entity.setConfirmingDate(new Date()); } else { entity.setConsultationStatus(ConsultationStatusEnum.NEW.getCode()); @@ -414,7 +414,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { // 设置提交会诊的医生信息 entity.setConfirmingPhysician(SecurityUtils.getLoginUser().getUser().getNickName()); - entity.setConfirmingPhysicianId(SecurityUtils.getLoginUser().getPractitionerId()); + entity.setConfirmingPhysicianId(SecurityUtils.getPractitionerId()); entity.setConfirmingDate(new Date()); consultationRequestMapper.updateById(entity); @@ -731,7 +731,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { public List getMyInvitations() { try { // 获取当前登录医生ID和租户ID - Long currentPhysicianId = SecurityUtils.getLoginUser().getPractitionerId(); + Long currentPhysicianId = SecurityUtils.getPractitionerId(); Long tenantId = SecurityUtils.getLoginUser().getTenantId().longValue(); // 查询邀请我的会诊申请 @@ -1266,7 +1266,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { public List getPendingConfirmationList() { try { // 获取当前登录医生ID和租户ID - Long currentPhysicianId = SecurityUtils.getLoginUser().getPractitionerId(); + Long currentPhysicianId = SecurityUtils.getPractitionerId(); Long tenantId = SecurityUtils.getLoginUser().getTenantId().longValue(); log.info("获取待确认会诊列表，当前医生ID: {}", currentPhysicianId); @@ -1374,7 +1374,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { } // 2. 获取当前登录医生信息 - Long currentPhysicianId = SecurityUtils.getLoginUser().getPractitionerId(); + Long currentPhysicianId = SecurityUtils.getPractitionerId(); String currentPhysicianName = SecurityUtils.getLoginUser().getUser().getNickName(); String currentDeptName = dto.getConfirmingDeptName(); // 前端传递 @@ -1459,7 +1459,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { private void createConfirmationRecord(ConsultationRequest request) { try { // 🎯 获取当前操作的医生信息（最后一个确认的医生） - Long currentPhysicianId = SecurityUtils.getLoginUser().getPractitionerId(); + Long currentPhysicianId = SecurityUtils.getPractitionerId(); String currentPhysicianName = SecurityUtils.getLoginUser().getUser().getNickName(); // 查询当前医生的邀请记录（获取科室信息） @@ -1572,7 +1572,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { // 2. 获取当前登录医生信息 - Long currentPhysicianId = SecurityUtils.getLoginUser().getPractitionerId(); + Long currentPhysicianId = SecurityUtils.getPractitionerId(); // 3. 查询当前医生的邀请记录 LambdaQueryWrapper invitedWrapper = new LambdaQueryWrapper<>(); @@ -1651,7 +1651,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { } // 2. 获取当前登录医生信息 - Long currentPhysicianId = SecurityUtils.getLoginUser().getPractitionerId(); + Long currentPhysicianId = SecurityUtils.getPractitionerId(); String currentPhysicianName = SecurityUtils.getLoginUser().getUser().getNickName(); // 3. 查询当前医生的邀请记录 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index 737da6586..26e47d0d8 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -1128,7 +1128,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp // 🔧 Bug Fix: 确保practitionerId不为null if (adviceSaveDto.getPractitionerId() == null) { - adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + adviceSaveDto.setPractitionerId(SecurityUtils.getPractitionerId()); log.info("handMedication - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId()); } @@ -1615,7 +1615,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp // 🔧 Bug Fix: 确保practitionerId不为null if (adviceSaveDto.getPractitionerId() == null) { - adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + adviceSaveDto.setPractitionerId(SecurityUtils.getPractitionerId()); log.info("自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId()); } @@ -2065,7 +2065,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp // 🔧 Bug Fix: 确保practitionerId不为null if (adviceSaveDto.getPractitionerId() == null) { - adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + adviceSaveDto.setPractitionerId(SecurityUtils.getPractitionerId()); log.info("handService - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId()); } @@ -2308,7 +2308,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp @Override public R getRequestBaseInfo(Long encounterId, Integer generateSourceEnum, String sourceBillNo) { // 当前账号的参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 未指定generateSourceEnum时，默认只查询医生开立的医嘱 int sourceEnum = (generateSourceEnum != null) ? generateSourceEnum : GenerateSource.DOCTOR_PRESCRIPTION.getValue(); // 医嘱请求数据 @@ -2440,7 +2440,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp @Override public R getRequestHistoryInfo(Long patientId, Long encounterId) { // 当前账号的参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 医嘱请求数据 List requestBaseInfo = doctorStationAdviceAppMapper.getRequestBaseInfo(encounterId, patientId, CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST, diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java index 42bafd7e0..7ff2c6c5b 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java @@ -191,7 +191,7 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation condition.setYbNo(saveDiagnosisChildParam.getYbNo()); condition.setTcmFlag(Whether.YES.getValue());// 中医标识 condition.setRecordedDatetime(new Date()); - condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人 + condition.setRecorderId(SecurityUtils.getPractitionerId());// 记录人 // 设置租户ID，避免数据库约束错误 condition.setTenantId(SecurityUtils.getLoginUser().getTenantId()); // 设置创建人，避免数据库约束错误 @@ -287,7 +287,7 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation condition.setYbNo(saveDiagnosisChildParam.getYbNo()); condition.setTcmFlag(Whether.YES.getValue());// 中医标识 condition.setRecordedDatetime(new Date()); - condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人 + condition.setRecorderId(SecurityUtils.getPractitionerId());// 记录人 // 设置租户ID，避免数据库约束错误 condition.setTenantId(SecurityUtils.getLoginUser().getTenantId()); // 设置创建人，避免数据库约束错误 @@ -659,7 +659,7 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型 chargeItem.setEncounterId(encounterId); // 就诊id chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID - chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID + chargeItem.setEntererId(SecurityUtils.getPractitionerId());// 开立人ID chargeItem.setRequestingOrgId(orgId); // 开立科室 chargeItem.setEnteredDate(curDate); // 开立时间 chargeItem.setProductTable(activityAdviceBaseDto.getAdviceTableName());// 产品所在表 @@ -712,7 +712,7 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation */ public R getTcmRequestBaseInfo(Long encounterId) { // 当前账号的参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 医嘱请求数据 List requestBaseInfo = doctorStationChineseMedicalAppMapper.getTcmRequestBaseInfo(encounterId, null, CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST, @@ -739,7 +739,7 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation @Override public R getTcmRequestHistoryInfo(Long patientId, Long encounterId) { // 当前账号的参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 医嘱请求数据 List requestBaseInfo = doctorStationChineseMedicalAppMapper.getTcmRequestHistoryInfo( encounterId, patientId, CommonConstants.TableName.MED_MEDICATION_REQUEST, diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java index 8c36be3c5..d290d3388 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java @@ -232,7 +232,7 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn condition.setDefinitionId(saveDiagnosisChildParam.getDefinitionId()); condition.setYbNo(saveDiagnosisChildParam.getYbNo()); condition.setRecordedDatetime(new Date()); - condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人 + condition.setRecorderId(SecurityUtils.getPractitionerId());// 记录人 // 设置租户ID，避免数据库约束错误 condition.setTenantId(SecurityUtils.getLoginUser().getTenantId()); // 设置创建人，避免数据库约束错误 @@ -328,7 +328,7 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn condition.setDefinitionId(saveDiagnosisChildParam.getDefinitionId()); condition.setYbNo(saveDiagnosisChildParam.getYbNo()); condition.setRecordedDatetime(new Date()); - condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人 + condition.setRecorderId(SecurityUtils.getPractitionerId());// 记录人 if(condition.getCreateBy() == null){ condition.setCreateBy(username); @@ -435,7 +435,7 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn this.handleConditionDefinitionMetadata(patientHistoryList); conditionDefinitionBusinessClass.setPatientHistoryList(patientHistoryList); // 医生常用诊断 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); // 当前参与者ID + Long practitionerId = SecurityUtils.getPractitionerId(); // 当前参与者ID List doctorCommonUseList = doctorStationDiagnosisAppMapper.getDoctorCommonUseList(PublicationStatus.ACTIVE.getValue(), practitionerId); this.handleConditionDefinitionMetadata(doctorCommonUseList); @@ -631,7 +631,7 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn log.debug("传染病报告卡数据,DoctorId:{}", infectiousDiseaseReport.getDoctorId()); if (infectiousDiseaseReport.getDoctorId() == null) { // 优先使用 practitionerId，如果没有则使用 userId - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); log.debug("传染病报告卡数据,PractitionerId:{}", practitionerId); if (practitionerId != null) { infectiousDiseaseReport.setDoctorId(practitionerId); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java index ad07d9753..5db74ffc3 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java @@ -199,7 +199,7 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer EncounterParticipant encounterParticipant = new EncounterParticipant(); encounterParticipant.setEncounterId(encounterId); encounterParticipant.setTypeCode(ParticipantType.ADMITTER.getCode());// 接诊医生 - encounterParticipant.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + encounterParticipant.setPractitionerId(SecurityUtils.getPractitionerId()); encounterParticipant.setStatusEnum(EncounterActivityStatus.ACTIVE.getValue()); // 状态 encounterParticipant.setTenantId(tenantId); encounterParticipant.setCreateBy(currentUsername); @@ -570,7 +570,7 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer // 3. 核心更新：改回待诊+更新missed_time Date now = new Date(); - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); int updateCount = encounterMapper.update(null, new LambdaUpdateWrapper() .eq(Encounter::getId, encounterId) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java index b9b30cd16..f5a4fd897 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/ReservationRecordAppServiceImpl.java @@ -47,7 +47,7 @@ public class ReservationRecordAppServiceImpl implements IReservationRecordAppSer if (reservationRecordDto.getPractitionerId() != null) { practitionerId = reservationRecordDto.getPractitionerId(); } else { - practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + practitionerId = SecurityUtils.getPractitionerId(); } ReservationRecord reservationRecord = new ReservationRecord(); @@ -80,7 +80,7 @@ public class ReservationRecordAppServiceImpl implements IReservationRecordAppSer if (reservationRecordDto.getPractitionerId() != null) { practitionerId = reservationRecordDto.getPractitionerId(); } else { - practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + practitionerId = SecurityUtils.getPractitionerId(); } ReservationRecord reservationRecord = new ReservationRecord(); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java index eae2d48da..62e490061 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/TodayOutpatientServiceImpl.java @@ -41,7 +41,7 @@ public class TodayOutpatientServiceImpl implements ITodayOutpatientService { Long doctorId = SecurityUtils.getLoginUser().getUserId(); Long departmentId = SecurityUtils.getLoginUser().getOrgId(); Integer tenantId = SecurityUtils.getLoginUser().getTenantId(); - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); String today = DateUtil.format(new Date(), "yyyy-MM-dd"); // 获取今日统计信息 @@ -146,7 +146,7 @@ public class TodayOutpatientServiceImpl implements ITodayOutpatientService { queryWrapper.apply("enc.start_time::DATE <= CAST({0} AS DATE)", queryDate); // 添加医生条件 - 查询当前医生的门诊患者 - queryWrapper.eq("ep.practitioner_id", SecurityUtils.getLoginUser().getPractitionerId()); + queryWrapper.eq("ep.practitioner_id", SecurityUtils.getPractitionerId()); // 添加状态条件 if (ObjectUtil.isNotEmpty(statusEnum)) { diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/PendingEmrController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/PendingEmrController.java index 3fc4726dc..fecef6d84 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/PendingEmrController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/controller/PendingEmrController.java @@ -37,7 +37,7 @@ public class PendingEmrController { @RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(required = false) String patientName) { if (doctorId == null) { - doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getPractitionerId(); + doctorId = com.core.common.utils.SecurityUtils.getPractitionerId(); } return iDoctorStationEmrAppService.getPendingEmrList(doctorId, pageNum, pageSize, patientName); } @@ -53,7 +53,7 @@ public class PendingEmrController { public R getPendingEmrCount(@RequestParam(required = false) Long doctorId, @RequestParam(required = false) String patientName) { if (doctorId == null) { - doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getPractitionerId(); + doctorId = com.core.common.utils.SecurityUtils.getPractitionerId(); } return iDoctorStationEmrAppService.getPendingEmrCount(doctorId, patientName); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveDto.java index 329ddd8fc..7d4f71f64 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceSaveDto.java @@ -294,7 +294,7 @@ public class AdviceSaveDto { this.chineseHerbsDoseQuantity = new BigDecimal("1"); // 默认设置为长期医嘱，但前端应该明确传递正确的值 this.therapyEnum = TherapyTimeType.LONG_TERM.getValue(); - this.practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + this.practitionerId = SecurityUtils.getPractitionerId(); this.founderOrgId = SecurityUtils.getLoginUser().getOrgId(); // 开方人科室 } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/AdviceUtils.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/AdviceUtils.java index 1d0ee1db5..1594616d6 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/AdviceUtils.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/utils/AdviceUtils.java @@ -445,7 +445,7 @@ public class AdviceUtils { serviceRequest.setCategoryEnum(Integer.valueOf(activityAdviceBaseDto.getCategoryCode())); // 请求类型 serviceRequest.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id serviceRequest.setPatientId(activityChildrenJsonParams.getPatientId()); // 患者 - serviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生 + serviceRequest.setRequesterId(SecurityUtils.getPractitionerId()); // 开方医生 serviceRequest.setEncounterId(activityChildrenJsonParams.getEncounterId()); // 就诊id serviceRequest.setAuthoredTime(curDate); // 请求签发时间 serviceRequest.setOrgId(organizationId); // 执行科室 @@ -466,7 +466,7 @@ public class AdviceUtils { chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型 chargeItem.setEncounterId(activityChildrenJsonParams.getEncounterId()); // 就诊id chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID - chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID + chargeItem.setEntererId(SecurityUtils.getPractitionerId());// 开立人ID chargeItem.setRequestingOrgId(orgId); // 开立科室 chargeItem.setEnteredDate(curDate); // 开立时间 chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java index 9a86baa8e..f35bb141d 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/AdvancePaymentManageAppServiceImpl.java @@ -173,9 +173,9 @@ public class AdvancePaymentManageAppServiceImpl implements IAdvancePaymentManage payment.setPaymentEnum(paymentEnum); // 付款类别 payment.setPaymentReconciliationId(advancePaymentInAndOutDto.getPatientId()); // 付款实体ID payment.setKindEnum(PaymentKind.HOSPITAL_DEPOSIT.getValue()); // 发起支付的工作流程类别-住院存款 - payment.setEntererId(SecurityUtils.getLoginUser().getPractitionerId()); // 收款员 + payment.setEntererId(SecurityUtils.getPractitionerId()); // 收款员 payment.setPatientId(advancePaymentInAndOutDto.getPatientId()); // 患者ID - payment.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); // 请求支付责任人ID + payment.setPractitionerId(SecurityUtils.getPractitionerId()); // 请求支付责任人ID payment.setOutcomeEnum(PaymentOutcome.PARTIAL.getCode()); // 付款结果 payment.setLocationId(-99L); // 支付位置 payment.setExpirationDate(futureTime); // 到期时间 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java index c915f77a8..dcdbb99f0 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java @@ -96,7 +96,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS @Override public R registerByDoctor(InHospitalRegisterDto inHospitalRegisterDto) { // 当前账号的参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 患者id Long patientId = inHospitalRegisterDto.getPatientId(); // 门诊就诊id @@ -135,7 +135,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS zYCondition.setDefinitionId(inHospitalRegisterDto.getDiagnosisDefinitionId()); // 诊断定义Id zYCondition.setYbNo(inHospitalRegisterDto.getDiagnosisYbNo()); // 诊断对应的医保编码 zYCondition.setRecordedDatetime(new Date()); // 记录时间 - zYCondition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人 + zYCondition.setRecorderId(SecurityUtils.getPractitionerId());// 记录人 iConditionService.save(zYCondition); Long conditionId = zYCondition.getId();// 诊断id @@ -398,7 +398,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS encounter.setAdmitSourceCode(inHospitalInfoDto.getAdmitSourceCode()); // 入院类型 encounter.setInWayCode(inHospitalInfoDto.getInWayCode()); // 入院方式 encounter.setStartTime(inHospitalInfoDto.getStartTime()); // 入院日期 - encounter.setRegistrarId(SecurityUtils.getLoginUser().getPractitionerId()); // 登记员 + encounter.setRegistrarId(SecurityUtils.getPractitionerId()); // 登记员 iEncounterService.saveOrUpdate(encounter); // 更新病区信息 @@ -532,7 +532,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS // 设置状态为已作废 encounter.setStatusEnum(EncounterZyStatus.VOIDED.getValue()); - encounter.setRegistrarId(SecurityUtils.getLoginUser().getPractitionerId()); // 作废操作人 + encounter.setRegistrarId(SecurityUtils.getPractitionerId()); // 作废操作人 iEncounterService.saveOrUpdate(encounter); // 清理账户记录 @@ -591,7 +591,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS encounterReg.setAdmitSourceCode(inHospitalInfoDto.getAdmitSourceCode()); // 入院类型 encounterReg.setInWayCode(inHospitalInfoDto.getInWayCode()); // 入院方式 encounterReg.setStartTime(inHospitalInfoDto.getStartTime()); // 入院日期 - encounterReg.setRegistrarId(SecurityUtils.getLoginUser().getPractitionerId()); // 登记员id + encounterReg.setRegistrarId(SecurityUtils.getPractitionerId()); // 登记员id iEncounterService.saveOrUpdate(encounterReg); // 先查询当前就诊是否已经分配了病区 @@ -654,9 +654,9 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS payment.setPaymentEnum(PaymentType.PAY.getValue()); // 付款类别 payment.setPaymentReconciliationId(accountPersonalCash.getPatientId()); // 付款实体ID payment.setKindEnum(PaymentKind.HOSPITAL_DEPOSIT.getValue()); // 发起支付的工作流程类别-住院存款 - payment.setEntererId(SecurityUtils.getLoginUser().getPractitionerId()); // 收款员 + payment.setEntererId(SecurityUtils.getPractitionerId()); // 收款员 payment.setPatientId(accountPersonalCash.getPatientId()); // 患者ID - payment.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); // 请求支付责任人ID + payment.setPractitionerId(SecurityUtils.getPractitionerId()); // 请求支付责任人ID payment.setOutcomeEnum(PaymentOutcome.PARTIAL.getCode()); // 付款结果 payment.setLocationId(-99L); // 支付位置 payment.setExpirationDate(futureTime); // 到期时间 @@ -687,7 +687,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS zYCondition.setDefinitionId(inHospitalInfoDto.getDiagnosisDefinitionId()); // 诊断定义Id zYCondition.setYbNo(inHospitalInfoDto.getDiagnosisYbNo()); // 诊断对应的医保编码 zYCondition.setRecordedDatetime(new Date()); // 记录时间 - zYCondition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人 + zYCondition.setRecorderId(SecurityUtils.getPractitionerId());// 记录人 iConditionService.save(zYCondition); Long conditionId = zYCondition.getId();// 诊断id diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java index 9e562c357..73385adce 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java @@ -423,7 +423,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { deviceRequestList.add(item); } } - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); Date checkDate = new Date(); if (!serviceRequestList.isEmpty()) { List serviceReqIds = serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(); @@ -574,7 +574,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { return R.fail("该药品已由药房发放，请先执行退药处理，不可直接退回"); } } - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); Date checkDate = new Date(); // 从请求中提取退回原因（所有项目共享同一原因） String backReason = performInfoList.stream() @@ -977,7 +977,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { // 当前时间 Date curDate = new Date(); // 参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 长期 MedicationRequest longMedicationRequest; ChargeItem chargeItem; @@ -1265,7 +1265,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { // 当前时间 Date curDate = new Date(); // 参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); Date clickDate = new Date(); // 长期 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java index 5c84c7807..55af88118 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/EncounterAutoRollAppServiceImpl.java @@ -74,7 +74,7 @@ public class EncounterAutoRollAppServiceImpl implements IEncounterAutoRollAppSer @Override public R saveBinding(EncounterAutoRollSaveDto encounterAutoRollSaveDto) { // 当前登录账号参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 当前登录账号科室id Long orgId = SecurityUtils.getLoginUser().getOrgId(); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java index 069ddfe7f..c08c97e66 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java @@ -210,7 +210,7 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService Date now = medicineSummaryParamList.get(0).getExecuteTime() != null ? medicineSummaryParamList.get(0).getExecuteTime() : DateUtils.getNowDate(); // 申请人 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 药品发放id List medDispenseIdList = medicineSummaryParamList.stream().map(MedicineSummaryParam::getDispenseId).toList(); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java index a40817bcb..d0a061d13 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java @@ -205,7 +205,7 @@ public class OrgDeviceStockTakeAppServiceImpl implements IOrgDeviceStockTakeAppS // 申请时间 Date now = DateUtils.getNowDate(); // 申请人 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); for (OrgDeviceSummaryParam orgDeviceSummaryParam : orgDeviceSummaryParamList) { // 汇总单据号 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java index 3ae13d943..8b6718aa3 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/DepositAppServiceImpl.java @@ -129,7 +129,7 @@ public class DepositAppServiceImpl implements IDepositAppService { @Override public R savePayment(PaymentDto paymentDto) { // 收款员id - Long enterId = SecurityUtils.getLoginUser().getPractitionerId(); + Long enterId = SecurityUtils.getPractitionerId(); // 查询就诊信息（获取就诊ID） Encounter encounter = iEncounterService diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java index a983ea8a6..13c4aea84 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java @@ -149,7 +149,7 @@ public class NursingRecordAppServiceImpl implements INursingRecordAppService { @Transactional(rollbackFor = Exception.class) public R saveRecord(NursingRecordDto nursingRecordDto) { // 取得记录人员id - Long recorderId = SecurityUtils.getLoginUser().getPractitionerId(); + Long recorderId = SecurityUtils.getPractitionerId(); Emr emr = new Emr(); // 病历信息 @@ -182,7 +182,7 @@ public class NursingRecordAppServiceImpl implements INursingRecordAppService { @Transactional(rollbackFor = Exception.class) public R updateRecord(NursingRecordDto nursingRecordDto) { // 取得记录人员id - Long recordId = SecurityUtils.getLoginUser().getPractitionerId(); + Long recordId = SecurityUtils.getPractitionerId(); // 病历（记录单）保存 Emr emr = new Emr(); @@ -408,7 +408,7 @@ public class NursingRecordAppServiceImpl implements INursingRecordAppService { @Override @Transactional(rollbackFor = Exception.class) public R batchSaveRecord(BatchNursingRecordDto batchDto) { - Long recorderId = SecurityUtils.getLoginUser().getPractitionerId(); + Long recorderId = SecurityUtils.getPractitionerId(); java.util.Map tempIdToRealIdMap = new java.util.HashMap<>(); // 1. 处理待删除记录 (物理删除记录及体征表对应数据) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java index 2c4411e2f..98b084bda 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/LossReportFormAppServiceImpl.java @@ -253,7 +253,7 @@ public class LossReportFormAppServiceImpl implements ILossReportFormAppService { // 单据类型：报损单 .setTypeEnum(SupplyType.LOSS_REPORT_FORM.getValue()) // 制单人 - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) // 制单日期 .setApplyTime(DateUtils.getNowDate()); supplyRequestList.add(supplyRequest); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java index bde8f4c1f..6282d0585 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductStocktakingAppServiceImpl.java @@ -279,7 +279,7 @@ public class ProductStocktakingAppServiceImpl implements IProductStocktakingAppS // 单据类型：商品盘点 .setTypeEnum(SupplyType.PRODUCT_STOCKTAKING.getValue()) // 制单人 - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) // 申请时间 .setApplyTime(DateUtils.getNowDate()); supplyRequestList.add(supplyRequest); @@ -388,7 +388,7 @@ public class ProductStocktakingAppServiceImpl implements IProductStocktakingAppS // 单据类型：商品批量盘点 .setTypeEnum(SupplyType.PRODUCT_BATCH_STOCKTAKING.getValue()) // 制单人 - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) // 申请时间 .setApplyTime(DateUtils.getNowDate()); supplyRequestList.add(supplyRequest); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java index 7d19aa49a..4d6cd88fc 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java @@ -260,7 +260,7 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService .setId(null) .setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue()) .setTypeEnum(SupplyType.PRODUCT_BATCH_TRANSFER.getValue()) - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) .setApplyTime(DateUtils.getNowDate()) .setTotalQuantity(productTransferDto.getTotalSourceQuantity()); supplyRequestList.add(supplyRequest); @@ -319,7 +319,7 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService supplyRequest .setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue()) .setTypeEnum(SupplyType.PRODUCT_BATCH_TRANSFER.getValue()) - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) .setApplyTime(DateUtils.getNowDate()); supplyRequestService.save(supplyRequest); } @@ -439,7 +439,7 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService // 单据类型：商品调拨 .setTypeEnum(SupplyType.PRODUCT_TRANSFER.getValue()) // 制单人 - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) // 申请时间 .setApplyTime(DateUtils.getNowDate()); supplyRequestList.add(supplyRequest); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java index 53d9d29b7..a1006cc96 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java @@ -232,7 +232,7 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer // 单据类型：采购入库 .setTypeEnum(SupplyType.PURCHASE_INVENTORY.getValue()) // 制单人 - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) // 申请时间 .setApplyTime(DateUtils.getNowDate()) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java index 9907f591e..4c2a4a417 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/PurchaseReturnAppServiceImpl.java @@ -177,7 +177,7 @@ public class PurchaseReturnAppServiceImpl implements IPurchaseReturnAppService { // 单据类型：采购退货 .setTypeEnum(SupplyType.PRODUCT_RETURN.getValue()) // 制单人 - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) // 申请时间 .setApplyTime(DateUtils.getNowDate()); supplyRequestList.add(supplyRequest); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java index 132f94693..aea93970d 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java @@ -212,7 +212,7 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi // 单据类型：领用出库 .setTypeEnum(SupplyType.ISSUE_INVENTORY.getValue()) // 制单人 - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) // 申请时间 .setApplyTime(DateUtils.getNowDate()); supplyRequestList.add(supplyRequest); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java index 0a24364cc..7e350b212 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReturnIssueAppServiceImpl.java @@ -196,7 +196,7 @@ public class ReturnIssueAppServiceImpl implements IReturnIssueAppService { // 单据类型：退货出库 .setTypeEnum(SupplyType.RETURN_ISSUE.getValue()) // 制单人 - .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApplicantId(SecurityUtils.getPractitionerId()) // 申请时间 .setApplyTime(DateUtils.getNowDate()); supplyRequestList.add(supplyRequest); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java index c70bf65ab..08d1fb79c 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/jlau/appservice/impl/ReviewPrescriptionRecordsAppServiceImpl.java @@ -49,7 +49,7 @@ public class ReviewPrescriptionRecordsAppServiceImpl implements IReviewPrescript @Override public R reviewPrescription(ReviewPrescriptionRecordsDto reviewPrescriptionRecordsDto) { // 参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 就诊id Long encounterId = reviewPrescriptionRecordsDto.getEncounterId(); // 处方号 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java index c7d62316b..22f19e01b 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java @@ -174,7 +174,7 @@ public class OutpatientInfusionAppServiceImpl implements IOutpatientInfusionAppS // todo:查出对应的耗材并发放 // 获取执行人，执行科室，当前时间 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); Long orgId = SecurityUtils.getLoginUser().getOrgId(); Date now = DateUtils.getNowDate(); List serviceRequestList = @@ -244,7 +244,7 @@ public class OutpatientInfusionAppServiceImpl implements IOutpatientInfusionAppS // todo:查出对应的耗材并退回到药房 // 获取执行人，执行科室，当前时间 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); Long orgId = SecurityUtils.getLoginUser().getOrgId(); Date now = DateUtils.getNowDate(); // 获取诊疗项目信息 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java index f695b117f..20ed95f51 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/outpatientmanage/appservice/impl/OutpatientTreatmentAppServiceImpl.java @@ -370,7 +370,7 @@ public class OutpatientTreatmentAppServiceImpl implements IOutpatientTreatmentAp // 发药时间 deviceDispense.setDispenseTime(DateUtils.getNowDate()); // 发药人 - deviceDispense.setPerformerId(SecurityUtils.getLoginUser().getPractitionerId()); + deviceDispense.setPerformerId(SecurityUtils.getPractitionerId()); // 根据数量设置追溯码 deviceDispense.setTraceNo(String.join(CommonConstants.Common.COMMA, Collections .nCopies(deviceDispense.getQuantity().intValue(), CommonConstants.Common.DEV_TRACE_NO))); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java index 5c7471621..45f012348 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java @@ -409,7 +409,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService { // 新增支付信息 PaymentReconciliation payment = new PaymentReconciliation(); payment.setStatusEnum(PaymentStatus.DRAFT.getValue()).setPaymentNo(paymentNo).setYbSettleIds("") - .setPaymentEnum(PaymentType.PAY.getValue()).setEntererId(SecurityUtils.getLoginUser().getPractitionerId()) + .setPaymentEnum(PaymentType.PAY.getValue()).setEntererId(SecurityUtils.getPractitionerId()) .setPaymentReconciliationId(prePaymentDto.getPatientId()).setPatientId(prePaymentDto.getPatientId()) .setKindEnum(PaymentKind.OUTPATIENT_CLINIC.getValue()).setPractitionerId(prePaymentDto.getEntererId()) .setOutcomeEnum(PaymentOutcome.PARTIAL.getCode()).setLocationId(-99l).setExpirationDate(futureTime) @@ -778,7 +778,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService { @Override public R cancelPayment(CancelPaymentDto cancelPaymentDto) { // 当前登录用户 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 查找付款实例 PaymentReconciliation paymentReconciliation = paymentReconciliationService.getById(cancelPaymentDto.getId()); if (paymentReconciliation == null) { @@ -1036,7 +1036,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService { // SJQ:2025.04.01 确认locationId暂不做处理，location表只记录库房药房信息 paymentReconciliation.setId(null).setStatusEnum(PaymentStatus.REFUND_ALL.getValue()) .setPaymentEnum(PaymentType.UN_PAY.getValue()).setRelationId(id) - .setEntererId(SecurityUtils.getLoginUser().getPractitionerId()).setBillDate(new Date()) + .setEntererId(SecurityUtils.getPractitionerId()).setBillDate(new Date()) .setTenderedAmount(paymentReconciliation.getTenderedAmount().negate()) .setReturnedAmount(paymentReconciliation.getReturnedAmount().negate()) .setDisplayAmount(paymentReconciliation.getDisplayAmount().negate()) @@ -1983,7 +1983,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService { calendar.add(Calendar.HOUR_OF_DAY, 24); Date futureTime = calendar.getTime(); - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // Bug #409：预约签到挂号时，修正 serviceTypeId 为预约类型而非挂号类型 // 数据链：Order → ScheduleSlot → SchedulePool → HealthcareService @@ -2230,7 +2230,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService { // 保存挂号费 chargeItem.setEncounterId(encounterId); chargeItem.setAccountId(accountId); - chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId()); + chargeItem.setEntererId(SecurityUtils.getPractitionerId()); chargeItem.setQuantityValue(new BigDecimal("1")); iChargeItemService.saveChargeItemByRegister(chargeItem); // 处理诊疗费并返回对应的收费项目id集合用于医保结算 @@ -2345,7 +2345,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService { serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊 serviceRequest.setActivityId(activityAdviceBaseDto.getAdviceDefinitionId());// 诊疗定义id serviceRequest.setPatientId(encounter.getPatientId()); // 患者 - serviceRequest.setRequesterId(SecurityUtils.getLoginUser().getPractitionerId()); // 开方医生 + serviceRequest.setRequesterId(SecurityUtils.getPractitionerId()); // 开方医生 serviceRequest.setEncounterId(encounter.getId()); // 就诊id serviceRequest.setAuthoredTime(curDate); // 请求签发时间 serviceRequest.setOrgId(organizationId); // 执行科室 @@ -2360,7 +2360,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService { chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型 chargeItem.setEncounterId(encounter.getId()); // 就诊id chargeItem.setDefinitionId(advicePriceDto.getDefinitionId()); // 费用定价ID - chargeItem.setEntererId(SecurityUtils.getLoginUser().getPractitionerId());// 开立人ID + chargeItem.setEntererId(SecurityUtils.getPractitionerId());// 开立人ID chargeItem.setEnteredDate(curDate); // 开立时间 chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型 chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID @@ -3054,10 +3054,10 @@ public class PaymentRecServiceImpl implements IPaymentRecService { String paymentNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.PAYMENT_NO.getPrefix(), 20); payment.setStatusEnum(PaymentStatus.DRAFT.getValue()).setPaymentNo(paymentNo).setYbSettleIds("") - .setPaymentEnum(PaymentType.PAY.getValue()).setEntererId(SecurityUtils.getLoginUser().getPractitionerId()) + .setPaymentEnum(PaymentType.PAY.getValue()).setEntererId(SecurityUtils.getPractitionerId()) .setPaymentReconciliationId(chargeItemList.get(0).getPatientId()) .setPatientId(chargeItemList.get(0).getPatientId()).setKindEnum(PaymentKind.INPATIENT_CLINIC.getValue()) - .setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()) + .setPractitionerId(SecurityUtils.getPractitionerId()) .setOutcomeEnum(PaymentOutcome.COMPLETED.getCode()).setLocationId(-99l).setExpirationDate(futureTime) .setBillDate(setlTime).setPrintCount(0) .setChargeItemIds(chargeItemList.stream().map(ChargeItemBaseInfoDto::getId).map(String::valueOf) @@ -3108,10 +3108,10 @@ public class PaymentRecServiceImpl implements IPaymentRecService { String paymentNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.PAYMENT_NO.getPrefix(), 20); payment.setStatusEnum(PaymentStatus.DRAFT.getValue()).setPaymentNo(paymentNo).setYbSettleIds("") - .setPaymentEnum(paymentType.getValue()).setEntererId(SecurityUtils.getLoginUser().getPractitionerId()) + .setPaymentEnum(paymentType.getValue()).setEntererId(SecurityUtils.getPractitionerId()) .setPaymentReconciliationId(oldPayment.getPatientId()).setPatientId(oldPayment.getPatientId()) .setKindEnum(PaymentKind.HOSPITAL_DEPOSIT.getValue()).setRelationId(oldPayment.getId()) - .setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()) + .setPractitionerId(SecurityUtils.getPractitionerId()) .setOutcomeEnum(PaymentOutcome.PARTIAL.getCode()).setLocationId(-99l).setExpirationDate(futureTime) .setBillDate(setlTime).setPrintCount(0).setChargeItemIds(oldPayment.getChargeItemIds()) .setTenderedAmount(subtract.multiply(mul)).setDisplayAmount(subtract.multiply(mul)) @@ -3150,7 +3150,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService { @Override public String nenuBpcPay(NenuBpcPayDto nenuBpcPayDto) { - Practitioner practitioner = practitionerService.getById(SecurityUtils.getLoginUser().getPractitionerId()); + Practitioner practitioner = practitionerService.getById(SecurityUtils.getPractitionerId()); if (practitioner == null || practitioner.getPosNo() == null) { throw new ServiceException("未配置POS机编号！"); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java index c581c937b..845427749 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/IOrderGroupAppServiceImpl.java @@ -102,7 +102,7 @@ public class IOrderGroupAppServiceImpl implements IOrderGroupAppService { // 新增组套信息 orderGroup.setName(orderGroupDto.getName()).setTypeEnum(orderGroupDto.getTypeEnum()) .setRangeCode(orderGroupDto.getRangeCode()) - .setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()) + .setPractitionerId(SecurityUtils.getPractitionerId()) .setOrgId(SecurityUtils.getLoginUser().getOrgId()).setGroupJson(orderGroupDto.getGroupJson()) .setVersionNo(orderGroupDto.getVersionNo()); boolean result = orderGroupService.save(orderGroup); @@ -131,7 +131,7 @@ public class IOrderGroupAppServiceImpl implements IOrderGroupAppService { // 修改组套信息 orderGroup.setId(orderGroup.getId()).setName(orderGroupDto.getName()).setTypeEnum(orderGroupDto.getTypeEnum()) .setRangeCode(orderGroupDto.getRangeCode()) - .setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()) + .setPractitionerId(SecurityUtils.getPractitionerId()) .setOrgId(SecurityUtils.getLoginUser().getOrgId()).setGroupJson(orderGroupDto.getGroupJson()) .setVersionNo(orderGroupDto.getVersionNo()); boolean result = orderGroupService.saveOrUpdate(orderGroup); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java index ff1fc50c8..4b246614f 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java @@ -65,7 +65,7 @@ public class OrdersGroupPackageAppServiceImpl implements IOrdersGroupPackageAppS if (BindingType.PERSONAL.getValue().equals(packageTypeEnum) && ordersGroupPackageSaveDto.getPractitionerId() == null) { // throw new ServiceException("个人组套需选择人员"); - ordersGroupPackageSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + ordersGroupPackageSaveDto.setPractitionerId(SecurityUtils.getPractitionerId()); } else if (BindingType.ORGANIZATION.getValue().equals(packageTypeEnum) && ordersGroupPackageSaveDto.getOrganizationId() == null) { // throw new ServiceException("科室组套需选择科室"); @@ -168,7 +168,7 @@ public class OrdersGroupPackageAppServiceImpl implements IOrdersGroupPackageAppS public OrdersGroupPackageUseDto getGroupPackageForOrder(Long organizationId, Integer tcmFlag) { OrdersGroupPackageUseDto ordersGroupPackageUseDto = new OrdersGroupPackageUseDto(); // 当前参参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 当前登录账号的科室id Long orgId = SecurityUtils.getLoginUser().getOrgId(); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java index c4514a907..e25b0a424 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java @@ -304,7 +304,7 @@ public class InHospitalReturnMedicineAppServiceImpl implements IInHospitalReturn // 退药时间 medicationDispense.setDispenseTime(DateUtils.getNowDate()); // 退药人 - medicationDispense.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + medicationDispense.setPractitionerId(SecurityUtils.getPractitionerId()); // 设置库存变更参数（仅针对实际发过药的药品） if (!noInventoryUpdateMedIds.contains(medicationDispense.getId())) { diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java index ab63163e9..efa2f0c0e 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java @@ -209,7 +209,7 @@ public class MedicalDeviceDispenseAppServiceImpl implements IMedicalDeviceDispen public R deviceDispense(List dispenseDeviceList) { // 配药人检查 if (dispenseDeviceList.get(0).getPreparerId() == null - || dispenseDeviceList.get(0).getPreparerId().equals(SecurityUtils.getLoginUser().getPractitionerId())) { + || dispenseDeviceList.get(0).getPreparerId().equals(SecurityUtils.getPractitionerId())) { return R.fail("请选择调配药师"); } // 获取发药单id列表 @@ -292,7 +292,7 @@ public class MedicalDeviceDispenseAppServiceImpl implements IMedicalDeviceDispen // 发药时间 deviceDispense.setDispenseTime(DateUtils.getNowDate()); // 发药人 - deviceDispense.setPerformerId(SecurityUtils.getLoginUser().getPractitionerId()); + deviceDispense.setPerformerId(SecurityUtils.getPractitionerId()); // 配药时间 deviceDispense.setPrepareTime(DateUtils.getNowDate()); // 配药人 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java index 275064960..2b77d9105 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java @@ -277,7 +277,7 @@ public class ReturnMedicineAppServiceImpl implements IReturnMedicineAppService { // 退药时间 medicationDispense.setDispenseTime(DateUtils.getNowDate()); // 退药人 - medicationDispense.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + medicationDispense.setPractitionerId(SecurityUtils.getPractitionerId()); // 设置库存变更参数 SupplyItemDetailDto supplyItemDetailDto = new SupplyItemDetailDto(); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java index 97e671b50..36faf23cb 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java @@ -193,7 +193,7 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe // 发药时间 medicationDispense.setDispenseTime(now); // 发药人 - medicationDispense.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + medicationDispense.setPractitionerId(SecurityUtils.getPractitionerId()); // 设置库存变更参数 supplyItemDetailList.add(new SupplyItemDetailDto().setItemId(medicationDispense.getMedicationId()) .setLotNumber(medicationDispense.getLotNumber()) @@ -247,7 +247,7 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe // 发药时间 supplyDelivery.setOccurrenceTime(now); // 发药人 - supplyDelivery.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); + supplyDelivery.setPractitionerId(SecurityUtils.getPractitionerId()); } supplyDeliveryService.updateBatchById(supplyDeliveryList); // 汇总发放申请更新 @@ -255,7 +255,7 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe // 审核状态：已通过 supplyRequest.setStatusEnum(SupplyStatus.AGREE.getValue()) // 审核人 - .setApproverId(SecurityUtils.getLoginUser().getPractitionerId()) + .setApproverId(SecurityUtils.getPractitionerId()) // 审核时间 .setApprovalTime(now); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java index 3aac7377d..97ce9cdae 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java @@ -279,7 +279,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi } // 配药人检查 if (dispenseMedicineList.get(0).getPreparerId() == null - || dispenseMedicineList.get(0).getPreparerId().equals(SecurityUtils.getLoginUser().getPractitionerId())) { + || dispenseMedicineList.get(0).getPreparerId().equals(SecurityUtils.getPractitionerId())) { return R.fail("请选择调配药师"); } // 获取发药单id列表 @@ -426,7 +426,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi // 当前时间 Date nowDate = DateUtils.getNowDate(); // 当前用户id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); for (UnDispenseInventoryDto unDispenseInventoryDto : unDispenseInventoryList) { MedicationDispense medicationDispense = new MedicationDispense(); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/EmrQualityAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/EmrQualityAppServiceImpl.java index 7706214d8..98a19b044 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/EmrQualityAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/appservice/impl/EmrQualityAppServiceImpl.java @@ -6,6 +6,7 @@ import com.healthlink.his.web.quality.appservice.IEmrQualityAppService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.Date; @Service @@ -83,6 +84,7 @@ public class EmrQualityAppServiceImpl implements IEmrQualityAppService { } @Override + @Transactional(rollbackFor = Exception.class) public Map startDefectRectify(Long defectId) { Map result = new HashMap<>(); EmrDefect defect = defectMapper.selectById(defectId); @@ -99,6 +101,7 @@ public class EmrQualityAppServiceImpl implements IEmrQualityAppService { } @Override + @Transactional(rollbackFor = Exception.class) public Map completeDefectRectify(Long defectId) { Map result = new HashMap<>(); EmrDefect defect = defectMapper.selectById(defectId); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/controller/QualityBusinessAnalyticsController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/controller/QualityBusinessAnalyticsController.java index 6ff685f8b..89fdf353a 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/controller/QualityBusinessAnalyticsController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/quality/controller/QualityBusinessAnalyticsController.java @@ -7,6 +7,7 @@ import com.healthlink.his.quality.domain.BusinessAnalytics; import com.healthlink.his.quality.service.IBusinessAnalyticsService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @@ -23,6 +24,7 @@ public class QualityBusinessAnalyticsController { private final IBusinessAnalyticsService analyticsService; @GetMapping("/page") + @PreAuthorize("@ss.hasPermi('infection:quality:list')") public R getPage( @RequestParam(value = "departmentName", required = false) String deptName, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @@ -34,6 +36,7 @@ public class QualityBusinessAnalyticsController { } @PostMapping("/add") + @PreAuthorize("@ss.hasPermi('infection:quality:edit')") @Transactional(rollbackFor = Exception.class) public R add(@RequestBody BusinessAnalytics analytics) { analytics.setCreateTime(new Date()); @@ -42,6 +45,7 @@ public class QualityBusinessAnalyticsController { } @GetMapping("/summary") + @PreAuthorize("@ss.hasPermi('infection:quality:list')") public R getSummary() { Map summary = new HashMap<>(); List list = analyticsService.list(); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java index cb81e7677..55297b543 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java @@ -117,7 +117,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { queryWrapper.eq(currentUserOrganizationId != null, CommonConstants.FieldName.InHospitalOrgId, currentUserOrganizationId); IPage regPatientMainInfo = adviceManageAppMapper.getRegPatientMainInfo( - new Page<>(pageNo, pageSize), SecurityUtils.getLoginUser().getPractitionerId(), + new Page<>(pageNo, pageSize), SecurityUtils.getPractitionerId(), LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue(), EncounterActivityStatus.ACTIVE.getValue(), EncounterClass.IMP.getValue(), Whether.YES.getValue(), AccountType.PERSONAL_CASH_ACCOUNT.getCode(), EncounterZyStatus.TO_BE_REGISTERED.getValue(), @@ -991,7 +991,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { @Override public R getRegRequestBaseInfo(Long encounterId) { // 当前账号的参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 住院医嘱请求数据 List regRequestBaseInfo = adviceManageAppMapper.getRegRequestBaseInfo(encounterId, null, CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST, @@ -1032,7 +1032,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { @Override public R getRegRequestHistoryInfo(Long patientId, Long encounterId) { // 当前账号的参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 住院医嘱请求数据 List regRequestBaseInfo = adviceManageAppMapper.getRegRequestBaseInfo(encounterId, patientId, CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST, diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java index 8cf0e70da..55ab2fbef 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java @@ -53,7 +53,7 @@ public class NurseManageServiceImpl implements INurseManageService { public R pricingBusiness(String searchKeyWord) { // TODO 一、基础数据 1、获取 当前护士负责的 病区 和 病区下的患者数据；2、护士点击 患者姓名时，获取患者基础数据（床号，姓名等）； // 此处应该提供两个接口，策略模式， 如果从 门诊过来，new 门诊的用户来源，如果从 住院来，那么 new 住院的用户来源； - // 获取当前人 SecurityUtils.getLoginUser().getPractitionerId(); + // 获取当前人 SecurityUtils.getPractitionerId(); Long practitionerId = 2L; // 获取当前角色的负责的区域id数组 List roleLocationIds = practitionerRoleService.searchPractitionerRoleLocationIds(practitionerId, @@ -112,7 +112,7 @@ public class NurseManageServiceImpl implements INurseManageService { @Override public R medicalDeviceBusiness() { // 获取当前人 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); return null; } } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java index 2a1b456e7..ca8522ab9 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -99,7 +99,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) { return null; } - Long currentPractitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long currentPractitionerId = SecurityUtils.getPractitionerId(); Long requesterId = requestForm.getRequesterId(); if (currentPractitionerId == null || requesterId == null || !currentPractitionerId.equals(requesterId)) { @@ -195,7 +195,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer // 当前登录账号的科室id Long orgId = SecurityUtils.getLoginUser().getOrgId(); // 当前参与者ID - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 就诊ID Long encounterId = requestFormSaveDto.getEncounterId(); // 患者ID diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java index 69b6244cf..7d78cc905 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java @@ -127,7 +127,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService { @Override public R saveNursingOrders(NursingOrdersSaveDto nursingOrdersSaveDto) { // 当前登录账号参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 当前时间 Date curDate = new Date(); // 医嘱开始时间 @@ -312,7 +312,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService { @Override public R saveTransferOrganizationOrders(TransferOrganizationParam transferOrganizationParam) { // 当前登录账号参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 当前时间 Date curDate = new Date(); // 医嘱开始时间 @@ -431,7 +431,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService { @Override public R saveLeaveHospitalOrders(LeaveHospitalParam leaveHospitalParam) { // 当前登录账号参与者id - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); // 当前时间 Date curDate = new Date(); // 计划出院时间 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportDimensionAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportDimensionAppServiceImpl.java index bfc49d72e..c19531e54 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportDimensionAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportDimensionAppServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.util.StringUtils; import java.math.BigDecimal; import java.math.RoundingMode; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -26,15 +27,15 @@ public class ReportDimensionAppServiceImpl implements IReportDimensionAppService String endDate = filters != null ? filters.get("endDate") : null; if (StringUtils.hasText(startDate)) { + LocalDate start = LocalDate.parse(startDate); allData = allData.stream() - .filter(h -> h.getDischargeDate() != null && - h.getDischargeDate().toString().compareTo(startDate) >= 0) + .filter(h -> h.getDischargeDate() != null && !h.getDischargeDate().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate().isBefore(start)) .collect(Collectors.toList()); } if (StringUtils.hasText(endDate)) { + LocalDate end = LocalDate.parse(endDate); allData = allData.stream() - .filter(h -> h.getDischargeDate() != null && - h.getDischargeDate().toString().compareTo(endDate) <= 0) + .filter(h -> h.getDischargeDate() != null && !h.getDischargeDate().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate().isAfter(end)) .collect(Collectors.toList()); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/system/controller/HomeController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/system/controller/HomeController.java index b8d9fa555..35fcfb0a3 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/system/controller/HomeController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/system/controller/HomeController.java @@ -32,7 +32,7 @@ public class HomeController { HomeStatisticsDto statisticsDto = homeStatisticsService.getHomeStatistics(); // 获取待写病历数量 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); R pendingEmrCount = doctorStationEmrAppService.getPendingEmrCount(practitionerId, null); // 将待写病历数量添加到统计数据中 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbElepBaseServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbElepBaseServiceImpl.java index 9903757d6..4a74951be 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbElepBaseServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbElepBaseServiceImpl.java @@ -713,7 +713,7 @@ public class YbElepBaseServiceImpl implements IYbEleBaseService { break; } - Practitioner practitioner = iPractitionerService.getById(SecurityUtils.getLoginUser().getPractitionerId()); + Practitioner practitioner = iPractitionerService.getById(SecurityUtils.getPractitionerId()); map.put("doctorName", practitioner.getName()); map.put("medType", medicalContractName + medicalCareType); diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java index 27408437a..af0f15f22 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbServiceImpl.java @@ -1585,7 +1585,7 @@ public class YbServiceImpl implements IYbService { setlinfo.setSetlBegnDate(inpatientReg.getBegntime()); setlinfo.setSetlEndDate(inpatientDischarge.getEndtime()); //查询当前登陆人信息 - Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long practitionerId = SecurityUtils.getPractitionerId(); Practitioner practitioner = iPractitionerService.getById(practitionerId); if(practitioner==null){ diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChangePriceRecordServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChangePriceRecordServiceImpl.java index 33b440bb2..070fb5e9a 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChangePriceRecordServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChangePriceRecordServiceImpl.java @@ -87,7 +87,7 @@ public class ChangePriceRecordServiceImpl extends ServiceImpl().eq(ChangePriceRecord::getBusNo, busNo) .set(ChangePriceRecord::getApprovalTime, now) - .set(ChangePriceRecord::getApproverId, SecurityUtils.getLoginUser().getPractitionerId()) + .set(ChangePriceRecord::getApproverId, SecurityUtils.getPractitionerId()) .set(ChangePriceRecord::getStatusEnum, SupplyStatus.AGREE.getValue())); } @@ -96,7 +96,7 @@ public class ChangePriceRecordServiceImpl extends ServiceImpl().eq(ChangePriceRecord::getBusNo, busNo) .set(ChangePriceRecord::getApprovalTime, DateUtils.getNowDate()) - .set(ChangePriceRecord::getApproverId, SecurityUtils.getLoginUser().getPractitionerId()) + .set(ChangePriceRecord::getApproverId, SecurityUtils.getPractitionerId()) .set(ChangePriceRecord::getStatusEnum, SupplyStatus.REJECT.getValue())); return updateCount > 0; } diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java index 4c5ea10ee..4f19918ef 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/ChargeItemServiceImpl.java @@ -163,7 +163,7 @@ public class ChargeItemServiceImpl extends ServiceImpl() .eq(ChargeItem::getId, chargeItemId) .eq(ChargeItem::getStatusEnum, currentChargeItem.getStatusEnum()) // 使用当前状态作为条件 diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionServiceImpl.java index 323eb4ae7..087f224d3 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/clinical/service/impl/ConditionServiceImpl.java @@ -30,7 +30,7 @@ public class ConditionServiceImpl extends ServiceImpl serReqIdList, Long practitionerId, Date checkDate) { baseMapper.update(new ServiceRequest().setStatusEnum(RequestStatus.COMPLETED.getValue()) - .setPerformerCheckId(SecurityUtils.getLoginUser().getPractitionerId()).setCheckTime(DateUtils.getNowDate()), + .setPerformerCheckId(SecurityUtils.getPractitionerId()).setCheckTime(DateUtils.getNowDate()), new LambdaUpdateWrapper().in(ServiceRequest::getId, serReqIdList) .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode())); } @@ -74,7 +74,7 @@ public class ServiceRequestServiceImpl extends ServiceImpl serReqIdList, Long practitionerId, Date checkDate) { baseMapper.update(new ServiceRequest().setStatusEnum(RequestStatus.CHECK_VERIFIED.getValue()) - .setPerformerCheckId(SecurityUtils.getLoginUser().getPractitionerId()).setCheckTime(DateUtils.getNowDate()), + .setPerformerCheckId(SecurityUtils.getPractitionerId()).setCheckTime(DateUtils.getNowDate()), new LambdaUpdateWrapper().in(ServiceRequest::getId, serReqIdList) .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode())); } @@ -200,7 +200,7 @@ public class ServiceRequestServiceImpl extends ServiceImpl serviceRequestIdList, Long practitionerId, Date checkDate, String backReason) { ServiceRequest updateEntity = new ServiceRequest() .setStatusEnum(RequestStatus.DRAFT.getValue()) - .setPerformerCheckId(SecurityUtils.getLoginUser().getPractitionerId()) + .setPerformerCheckId(SecurityUtils.getPractitionerId()) .setCheckTime(DateUtils.getNowDate()); if (backReason != null && !backReason.isEmpty()) { updateEntity.setReasonText(backReason); diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyDeliveryServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyDeliveryServiceImpl.java index 0960bf842..cb9040663 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyDeliveryServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyDeliveryServiceImpl.java @@ -111,7 +111,7 @@ public class SupplyDeliveryServiceImpl extends ServiceImpl supplyDeliveryIdList) { baseMapper.update( new SupplyDelivery().setStatusEnum(DispenseStatus.COMPLETED.getValue()) - .setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()) + .setPractitionerId(SecurityUtils.getPractitionerId()) .setOccurrenceTime(DateUtils.getNowDate()).setReceiveTime(DateUtils.getNowDate()), new LambdaUpdateWrapper().in(SupplyDelivery::getId, supplyDeliveryIdList)); } diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestServiceImpl.java index 325260ebe..fd001533b 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestServiceImpl.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/workflow/service/impl/SupplyRequestServiceImpl.java @@ -87,7 +87,7 @@ public class SupplyRequestServiceImpl extends ServiceImpl().eq(SupplyRequest::getBusNo, busNo) .set(SupplyRequest::getApprovalTime, now) - .set(SupplyRequest::getApproverId, SecurityUtils.getLoginUser().getPractitionerId()) + .set(SupplyRequest::getApproverId, SecurityUtils.getPractitionerId()) .set(SupplyRequest::getStatusEnum, SupplyStatus.AGREE.getValue())); // 返回单据详情 return this.getSupplyByBusNo(busNo); @@ -190,7 +190,7 @@ public class SupplyRequestServiceImpl extends ServiceImpl().eq(SupplyRequest::getBusNo, busNo) .set(SupplyRequest::getApprovalTime, DateUtils.getNowDate()) - .set(SupplyRequest::getApproverId, SecurityUtils.getLoginUser().getPractitionerId()) + .set(SupplyRequest::getApproverId, SecurityUtils.getPractitionerId()) .set(SupplyRequest::getStatusEnum, SupplyStatus.REJECT.getValue())); return updateCount > 0; } @@ -272,7 +272,7 @@ public class SupplyRequestServiceImpl extends ServiceImpl supplyRequestIdList) { baseMapper.update(new SupplyRequest().setStatusEnum(SupplyStatus.AGREE.getValue()) - .setApproverId(SecurityUtils.getLoginUser().getPractitionerId()).setApprovalTime(DateUtils.getNowDate()), + .setApproverId(SecurityUtils.getPractitionerId()).setApprovalTime(DateUtils.getNowDate()), new LambdaUpdateWrapper().in(SupplyRequest::getId, supplyRequestIdList)); } diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java index fc02452be..e38a15223 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbDao.java @@ -1116,7 +1116,7 @@ public class YbDao { FinancialApplyRecord financialApplyRecord = new FinancialApplyRecord(); BeanUtils.copyProperties(financial3203AParam, financialApplyRecord); financialApplyRecord.setParam(JsonUtils.toJson(financial3203AParam)).setOutResult(s) - .setPraId(SecurityUtils.getLoginUser().getPractitionerId()).setStatus("0"); + .setPraId(SecurityUtils.getPractitionerId()).setStatus("0"); iFinancialApplyRecordService.save(financialApplyRecord); }