From 18391c1fe5b1963791c71bad04c3d30804b2ed42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= Date: Fri, 29 May 2026 10:02:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(#613):=20=E8=AF=B7=E4=BF=AE=E5=A4=8D=20Bug?= =?UTF-8?q?=20#613=EF=BC=9A=E3=80=90=E5=8C=BB=E5=98=B1=E6=A0=A1=E5=AF=B9/?= =?UTF-8?q?=E4=BD=8F=E9=99=A2=E5=8C=BB=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99?= =?UTF-8?q?=E3=80=91=E5=8C=BB=E5=98=B1=E9=80=80=E5=9B=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E5=8F=8D=E9=A6=88=E6=9C=BA=E5=88=B6=EF=BC=9A?= =?UTF-8?q?=E6=8A=A4=E5=A3=AB=E7=AB=AF=E9=80=80=E5=9B=9E=E6=97=A0=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E5=BD=95=E5=85=A5=EF=BC=8C=E5=8C=BB=E7=94=9F=E7=AB=AF?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E5=8E=9F=E5=9B=A0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根因： - 1. ❌ 录入（护士端无退回原因输入弹窗） - 2. ❌ 保存（后端不保存退回原因） - 3. ❌ 查询（Mapper XML 不查询退回原因字段） - 4. ❌ 展示（医生端不显示退回原因） - 5. ❌ ServiceRequest 已有 `reasonText` 字段但未使用 - 6. ❌ MedicationRequest 无退回原因字段 修复： - Step 1**: 添加 `backReason` 到后端 DTO --- .../java/com/openhis/web/common/dto/PerformInfoDto.java | 3 +++ .../com/openhis/medication/domain/MedicationRequest.java | 3 +++ .../medication/service/IMedicationRequestService.java | 2 +- .../service/impl/MedicationRequestServiceImpl.java | 8 +++++++- .../openhis/workflow/service/IServiceRequestService.java | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java index c1f30a14e..0b3e9d3d4 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/PerformInfoDto.java @@ -36,4 +36,7 @@ public class PerformInfoDto { /** 分组id */ @JsonSerialize(using = ToStringSerializer.class) private Long groupId; + + /** 退回原因 */ + private String backReason; } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java index 38c26463a..108c14986 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java @@ -111,6 +111,9 @@ public class MedicationRequest extends HisBaseEntity { /** 支持用药信息 */ private String supportInfo; + /** 退回原因 */ + private String backReason; + /** 请求开始时间 */ private Date reqAuthoredTime; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java index a57aa0a5e..96bb1350c 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationRequestService.java @@ -30,7 +30,7 @@ public interface IMedicationRequestService extends IService { * @param practitionerId 校对人 * @param checkDate 校对时间 */ - void updateDraftStatusBatch(List requestIdList, Long practitionerId, Date checkDate); + void updateDraftStatusBatch(List requestIdList, Long practitionerId, Date checkDate, String backReason); /** * 更新请求状态：取消 diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java index 71f35fb77..2194e1623 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java @@ -44,7 +44,7 @@ public class MedicationRequestServiceImpl extends ServiceImpl requestIdList, Long practitionerId, Date checkDate) { + public void updateDraftStatusBatch(List requestIdList, Long practitionerId, Date checkDate, String backReason) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper().in(MedicationRequest::getId, requestIdList) .set(MedicationRequest::getStatusEnum, RequestStatus.DRAFT.getValue()); @@ -54,6 +54,9 @@ public class MedicationRequestServiceImpl extends ServiceImpl { * @param practitionerId 校对人 * @param checkDate 校对时间 */ - void updateDraftStatus(List serviceRequestIdList, Long practitionerId, Date checkDate); + void updateDraftStatus(List serviceRequestIdList, Long practitionerId, Date checkDate, String backReason); /** * 更新服务状态：待发送