diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java index d0509b2c..f4549f3d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java @@ -61,6 +61,8 @@ import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import static com.openhis.web.consultation.enums.ConsultationStatusEnum.CANCELLED; + /** * 会诊管理AppService实现类 * @@ -134,6 +136,8 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { // 根据就诊ID,查询该患者的会诊申请 wrapper.eq(ConsultationRequest::getEncounterId, encounterId); + // 过滤已作废的数据 + wrapper.ne(ConsultationRequest::getConsultationStatus, CANCELLED.getCode()); wrapper.orderByDesc(ConsultationRequest::getCreateTime); List list = consultationRequestMapper.selectList(wrapper); @@ -282,11 +286,15 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { entity = new ConsultationRequest(); entity.setConsultationId(generateConsultationId()); entity.setTenantId(SecurityUtils.getLoginUser().getTenantId().longValue()); - entity.setConsultationRequestDate(new Date()); } // 复制基本属性(现在字段名已统一,可以直接复制) - BeanUtils.copyProperties(dto, entity, "id", "consultationId", "invitedList", "submitFlag", "provisionalDiagnosis", "consultationRequestDate"); + BeanUtils.copyProperties(dto, entity, "id", "consultationId", "invitedList", "submitFlag", "provisionalDiagnosis"); + + // 新增时:如果前端没有传递申请时间,使用服务器时间 + if (!isUpdate && entity.getConsultationRequestDate() == null) { + entity.setConsultationRequestDate(new Date()); + } // 如果前端没有传递申请医生ID,使用当前登录用户 if (entity.getRequestingPhysicianId() == null) { @@ -440,7 +448,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService { } else { // 作废:将状态改为"已取消" - entity.setConsultationStatus(ConsultationStatusEnum.CANCELLED.getCode()); + entity.setConsultationStatus(CANCELLED.getCode()); entity.setCancelReason(cancelReason); entity.setCancelNatureDate(new Date()); consultationRequestMapper.updateById(entity); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationStatusEnum.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationStatusEnum.java index 7479ca66..72886204 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationStatusEnum.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/enums/ConsultationStatusEnum.java @@ -41,7 +41,7 @@ public enum ConsultationStatusEnum { /** * 已取消 */ - CANCELLED(50, "已取消"); + CANCELLED(50, "已取消/作废"); /** * 状态码 diff --git a/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue b/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue index 0afb2ea5..f3d08b0e 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue @@ -34,7 +34,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -240,35 +240,24 @@ - - - - + + + + - - - - - - - + @@ -349,7 +338,7 @@