From 6bf48194c4d9f904e8c0b5e70e4b2a3fc0da097c Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Thu, 25 Jun 2026 14:19:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?714=20=E3=80=90=E4=BD=8F=E9=99=A2=E6=8A=A4?= =?UTF-8?q?=E5=A3=AB=E7=AB=99-=E5=8C=BB=E5=98=B1=E6=A0=A1=E5=AF=B9?= =?UTF-8?q?=E3=80=91=E4=BD=8F=E9=99=A2=E6=8A=A4=E5=A3=AB=E7=AB=99-?= =?UTF-8?q?=E5=8C=BB=E5=98=B1=E6=A0=B8=E5=AF=B9=E7=95=8C=E9=9D=A2=EF=BC=9A?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E2=80=9C=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E2=80=9D=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E4=B8=94=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=8D=95=E9=80=89=E6=9C=AA=E9=80=89=E4=B8=AD=E2=80=9C?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AdviceProcessAppServiceImpl.java | 24 +++++++++++-------- .../components/prescriptionList.vue | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) 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 768fa79d5..869b2151b 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 @@ -13,6 +13,7 @@ import com.core.common.enums.TenantOptionDict; import com.core.common.exception.ServiceException; import com.core.common.utils.*; import com.core.common.utils.bean.BeanUtils; +import lombok.extern.slf4j.Slf4j; import com.core.common.utils.TenantOptionUtil; import com.healthlink.his.administration.domain.ChargeItem; import com.healthlink.his.administration.service.IChargeItemService; @@ -54,7 +55,6 @@ import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.math.RoundingMode; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.Date; import java.time.ZoneId; @@ -70,6 +70,7 @@ import java.util.stream.Collectors; * @author zwh * @date 2025-08-07 */ +@Slf4j @Service public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { @@ -185,7 +186,9 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { // 提取requestStatus手动处理，支持COMPLETED(3)和CHECK_VERIFIED(10)同时查询 Integer requestStatus = inpatientAdviceParam.getRequestStatus(); inpatientAdviceParam.setRequestStatus(null); - // 提取deadline手动处理，需要做NULL-safe的end_time比较（Bug #763修复） + // 提取deadline手动处理 + // Bug #714修复：截止时间过滤，使用request_time限制检索范围 + // Bug #763修复：NULL-safe的end_time比较 String deadline = inpatientAdviceParam.getDeadline(); inpatientAdviceParam.setDeadline(null); // 构建查询条件 @@ -215,16 +218,17 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { = Arrays.stream(encounterIds.split(CommonConstants.Common.COMMA)).map(Long::parseLong).toList(); queryWrapper.in(CommonConstants.FieldName.EncounterId, encounterIdList); } - // 手动拼接deadline条件：end_time IS NULL OR end_time <= deadline（Bug #763修复） - // 住院医嘱的effective_dose_end可能为NULL（签发临时医嘱时未设置结束时间）， - // PostgreSQL中 NULL <= anything 结果为FALSE，需要先判断IS NULL + // 手动拼接截止时间条件： + // 1. request_time >= deadline：只显示截止时间之后创建的医嘱（Bug #714修复） + // 默认值为当天00:00:00，默认只加载当天数据，避免加载过长周期的历史未核对数据 + // 2. end_time IS NULL OR end_time <= deadline：NULL-safe终止时间比较（Bug #763修复） if (deadline != null && !deadline.isEmpty()) { - try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date deadlineTime = sdf.parse(deadline); + Date deadlineTime = DateUtils.parseDate(deadline); + if (deadlineTime != null) { + queryWrapper.ge("request_time", deadlineTime); queryWrapper.and(w -> w.isNull("end_time").or().le("end_time", deadlineTime)); - } catch (java.text.ParseException e) { - // deadline解析失败，忽略此条件 + } else { + log.warn("截止时间解析失败: {}", deadline); } } // 患者医嘱分页列表 diff --git a/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue b/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue index e6aafe214..aa4a49c01 100755 --- a/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue +++ b/healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue @@ -413,7 +413,7 @@ import {RequestStatus} from '@/utils/medicalConstants'; const activeNames = ref([]); const prescriptionList = ref([]); -const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59'); +const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 00:00:00'); const type = ref(0); const backReasonVisible = ref(false); const backReasonForm = ref({ reason: '' }); From b64b3c96dfe012b54143e03dcd21d342e2a0b956 Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Thu, 25 Jun 2026 14:33:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?718=20=E3=80=90=E4=B8=9A=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E7=BC=BA=E9=99=B7=E3=80=91=E5=8C=BB=E7=94=9F=E7=AB=AF?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E2=80=9C=E5=81=9C=E5=98=B1=E2=80=9D=E5=90=8E?= =?UTF-8?q?=E5=8C=BB=E5=98=B1=E7=9B=B4=E6=8E=A5=E5=8F=98=E6=9B=B4=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E5=B7=B2=E5=81=9C=E6=AD=A2=E2=80=9D=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E6=B5=81=E8=BD=AC=E8=87=B3=E6=8A=A4=E5=A3=AB=E7=AB=AF=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=81=9C=E6=AD=A2=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/inpatientDoctor/home/components/order/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue index b6ad77956..456265eb2 100755 --- a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue +++ b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue @@ -421,7 +421,7 @@ v-else-if="scope.row.statusEnum == 13" type="warning" > - 已停嘱(待核对) + 已停嘱