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); /** * 更新服务状态:待发送