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

# Conflicts:
#	openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

@@ -36,23 +36,26 @@
                     </el-icon>
                   </el-button>
                 </template>
-                <template v-if="node.level === 2 && node.parent.data.name != '常用' && node.parent.data.name != '历史'">
-                  <el-popconfirm width="200" :hide-after="10" title="确认删除此常用诊断吗" placement="top-start"
-                    @confirm="deleteChild(data)">
-                    <template #reference>
-                      <el-button
-                        style="color: #000000"
-                        type="text"
-                        size="small"
-                        @click.stop=""
-                      >
-                        <el-icon>
-                          <Minus />
-                        </el-icon>
-                      </el-button>
-                    </template>
-                  </el-popconfirm>
-                </template>
+                <el-popconfirm width="200" :hide-after="10" title="确认删除此常用诊断吗" placement="top-start"
+                  @confirm="deleteChild(data)">
+                  <template #reference>
+                    <el-button
+                      style="color: #000000"
+                      v-if="
+                        node.level === 2 &&
+                        node.parent.data.name != '常用' &&
+                        node.parent.data.name != '历史'
+                      "
+                      type="text"
+                      size="small"
+                      @click.stop=""
+                    >
+                      <el-icon>
+                        <Minus />
+                      </el-icon>
+                    </el-button>
+                  </template>
+                </el-popconfirm>
               </span>
             </div>
           </template>
@@ -95,15 +98,14 @@
             <el-table-column label="诊断类型" align="center" prop="medTypeCode" width="180">
               <template #default="scope">
                 <el-form-item :prop="`diagnosisList.${scope.$index}.medTypeCode`" :rules="rules.medTypeCode">
-                  <el-select v-model="scope.row.medTypeCode" placeholder="请选择" style="width: 150px" v-if="diag_type && diag_type.length > 0">
+                  <el-select v-model="scope.row.medTypeCode" placeholder=" " style="width: 150px">
                     <el-option
-                      v-for="item in diag_type"
+                      v-for="item in med_type"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
                     />
                   </el-select>
-                  <span v-else style="color: #909399;">加载中...</span>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -290,7 +292,7 @@ const props = defineProps({
 const emits = defineEmits(['diagnosisSave']);
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
-const { diag_type } = proxy.useDict('diag_type');
+const { med_type } = proxy.useDict('med_type');
 const { diagnosis_classification } = proxy.useDict('diagnosis_classification');
 const { long_term_flag } = proxy.useDict('long_term_flag');
 
@@ -505,7 +507,7 @@ function handleAddDiagnosis() {
         showPopover: false,
         name: undefined,
         verificationStatusEnum: 4,
-        medTypeCode: undefined,  // 新增时不设默认值，让用户选择
+        medTypeCode: '11',
         diagSrtNo: maxSortNo + 1,
         iptDiseTypeCode: 2,
         diagnosisDesc: '',
@@ -576,13 +578,6 @@ function handleMaindise(value, index) {
 function handleSaveDiagnosis() {
   proxy.$refs.formRef.validate((valid) => {
     if (valid) {
-      // 验证诊断类型是否已选择
-      const emptyMedType = form.value.diagnosisList.find(d => !d.medTypeCode);
-      if (emptyMedType) {
-        proxy.$modal.msgWarning('请选择诊断类型');
-        return false;
-      }
-
       if (form.value.diagnosisList.length == 0) {
         proxy.$modal.msgWarning('诊断不能为空');
         return false;
@@ -723,7 +718,7 @@ form.value.diagnosisList.push({
     ybNo: data.ybNo,
     name: data.name,
     verificationStatusEnum: 4,
-    medTypeCode: undefined,  // 新增时不设默认值，让用户选择
+    medTypeCode: '11',
     diagSrtNo: maxSortNo + 1,
     definitionId: data.definitionId,
     classification: '西医', // 默认为西医