Fix Bug #476: 检查申请单详情界面缺失紧急程度、过敏史、检查目的等核心字段

在 examineApplication.vue 的 labelMap 中补充 urgencyLevel、allergyHistory、
examinationPurpose、expectedExaminationTime、medicalHistorySummary、allergyConfirmed
共6个缺失字段的中文标签映射，并新增 transformField 函数将 urgencyLevel 的
emergency/routine 转换为"急诊"/"普通"显示。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java

@@ -163,7 +163,7 @@ public class RequestFormManageController {
             @RequestParam(required = false) Long applyDeptId,
             @RequestParam(defaultValue = "1") Integer pageNo,
             @RequestParam(defaultValue = "10") Integer pageSize) {
-        RequestFormDto dto = new RequestFormDto(surgeryNo, null, applyTimeStart, applyTimeEnd,
+        RequestFormDto dto = new RequestFormDto(surgeryNo, ActivityDefCategory.PROCEDURE.getCode(), applyTimeStart, applyTimeEnd,
                 mainDoctorId, applyDeptId, pageNo, pageSize);
         return R.ok(iRequestFormManageAppService.getRequestFormPage(dto));
     }

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml

@@ -288,7 +288,7 @@
         AND T1.refund_device_id IS NULL
         ORDER BY T1.status_enum)
         UNION ALL
-        (SELECT CASE WHEN T1.category_enum = 4 THEN 6 ELSE COALESCE(T1.category_enum, 3) END AS advice_type,
+        (SELECT CASE WHEN T1.category_enum = 4 THEN 6 ELSE 3 END AS advice_type,
         T1.id AS request_id,
         T1.id || '-3' AS unique_key,
         T1.requester_id AS requester_id,
@@ -373,4 +373,4 @@
         </if>
     </select>
 
-</mapper>
+</mapper>

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue

@@ -137,7 +137,7 @@
           <el-descriptions title="申请单描述" :column="2">
             <template v-for="(value, key) in descJsonData" :key="key">
               <el-descriptions-item v-if="isFieldMatched(key)" :label="getFieldLabel(key)">
-                {{ value || '-' }}
+                {{ transformField(key, value) || '-' }}
               </el-descriptions-item>
             </template>
           </el-descriptions>
@@ -270,6 +270,12 @@ const parseStatus = (status) => {
 const labelMap = {
   categoryType: '项目类别',
   targetDepartment: '发往科室',
+  urgencyLevel: '紧急程度',
+  allergyHistory: '过敏史',
+  examinationPurpose: '检查目的',
+  expectedExaminationTime: '期望检查时间',
+  medicalHistorySummary: '病史摘要',
+  allergyConfirmed: '过敏确认',
   symptom: '症状',
   sign: '体征',
   clinicalDiagnosis: '临床诊断',
@@ -278,6 +284,17 @@ const labelMap = {
   attention: '注意事项',
 };
 
+// Fields that need value transformation before display
+const transformField = (key, value) => {
+  if (key === 'urgencyLevel') {
+    return value === 'emergency' ? '急诊' : '普通';
+  }
+  if (key === 'allergyConfirmed') {
+    return value === true || value === 'true' ? '已口头确认' : '未确认';
+  }
+  return value;
+};
+
 const isFieldMatched = (key) => {
   return key in labelMap;
 };

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue

@@ -1181,19 +1181,27 @@ function handleSave() {
     });
     // 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
     loading.value = true;
-    let list = saveList.map((item) => {
-      const parsedContent = JSON.parse(item.contentJson);
-      return {
-        ...parsedContent,
-        adviceType: item.adviceType,
-        requestId: item.requestId,
-        dbOpType: '1',
-        groupId: item.groupId,
-        uniqueKey: undefined,
-        // 确保 therapyEnum 被正确传递
-        therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
-      };
-    });
+    let list = [];
+    try {
+      list = saveList.map((item) => {
+        const parsedContent = item.contentJson ? JSON.parse(item.contentJson) || {} : {};
+        return {
+          ...parsedContent,
+          adviceType: item.adviceType,
+          requestId: item.requestId,
+          dbOpType: '1',
+          groupId: item.groupId,
+          uniqueKey: undefined,
+          // 确保 therapyEnum 被正确传递
+          therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
+        };
+      });
+    } catch (error) {
+      loading.value = false;
+      isSaving.value = false;
+      proxy.$modal.msgError('医嘱内容解析失败，请检查待签发医嘱');
+      return;
+    }
     // 保存签发按钮
     isSaving.value = true;
     console.log('签发处方参数：', {

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue

@@ -302,6 +302,29 @@ function getSelectRows() {
   });
   return list;
 }
+
+function getTableRef(index) {
+  return proxy.$refs['tableRef' + index]?.[0];
+}
+
+function selectAllRows() {
+  prescriptionList.value.forEach((item, index) => {
+    const tableRef = getTableRef(index);
+    if (!tableRef) {
+      return;
+    }
+    item.forEach((row) => {
+      tableRef.toggleRowSelection(row, true);
+    });
+  });
+}
+
+function clearSelection() {
+  prescriptionList.value.forEach((item, index) => {
+    getTableRef(index)?.clearSelection();
+  });
+}
+
 function handleRateChange(value, item, row) {
   // 拼接当前选中时间
   if (value) {
@@ -319,6 +342,8 @@ function handleRateChange(value, item, row) {
 defineExpose({
   handleGetPrescription,
   handleMedicineSummary,
+  selectAllRows,
+  clearSelection,
 });
 </script>
 

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue

@@ -69,7 +69,11 @@
         </div>
         <div>
           <span class="descriptions-item-label">全选：</span>
-          <el-switch v-model="chooseAll" @change="handelSwicthChange" />
+          <el-switch
+            v-model="chooseAll"
+            :disabled="isDetails != '1'"
+            @change="handelSwicthChange"
+          />
           <el-button class="ml20 mr20" type="primary" @click="handleExecute"> 汇总领药 </el-button>
         </div>
       </div>
@@ -160,24 +164,31 @@ function handleClick(tabName) {
 }
 
 function handleGetPrescription() {
-  prescriptionRefs.value.handleGetPrescription();
+  chooseAll.value = false;
+  prescriptionRefs.value?.handleGetPrescription();
 }
 
-function handelSwicthChange() {
-  if (chooseAll.value) {
-    proxy.$refs['prescriptionRefs'].selectAllRows();
+function handelSwicthChange(value) {
+  if (!prescriptionRefs.value) {
+    chooseAll.value = false;
+    return;
+  }
+  if (value) {
+    prescriptionRefs.value.selectAllRows();
   } else {
-    proxy.$refs['prescriptionRefs'].clearSelection();
+    prescriptionRefs.value.clearSelection();
   }
 }
 
 function handleRadioChange(value) {
+  chooseAll.value = false;
   if (value == '1') {
     handleGetPrescription();
   }
 }
 
 function handleTherapyChange() {
+  chooseAll.value = false;
   handleGetPrescription();
 }
 
@@ -216,4 +227,4 @@ provide('handleGetPrescription', (value) => {
 :deep(.el-tabs__header) {
   margin: 0;
 }
-</style>
+</style>