From 6ffa47bf5e18e7a906ab0cf58b600688a6d390a1 Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Thu, 25 Jun 2026 11:59:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?689=20[=E4=BD=8F=E9=99=A2=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E4=BD=8F=E9=99=A2=E5=8F=91=E9=80=80=E8=8D=AF]=20=E5=8F=91?= =?UTF-8?q?=E8=8D=AF=E6=B1=87=E6=80=BB=E5=8D=95=E7=95=8C=E9=9D=A2=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E8=A2=AB=E6=8C=A4=E5=8E=8B=E3=80=81=E5=8F=91=E6=94=BE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=96=87=E6=A1=88=E4=B8=8D=E7=AC=A6=E5=8F=8A?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E8=AF=A6=E6=83=85=E8=81=94=E5=8A=A8=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MedicineSummaryAppServiceImpl.java | 10 ++--- .../components/MedicationSummary.vue | 37 +++++++++---------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java index ee41695af..036753d4a 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java @@ -78,9 +78,9 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService .map(notPerformedReason -> new DispenseInitDto.NotPerformedReasonOption(notPerformedReason.getValue(), notPerformedReason.getInfo())) .collect(Collectors.toList()); - // 发药状态（汇总单：待配药→已提交，已发放→已发药） + // 发药状态（汇总单：汇总申请→待发药，发药→已发药） List dispenseStatusOptions = new ArrayList<>(); - dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.PREPARATION.getValue(), "已提交")); + dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.PREPARATION.getValue(), "待发药")); dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.COMPLETED.getValue(), "已发药")); initDto.setNotPerformedReasonOptions(notPerformedReasonOptions).setDispenseStatusOptions(dispenseStatusOptions); @@ -309,11 +309,11 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService } /** - * 汇总发药单状态展示文案（药品医嘱状态映射表：汇总申请→已提交，发药→已发药） + * 汇总发药单状态展示文案（药品医嘱状态映射表：汇总申请→待发药，发药→已发药） */ private String getSummaryFormStatusText(Integer statusEnum) { - if (DispenseStatus.EXECUTED.getValue().equals(statusEnum)) { - return "已提交"; + if (DispenseStatus.PREPARATION.getValue().equals(statusEnum)) { + return "待发药"; } if (DispenseStatus.COMPLETED.getValue().equals(statusEnum)) { return "已发药"; diff --git a/healthlink-his-ui/src/views/drug/inpatientMedicationDispensing/components/MedicationSummary.vue b/healthlink-his-ui/src/views/drug/inpatientMedicationDispensing/components/MedicationSummary.vue index f4f618ae2..8e967cc2d 100755 --- a/healthlink-his-ui/src/views/drug/inpatientMedicationDispensing/components/MedicationSummary.vue +++ b/healthlink-his-ui/src/views/drug/inpatientMedicationDispensing/components/MedicationSummary.vue @@ -2,7 +2,7 @@
{{ '汇总单' }} @@ -92,7 +92,7 @@ field="busNo" title="单据号" align="center" - min-width="90" + min-width="130" show-overflow="title" /> ({ ...item, - label: SUMMARY_STATUS_DISPLAY[item.value] ?? LEGACY_SUMMARY_STATUS_TEXT[item.label] ?? item.label, + label: SUMMARY_STATUS_DISPLAY[item.value] ?? item.label, })); } @@ -317,7 +307,9 @@ function getSummaryList() { queryParams.value.applyTimeSTime = queryParams.value.applyTime[0] + ' 00:00:00'; queryParams.value.applyTimeETime = queryParams.value.applyTime[1] + ' 23:59:59'; getFromSummaryList(queryParams.value).then((res) => { - summaryList.value = res.data.records; + summaryList.value = res.data.records || []; + }).catch(() => { + summaryList.value = []; }); } @@ -335,9 +327,16 @@ function resetQuery() { function getDetails(params) { // cell-click 事件参数是 { row, column, $event, ... } 对象，需安全提取行数据 const row = params.row || params; + if (!row?.busNo) { + summaryDetailsData.value = []; + return; + } loading.value = true; getFromSummaryDetails({ summaryNo: row.busNo }).then((res) => { - summaryDetailsData.value = res.data; + summaryDetailsData.value = res.data || []; + }).catch(() => { + summaryDetailsData.value = []; + }).finally(() => { loading.value = false; }); } From c3765cac8018063165864f2d02794db06fd1deed Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Thu, 25 Jun 2026 13:22:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?698=20[=E6=94=B6=E8=B4=B9=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=AB=99-=E4=BD=8F=E9=99=A2=E7=99=BB=E8=AE=B0-=E5=B7=B2?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E5=85=A5=E9=99=A2]=20=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E5=8D=95=E4=B8=80=EF=BC=8C=E4=B8=94=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=BD=92=E6=A1=A3=E4=BF=A1=E6=81=AF=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=EF=BC=88=E9=9C=80=E5=A2=9E=E8=AE=BE=E6=A3=80=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=B8=8E=E8=A1=A5=E5=85=85=E5=88=97=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=B1=95=E7=A4=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../register/components/accomplishList.vue | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/accomplishList.vue b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/accomplishList.vue index 5833ca228..3c23c5c9f 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/accomplishList.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/accomplishList.vue @@ -5,7 +5,7 @@ @@ -425,14 +425,35 @@ const handlePrintCertificate = async () => { }; getContract(); -// 获取入院科室列表 +// 获取入院科室列表（仅住院科室：classEnum 包含 "2"） function loadOrgList() { getOrgList().then((res) => { - orgList.value = res.data || []; + const records = res.data?.records || []; + orgList.value = records.filter( + (record) => record.typeEnum === 2 && checkClassEnumValue(record.classEnum, 2) + ); }); } +// 判断科室分类是否包含指定值（支持逗号分隔的多选值，如 "1,2"） +function checkClassEnumValue(classEnum, targetValue) { + if (!classEnum) return false; + if (typeof classEnum === 'string' && classEnum.includes(',')) { + const values = classEnum.split(',').map(v => v.trim()); + return values.some(v => v == targetValue); + } + return classEnum == targetValue; +} + onMounted(() => { + // 默认检索近一周时间段 + const endDate = new Date(); + const startDate = new Date(); + startDate.setDate(startDate.getDate() - 7); + dateRange.value = [ + formatDateStr(startDate) + ' 00:00:00', + formatDateStr(endDate) + ' 23:59:59', + ]; getList(); loadOrgList(); }); @@ -465,7 +486,14 @@ function resetQuery() { startTime: '', endTime: '', }; - dateRange.value = []; + // 重置为默认近一周时间段 + const endDate = new Date(); + const startDate = new Date(); + startDate.setDate(startDate.getDate() - 7); + dateRange.value = [ + formatDateStr(startDate) + ' 00:00:00', + formatDateStr(endDate) + ' 23:59:59', + ]; getList(); } @@ -491,6 +519,14 @@ const priceTypeDic = (contractNo) => { return findObj?.contractName; }; +/** 格式化日期为 YYYY-MM-DD */ +function formatDateStr(date) { + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); + const day = String(date.getDate()).padStart(2, '0'); + return `${year}-${month}-${day}`; +} + const getList = () => { // 设置按申请时间排序 queryParams.value.sortField = 'requestTime';