From 8b47a8ab55d53c3e55eef087580483510b13032e Mon Sep 17 00:00:00 2001 From: chenqi Date: Thu, 11 Jun 2026 10:51:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(common):=20=E4=BF=AE=E5=A4=8D=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E6=9C=8D=E5=8A=A1=E8=BF=94=E5=9B=9E=E7=A9=BA=E5=80=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复 CommonServiceImpl 中返回空集合而非 null 的问题 - 添加新的国际化错误消息用于目录不存在的情况 - 重构门诊挂号查询的时间和状态过滤条件为动态SQL - 更新支付对账分组字段以包含合同编号 - 调整会诊相关API端点路径和请求方法 - 优化技术工作站退费审批接口路径和参数传递方式 - 重构待处理EMR页面跳转逻辑，移除确认对话框直接跳转住院医生工作站 --- .../appservice/impl/CommonServiceImpl.java | 2 +- .../main/resources/i18n/messages.properties | 3 +- .../resources/i18n/messages_zh_CN.properties | 3 +- .../OutpatientRegistrationAppMapper.xml | 19 ++++++--- .../financial/PaymentReconciliationMapper.xml | 3 +- .../src/api/consultation/request.js | 40 +++++++++--------- healthlink-his-ui/src/api/techStation.js | 10 ++--- .../src/views/doctorstation/pendingEmr.vue | 42 ++++++------------- 8 files changed, 59 insertions(+), 63 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java index be0c35e68..2df47b5bc 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/common/appservice/impl/CommonServiceImpl.java @@ -666,7 +666,7 @@ public class CommonServiceImpl implements ICommonService { .eq(DocInventoryItemStatic::getDeleteFlag, DelFlag.NO.getCode()) .eq(DocInventoryItemStatic::getTenantId, SecurityUtils.getLoginUser().getTenantId())); if (docInventoryItemStaticList.isEmpty()) { - return null; + return R.ok(Collections.emptyList()); } // 直接去重并按BusNo倒序排序 List busNoList = docInventoryItemStaticList.stream().map(DocInventoryItemStatic::getBusNo).distinct() // 去重 diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/i18n/messages.properties b/healthlink-his-server/healthlink-his-application/src/main/resources/i18n/messages.properties index 67955d33e..e36bbec7e 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/i18n/messages.properties +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/i18n/messages.properties @@ -52,4 +52,5 @@ apl.payment.M00007=\u672A\u67E5\u8BE2\u5230\u6536\u8D39\u9879\u76EE apl.payment.M00008=\u672A\u67E5\u8BE2\u5230{0}\u8D26\u6237\u4FE1\u606F apl.payment.M00009=\u672A\u67E5\u8BE2\u5230\u6536\u8D39\u9879\u76EE\uFF0C\u4E0D\u9700\u8981\u8F6C\u6362\u8D26\u6237 apl.adjustPrice.M00001=\u6267\u884C\u5931\u8D25\uFF0C\u672A\u52A0\u8F7D\u5230\u4EFB\u4F55\u6570\u636E\uFF01 -apl.adjustPrice.M00002=\u6267\u884C\u5931\u8D25\uFF0C\u6539\u4EF7\u5355\u4E2D\u6709\u6B63\u5728\u5BA1\u6838\u4E2D\u7684\u8D27\u54C1\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u65B0\u63D0\u4EA4\uFF01 \ No newline at end of file +apl.adjustPrice.M00002=\u6267\u884C\u5931\u8D25\uFF0C\u6539\u4EF7\u5355\u4E2D\u6709\u6B63\u5728\u5BA1\u6838\u4E2D\u7684\u8D27\u54C1\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u65B0\u63D0\u4EA4\uFF01 +apl.yb.M00001={0} catalog does not exist, please contact administrator diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/i18n/messages_zh_CN.properties b/healthlink-his-server/healthlink-his-application/src/main/resources/i18n/messages_zh_CN.properties index 67955d33e..27ac5d383 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/i18n/messages_zh_CN.properties +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/i18n/messages_zh_CN.properties @@ -52,4 +52,5 @@ apl.payment.M00007=\u672A\u67E5\u8BE2\u5230\u6536\u8D39\u9879\u76EE apl.payment.M00008=\u672A\u67E5\u8BE2\u5230{0}\u8D26\u6237\u4FE1\u606F apl.payment.M00009=\u672A\u67E5\u8BE2\u5230\u6536\u8D39\u9879\u76EE\uFF0C\u4E0D\u9700\u8981\u8F6C\u6362\u8D26\u6237 apl.adjustPrice.M00001=\u6267\u884C\u5931\u8D25\uFF0C\u672A\u52A0\u8F7D\u5230\u4EFB\u4F55\u6570\u636E\uFF01 -apl.adjustPrice.M00002=\u6267\u884C\u5931\u8D25\uFF0C\u6539\u4EF7\u5355\u4E2D\u6709\u6B63\u5728\u5BA1\u6838\u4E2D\u7684\u8D27\u54C1\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u65B0\u63D0\u4EA4\uFF01 \ No newline at end of file +apl.adjustPrice.M00002=\u6267\u884C\u5931\u8D25\uFF0C\u6539\u4EF7\u5355\u4E2D\u6709\u6B63\u5728\u5BA1\u6838\u4E2D\u7684\u8D27\u54C1\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u65B0\u63D0\u4EA4\uFF01 +apl.yb.M00001={0}\u76EE\u5F55\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml index 441bba15e..158fff3e4 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml @@ -217,11 +217,20 @@ WHERE T1.delete_flag = '0' AND T1.class_enum = #{classEnum} AND T10.context_enum = #{register} - AND (#{registerTimeSTime} IS NULL OR T1.create_time >= CAST(#{registerTimeSTime} AS TIMESTAMP)) - AND (#{registerTimeETime} IS NULL OR T1.create_time <= CAST(#{registerTimeETime} AS TIMESTAMP)) - AND (#{statusFilter} IS NULL - OR (#{statusFilter} >= 0 AND T1.status_enum = #{statusFilter}) - OR (#{statusFilter} = -1 AND T1.status_enum != 6)) + + AND T1.create_time >= CAST(#{registerTimeSTime} AS TIMESTAMP) + + + AND T1.create_time <= CAST(#{registerTimeETime} AS TIMESTAMP) + + + + AND T1.status_enum = #{statusFilter} + + + AND T1.status_enum != 6 + + ) AS T9 ${ew.customSqlSegment} ORDER BY T9.register_time DESC diff --git a/healthlink-his-server/healthlink-his-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml b/healthlink-his-server/healthlink-his-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml index e274884cf..5833e4b30 100755 --- a/healthlink-his-server/healthlink-his-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml +++ b/healthlink-his-server/healthlink-his-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml @@ -24,6 +24,7 @@ AND account.contract_no = #{contractNo} GROUP BY payment.ID, - account.ID + account.ID, + account.contract_no \ No newline at end of file diff --git a/healthlink-his-ui/src/api/consultation/request.js b/healthlink-his-ui/src/api/consultation/request.js index 10a487385..12369ae49 100755 --- a/healthlink-his-ui/src/api/consultation/request.js +++ b/healthlink-his-ui/src/api/consultation/request.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询会诊申请列表 export function listRequest(query) { return request({ - url: '/consultation/request/list', + url: '/consultation/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listRequest(query) { // 查询会诊申请详细 export function getRequest(id) { return request({ - url: '/consultation/request/' + id, + url: '/consultation/detail/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getRequest(id) { // 新增会诊申请 export function addRequest(data) { return request({ - url: '/consultation/request', + url: '/consultation/save', method: 'post', data: data }) @@ -29,8 +29,8 @@ export function addRequest(data) { // 修改会诊申请 export function updateRequest(data) { return request({ - url: '/consultation/request', - method: 'put', + url: '/consultation/save', + method: 'post', data: data }) } @@ -38,48 +38,48 @@ export function updateRequest(data) { // 删除会诊申请 export function delRequest(id) { return request({ - url: '/consultation/request/' + id, - method: 'delete' + url: '/consultation/cancel/' + id, + method: 'post' }) } // 提交会诊申请 export function submitRequest(id) { return request({ - url: '/consultation/request/submit/' + id, - method: 'put' + url: '/consultation/submit/' + id, + method: 'post' }) } // 取消提交会诊申请 export function cancelSubmitRequest(id) { return request({ - url: '/consultation/request/cancelSubmit/' + id, - method: 'put' + url: '/consultation/cancel/' + id, + method: 'post' }) } // 结束会诊申请 export function endRequest(id) { return request({ - url: '/consultation/request/end/' + id, - method: 'put' + url: '/consultation/complete/' + id, + method: 'post' }) } // 作废会诊申请 export function cancelRequest(id) { return request({ - url: '/consultation/request/cancel/' + id, - method: 'put' + url: '/consultation/cancel/' + id, + method: 'post' }) } // 确认会诊 export function confirmRequest(data) { return request({ - url: '/consultation/request/confirm', - method: 'put', + url: '/consultation/confirmation/confirm', + method: 'post', data: data }) } @@ -87,8 +87,8 @@ export function confirmRequest(data) { // 签名会诊 export function signRequest(data) { return request({ - url: '/consultation/request/sign', - method: 'put', - data: data + url: '/consultation/confirmation/sign', + method: 'post', + params: { consultationId: data.consultationId } }) } \ No newline at end of file diff --git a/healthlink-his-ui/src/api/techStation.js b/healthlink-his-ui/src/api/techStation.js index 2fd4ce7f0..ae9417c9c 100644 --- a/healthlink-his-ui/src/api/techStation.js +++ b/healthlink-his-ui/src/api/techStation.js @@ -10,16 +10,16 @@ export function executeExamOrder(data) { return request({ url: "/tech-station/ex export function executeLabOrder(data) { return request({ url: "/tech-station/execute/lab", method: "post", data }) } // 查询退费审批列表 -export function listRefundApproveOrders(params) { return request({ url: "/tech-station/refund/approve/list", method: "get", params }) } +export function listRefundApproveOrders(params) { return request({ url: "/tech-station/refund-approve/list", method: "get", params }) } // 审批通过检查退费 -export function approveExamRefund(data) { return request({ url: "/tech-station/refund/approve/exam", method: "post", data }) } +export function approveExamRefund(data) { return request({ url: "/tech-station/refund-approve/approve/exam/" + data.applyNo, method: "put", data }) } // 审批驳回检查退费 -export function rejectExamRefund(data) { return request({ url: "/tech-station/refund/reject/exam", method: "post", data }) } +export function rejectExamRefund(data) { return request({ url: "/tech-station/refund-approve/reject/exam/" + data.applyNo, method: "put", data }) } // 审批通过检验退费 -export function approveLabRefund(data) { return request({ url: "/tech-station/refund/approve/lab", method: "post", data }) } +export function approveLabRefund(data) { return request({ url: "/tech-station/refund-approve/approve/lab/" + data.applyNo, method: "put", data }) } // 审批驳回检验退费 -export function rejectLabRefund(data) { return request({ url: "/tech-station/refund/reject/lab", method: "post", data }) } +export function rejectLabRefund(data) { return request({ url: "/tech-station/refund-approve/reject/lab/" + data.applyNo, method: "put", data }) } diff --git a/healthlink-his-ui/src/views/doctorstation/pendingEmr.vue b/healthlink-his-ui/src/views/doctorstation/pendingEmr.vue index 05ae2584a..0a4fed117 100755 --- a/healthlink-his-ui/src/views/doctorstation/pendingEmr.vue +++ b/healthlink-his-ui/src/views/doctorstation/pendingEmr.vue @@ -1,4 +1,4 @@ -