diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
index e6b683115..501aa0ce3 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -46,6 +46,11 @@
                   </el-button>
                 </template>
                 <el-popconfirm
+                  v-if="
+                    node.level === 2 &&
+                      node.parent.data.name != '常用' &&
+                      node.parent.data.name != '历史'
+                  "
                   width="200"
                   :hide-after="10"
                   title="确认删除此常用诊断吗"
@@ -54,11 +59,6 @@
                 >
                   <template #reference>
                     <el-button
-                      v-if="
-                        node.level === 2 &&
-                          node.parent.data.name != '常用' &&
-                          node.parent.data.name != '历史'
-                      "
                       style="color: #000000"
                       type="text"
                       size="small"
@@ -404,7 +404,7 @@ function getList() {
           ...item,
         };
         if (obj.diagSrtNo == null) {
-          obj.diagSrtNo = '1';
+          obj.diagSrtNo = 1;
         }
         return obj;
       });
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
index 9c541a2e2..0f86fb7f1 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -255,7 +255,7 @@
             <el-tag v-else-if="scope.row.statusEnum == 10" type="primary">已校对</el-tag>
             <el-tag v-else-if="scope.row.statusEnum == 11" type="primary">待接收</el-tag>
             <el-tag v-else-if="scope.row.statusEnum == 3" type="success">已完成</el-tag>
-            <el-tag v-else-if="scope.row.statusEnum == 6" type="error">停止</el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 6" type="danger">停止</el-tag>
             <el-tag v-else type="info">{{ scope.row.chargeStatus_enumText }}</el-tag>
           </template>
         </el-table-column>
@@ -489,6 +489,9 @@ const unitMap = ref({
 const buttonDisabled = computed(() => {
   return !patientInfo.value;
 });
+const isSaveDisabled = computed(() => {
+  return !patientInfo.value || prescriptionList.value.length === 0;
+});
 const props = defineProps({
   patientInfo: {
     type: Object,
@@ -676,7 +679,6 @@ function getListInfo(addNewRow) {
     organization.value = res?.data?.records ?? res?.data ?? [];
   });
   getPrescriptionList(patientInfo.value.encounterId).then((res) => {
-    console.log('getListInfo==========>', JSON.stringify(res.data));
     // 等待科室树加载完成后再处理处方数据，确保 resolveOrgId 能正确匹配
     orgTreePromise.then(() => {
       loadingInstance.close();
@@ -684,7 +686,6 @@ function getListInfo(addNewRow) {
         .map((item) => {
           const parsedContent = JSON.parse(item.contentJson);
           // 构造 unitCodeList，确保编辑时下拉框有正确的选项
-          console.log('【DEBUG】unitCode:', parsedContent?.unitCode, typeof parsedContent?.unitCode, 'unitCodeList:', JSON.stringify(parsedContent?.unitCodeList));
           const unitCodeListData = parsedContent?.unitCodeList || [
             { value: String(parsedContent?.unitCode ?? item.unitCode ?? ''), label: parsedContent?.unitCode_dictText ?? item.unitCode_dictText ?? '', type: 'unit' },
             { value: String(parsedContent?.doseUnitCode ?? ''), label: parsedContent?.doseUnitCode_dictText ?? '', type: 'dose' },