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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
chenqi
2026-01-21 17:50:58 +08:00
parent 1c07108e58 34dd969cb4
commit c92ff38133
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
View File

@@ -116,8 +116,11 @@ public class DictAspect {
} }
private String queryDictLabel(String dictTable, String dictCode, String dictText, String dictValue) { private String queryDictLabel(String dictTable, String dictCode, String dictText, String dictValue) {
if (StringUtils.hasText(dictTable)) { if (!StringUtils.hasText(dictTable)) {
// 场景 1：查询指定表 // 场景 1：默认字典走DictUtils缓存
return DictUtils.getDictLabel(dictCode, dictValue);
} else {
// 场景 2：查询指定表
String sql = String.format("SELECT %s FROM %s WHERE %s::varchar = ? LIMIT 1", dictText, dictTable, dictCode); String sql = String.format("SELECT %s FROM %s WHERE %s::varchar = ? LIMIT 1", dictText, dictTable, dictCode);
try { try {
return jdbcTemplate.queryForObject(sql, String.class, dictValue); return jdbcTemplate.queryForObject(sql, String.class, dictValue);
@@ -125,9 +128,6 @@ public class DictAspect {
// 如果查询结果为空，返回 空字符串 // 如果查询结果为空，返回 空字符串
return ""; return "";
} }
} else {
// 场景 2：默认字典走DictUtils缓存
return DictUtils.getDictLabel(dictCode, dictValue);
} }
} }
} }

10
openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
View File

@@ -741,7 +741,7 @@
check-strictly check-strictly
default-expand-all default-expand-all
:ref="(el) => (inputRefs.orgId = el)" :ref="(el) => (inputRefs.orgId = el)"
@change="(value) => handleOrgChange(value, scope.$index)" @change="(value) => handleOrgChange(value, scope.$index, scope.row)"
placeholder="请选择执行科室" placeholder="请选择执行科室"
/> />
</el-form-item> </el-form-item>
@@ -1104,6 +1104,10 @@ const isAdding = ref(false);
const isSaving = ref(false); const isSaving = ref(false);
const prescriptionRef = ref(); const prescriptionRef = ref();
const expandOrder = ref([]); //目前的展开行 const expandOrder = ref([]); //目前的展开行
// 更新展开行的函数
const updateExpandOrder = (keys) => {
expandOrder.value = keys;
};
const stockList = ref([]); const stockList = ref([]);
const contractList = ref([]); const contractList = ref([]);
const conditionId = ref(''); const conditionId = ref('');
@@ -2261,7 +2265,7 @@ function handleSaveSign(row, index, prescriptionId) {
return; return;
} }
const formRefName = 'formRef_' + targetPrescriptionId + '_' + actualIndex; const formRefName = 'formRef' + actualIndex;
let formRef = proxy.$refs[formRefName]; let formRef = proxy.$refs[formRefName];
console.log('handleSaveSign - 查找表单引用:', formRefName, '是否找到:', !!formRef, '类型:', typeof formRef, 'formRef:', formRef); console.log('handleSaveSign - 查找表单引用:', formRefName, '是否找到:', !!formRef, '类型:', typeof formRef, 'formRef:', formRef);
@@ -2663,7 +2667,7 @@ const handleEnter = (currentProp, row, rowIndex, prescriptionId) => {
return; return;
} }
const formRefName = 'formRef_' + targetPrescriptionId + '_' + actualIndex; const formRefName = 'formRef' + actualIndex;
let formRef = proxy.$refs[formRefName]; let formRef = proxy.$refs[formRefName];
// 如果 formRef 是数组，取第一个元素 // 如果 formRef 是数组，取第一个元素