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

645 【住院管理-住院医生工作站】临床医嘱中的新增一条医嘱，请选择项目没有数据回显

Browse Source 
615 【住院医生工作站-临床医嘱】录入“临时”医嘱时，【用药频次】字段被置灰锁死为“立即”且无法更改
577 [住院医生工作站-检验] 检验申请单项目列表中的单价/使用单位展示异常，单位回显为字典数字ID（如 6, 16）而非中文名称
This commit is contained in:
wangjian963
2026-06-02 16:35:38 +08:00
parent 899cbc0b71
commit 5df2d8a049
7 changed files with 641 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java
View File

@@ -2,6 +2,7 @@ package com.openhis.web.doctorstation.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -40,7 +41,8 @@ public class SurgeryItemDto {
/** 单位编码 */
private String unitCode;
/** 单位编码字典文本（前端用于显示单位） */
/** 单位编码字典文本（前端用于显示单位，输出为 unitCode_dictText 以下划线格式匹配前端） */
@JsonProperty("unitCode_dictText")
private String unitCodeDictText;
/** 所需标本编码（来自诊疗目录配置，对应字典 specimen_code 的 dictValue） */

12
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
View File

@@ -894,13 +894,17 @@
t2.ID AS charge_item_definition_id,
t2.price AS price,
t1.permitted_unit_code AS unit_code,
t1.permitted_unit_code AS unit_code_dict_text
COALESCE(sdd.dict_label, t1.permitted_unit_code) AS unit_code_dict_text
FROM wor_activity_definition t1
LEFT JOIN adm_charge_item_definition t2
ON t2.instance_id = t1.ID
AND t2.delete_flag = '0'
AND t2.status_enum = #{statusEnum}
AND t2.instance_table = 'wor_activity_definition'
LEFT JOIN sys_dict_data sdd
ON sdd.dict_value = t1.permitted_unit_code
AND sdd.dict_type = 'unit_code'
AND sdd.status = '0'
WHERE t1.delete_flag = '0'
AND (t1.category_code = '手术' OR t1.category_code = '24')
<if test="searchKey != null and searchKey != ''">
@@ -920,7 +924,7 @@
t2.ID AS charge_item_definition_id,
t2.price AS price,
t1.permitted_unit_code AS unit_code,
t1.permitted_unit_code AS unit_code_dict_text,
COALESCE(sdd.dict_label, t1.permitted_unit_code) AS unit_code_dict_text,
t1.specimen_code AS specimen_code
FROM wor_activity_definition t1
LEFT JOIN adm_charge_item_definition t2
@@ -931,6 +935,10 @@
LEFT JOIN adm_organization t3
ON t3.id = t1.org_id
AND t3.delete_flag = '0'
LEFT JOIN sys_dict_data sdd
ON sdd.dict_value = t1.permitted_unit_code
AND sdd.dict_type = 'unit_code'
AND sdd.status = '0'
WHERE t1.delete_flag = '0'
AND t1.category_code = #{categoryCode}
<if test="searchKey != null and searchKey != ''">