bug515 [住院医生站-临床医嘱] 点击“签发”检验医嘱后系统陷入死循环，Loading无法消失 后端advice_type映射错误

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,

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) => {
+    let list = [];
-      const parsedContent = JSON.parse(item.contentJson);
+    try {
-      return {
+      list = saveList.map((item) => {
-        ...parsedContent,
+        const parsedContent = item.contentJson ? JSON.parse(item.contentJson) || {} : {};
-        adviceType: item.adviceType,
+        return {
-        requestId: item.requestId,
+          ...parsedContent,
-        dbOpType: '1',
+          adviceType: item.adviceType,
-        groupId: item.groupId,
+          requestId: item.requestId,
-        uniqueKey: undefined,
+          dbOpType: '1',
-        // 确保 therapyEnum 被正确传递
+          groupId: item.groupId,
-        therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
+          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('签发处方参数：', {