diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
index b0b74b1d0..bb498a019 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
@@ -179,11 +179,14 @@
-
-
- {{ transformField(key, value) || '-' }}
-
-
+
+ {{ transformField(key, descJsonData[key]) || '-' }}
+
@@ -511,6 +514,13 @@ const hasMatchedFields = computed(() => {
return Object.keys(descJsonData.value).some((key) => isFieldMatched(key));
});
+// Ordered field keys for detail display and print, matching the bug requirement order
+const orderedDescFieldKeys = [
+ 'targetDepartment', 'urgencyLevel', 'allergyHistory', 'examinationPurpose',
+ 'expectedExaminationTime', 'medicalHistorySummary', 'symptom', 'sign',
+ 'clinicalDiagnosis', 'otherDiagnosis', 'relatedResult', 'attention',
+];
+
/** 查询科室 */
const getLocationInfo = async () => {
try {
@@ -679,15 +689,16 @@ const handlePrint = async (row) => {
}
// 构建 descJson 字段行(与详情弹窗展示的字段一致)
- const fieldKeys = ['targetDepartment', 'symptom', 'sign', 'clinicalDiagnosis', 'otherDiagnosis', 'relatedResult', 'attention'];
+ const fieldKeys = orderedDescFieldKeys;
let descFieldsHtml = '';
fieldKeys.forEach((key) => {
const label = labelMap[key] || key;
- if (descData[key] != null && descData[key] !== '') {
+ const value = transformField(key, descData[key]);
+ if (descData[key] != null && descData[key] !== '' && value != null && value !== '') {
descFieldsHtml += `
${label}:
- ${descData[key]}
+ ${value}
`;
}
});