fix(#613): 请修复 Bug #613:【医嘱校对/住院医生工作站】医嘱退回流程缺失反馈机制:护士端退回无原因录入,医生端缺失原因显示
根因: - 1. ❌ 录入(护士端无退回原因输入弹窗) - 2. ❌ 保存(后端不保存退回原因) - 3. ❌ 查询(Mapper XML 不查询退回原因字段) - 4. ❌ 展示(医生端不显示退回原因) - 5. ❌ ServiceRequest 已有 `reasonText` 字段但未使用 - 6. ❌ MedicationRequest 无退回原因字段 修复: - Step 1**: 添加 `backReason` 到后端 DTO
This commit is contained in:
@@ -36,4 +36,7 @@ public class PerformInfoDto {
|
|||||||
/** 分组id */
|
/** 分组id */
|
||||||
@JsonSerialize(using = ToStringSerializer.class)
|
@JsonSerialize(using = ToStringSerializer.class)
|
||||||
private Long groupId;
|
private Long groupId;
|
||||||
|
|
||||||
|
/** 退回原因 */
|
||||||
|
private String backReason;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,6 +111,9 @@ public class MedicationRequest extends HisBaseEntity {
|
|||||||
/** 支持用药信息 */
|
/** 支持用药信息 */
|
||||||
private String supportInfo;
|
private String supportInfo;
|
||||||
|
|
||||||
|
/** 退回原因 */
|
||||||
|
private String backReason;
|
||||||
|
|
||||||
/** 请求开始时间 */
|
/** 请求开始时间 */
|
||||||
private Date reqAuthoredTime;
|
private Date reqAuthoredTime;
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public interface IMedicationRequestService extends IService<MedicationRequest> {
|
|||||||
* @param practitionerId 校对人
|
* @param practitionerId 校对人
|
||||||
* @param checkDate 校对时间
|
* @param checkDate 校对时间
|
||||||
*/
|
*/
|
||||||
void updateDraftStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate);
|
void updateDraftStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate, String backReason);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新请求状态:取消
|
* 更新请求状态:取消
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ public class MedicationRequestServiceImpl extends ServiceImpl<MedicationRequestM
|
|||||||
* @param checkDate 校对时间
|
* @param checkDate 校对时间
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateDraftStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate) {
|
public void updateDraftStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate, String backReason) {
|
||||||
LambdaUpdateWrapper<MedicationRequest> updateWrapper =
|
LambdaUpdateWrapper<MedicationRequest> updateWrapper =
|
||||||
new LambdaUpdateWrapper<MedicationRequest>().in(MedicationRequest::getId, requestIdList)
|
new LambdaUpdateWrapper<MedicationRequest>().in(MedicationRequest::getId, requestIdList)
|
||||||
.set(MedicationRequest::getStatusEnum, RequestStatus.DRAFT.getValue());
|
.set(MedicationRequest::getStatusEnum, RequestStatus.DRAFT.getValue());
|
||||||
@@ -54,6 +54,9 @@ public class MedicationRequestServiceImpl extends ServiceImpl<MedicationRequestM
|
|||||||
if (checkDate != null) {
|
if (checkDate != null) {
|
||||||
updateWrapper.set(MedicationRequest::getCheckTime, checkDate);
|
updateWrapper.set(MedicationRequest::getCheckTime, checkDate);
|
||||||
}
|
}
|
||||||
|
if (backReason != null) {
|
||||||
|
updateWrapper.set(MedicationRequest::getBackReason, backReason);
|
||||||
|
}
|
||||||
baseMapper.update(null, updateWrapper);
|
baseMapper.update(null, updateWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,6 +78,9 @@ public class MedicationRequestServiceImpl extends ServiceImpl<MedicationRequestM
|
|||||||
if (checkDate != null) {
|
if (checkDate != null) {
|
||||||
updateWrapper.set(MedicationRequest::getCheckTime, checkDate);
|
updateWrapper.set(MedicationRequest::getCheckTime, checkDate);
|
||||||
}
|
}
|
||||||
|
if (backReason != null) {
|
||||||
|
updateWrapper.set(MedicationRequest::getBackReason, backReason);
|
||||||
|
}
|
||||||
baseMapper.update(null, updateWrapper);
|
baseMapper.update(null, updateWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
|
|||||||
* @param practitionerId 校对人
|
* @param practitionerId 校对人
|
||||||
* @param checkDate 校对时间
|
* @param checkDate 校对时间
|
||||||
*/
|
*/
|
||||||
void updateDraftStatus(List<Long> serviceRequestIdList, Long practitionerId, Date checkDate);
|
void updateDraftStatus(List<Long> serviceRequestIdList, Long practitionerId, Date checkDate, String backReason);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新服务状态:待发送
|
* 更新服务状态:待发送
|
||||||
|
|||||||
Reference in New Issue
Block a user