wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(ui): 修复多个功能模块的验证和数据处理问题

Browse Source 
- 在医生工作站退费功能中添加患者选择验证
- 统一药品管理中的仓库类型选择逻辑，移除重复代码
- 修复统计管理页面清空按钮的数据重置问题
- 修正西药管理页面处方打印按钮的功能绑定
- 完善库存报表查询的SQL过滤条件实现
- 更新多个控制器接口参数类型以支持业务流程
- 优化退费列表对话框的数据加载和错误处理
This commit is contained in:
chenqi
2026-03-02 23:27:11 +08:00
parent ce8b0b16b1
commit 9116ea4a84
22 changed files with 447 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.pharmacymanage.mapper.PendingMedicationDetailsMapper">
<select id="selectPendingMedicationDetailsPage"
<select id="selectPendingMedicationDetailsPage"
resultType="com.openhis.web.pharmacymanage.dto.PendingMedicationPageDto">
SELECT T7.medicine_no, --药品编码
T7.medicine_name, --药品名称
@@ -16,44 +16,44 @@
T7.create_time, --开单时间
T7.tenant_id --租户ID
FROM (
SELECT T1.bus_no AS medicine_no, --药品编码
T6."name" AS medicine_name, --药品名称
T6.py_str, --药品拼音
T1.quantity AS dispense_quantity, --待发药数量
T1.unit_code, --请求单位
T1.dispense_enum, --发药类型
T3."name" AS patient_name, --患者姓名
T4.prescription_no, --处方号
CASE
WHEN T2.class_enum = #{amb}
THEN T2.bus_no
ELSE '' END AS outpatient_no, --门诊号
CASE
WHEN T2.class_enum = #{imp}
THEN T2.bus_no
ELSE '' END AS admission_no, --住院号
T1.create_time, --开单时间
T1.tenant_id --租户ID
FROM med_medication_dispense AS T1
LEFT JOIN adm_encounter AS T2
ON T1.encounter_id = T2.id
AND T2.delete_flag = '0'
LEFT JOIN adm_patient AS T3
ON T1.patient_id = T3.id
AND T3.delete_flag = '0'
INNER JOIN med_medication_request AS T4
ON T1.med_req_id = T4.id
AND T4.delete_flag = '0'
LEFT JOIN med_medication_definition AS T6
ON T1.medication_id = T6.id
AND T6.delete_flag = '0'
LEFT JOIN med_medication AS T5
ON T5.medication_def_id = T6.id
AND T5.delete_flag = '0'
WHERE T1.delete_flag = '0'
AND T1.status_enum = #{inProgress}
ORDER BY T1.create_time DESC
) AS T7
SELECT T1.bus_no AS medicine_no, --药品编码
T6."name" AS medicine_name, --药品名称
T6.py_str, --药品拼音
T1.quantity AS dispense_quantity, --待发药数量
T1.unit_code, --请求单位
T1.dispense_enum, --发药类型
T3."name" AS patient_name, --患者姓名
T4.prescription_no, --处方号
CASE
WHEN T2.class_enum = #{amb}
THEN T2.bus_no
ELSE '' END AS outpatient_no, --门诊号
CASE
WHEN T2.class_enum = #{imp}
THEN T2.bus_no
ELSE '' END AS admission_no, --住院号
T1.create_time, --开单时间
T1.tenant_id --租户ID
FROM med_medication_dispense AS T1
LEFT JOIN adm_encounter AS T2
ON T1.encounter_id = T2.id
AND T2.delete_flag = '0'
LEFT JOIN adm_patient AS T3
ON T1.patient_id = T3.id
AND T3.delete_flag = '0'
INNER JOIN med_medication_request AS T4
ON T1.med_req_id = T4.id
AND T4.delete_flag = '0'
LEFT JOIN med_medication_definition AS T6
ON T1.medication_id = T6.id
AND T6.delete_flag = '0'
LEFT JOIN med_medication AS T5
ON T5.medication_def_id = T6.id
AND T5.delete_flag = '0'
WHERE T1.delete_flag = '0'
AND T1.status_enum IN (#{inProgress}, #{preparation}, #{prepared})
ORDER BY T1.create_time DESC
) AS T7
${ew.customSqlSegment}
</select>
</mapper>