提交merge1.3

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

@@ -150,12 +150,12 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="入院诊断" prop="diagnosisDefinitionId">
-            <el-select
+            <!-- <el-select
               v-model="submitForm.diagnosisDefinitionId"
               placeholder="诊断"
               clearable
               filterable
-              remote
+              remote 
               :remote-method="getDiagnosisInfo"
               style="width: 400px"
             >
@@ -166,7 +166,10 @@
                 :value="item.id"
                 @click="handleDiagnosisChange(item)"
               />
-            </el-select>
+            </el-select> -->
+            <el-input v-model="props.mainDiagnosis.name" disabled style="width: 400px" />
+            <!-- 隐藏存储ID的字段 -->
+            <input type="hidden" v-model="submitForm.diagnosisDefinitionId" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -179,7 +182,7 @@
     </template>
   </el-dialog>
 </template>
-  
+
 <script setup>
 import {
   getInit,
@@ -206,6 +209,7 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  mainDiagnosis: { type: Object, default: null },
 });
 const emit = defineEmits(['close']);
 
@@ -244,9 +248,17 @@ const rules = reactive({
 });
 
 function openDialog() {
+  console.log('orgId==========>', props.patientInfo.orgId);
   getOrgList().then((res) => {
-    organization.value = res.data.records;
+    // organization.value = res.data.records;
+    organization.value = res.data.records[0].children.filter(
+      (record) => record.typeEnum === 2 && record.classEnum === 2
+    );
+    console.log('organization==========>', organization.value);
+    submitForm.inHospitalOrgId =
+      organization.value.find((item) => item.id === props.patientInfo.orgId)?.id || '';
   });
+
   // wardList().then((res) => {
   //   wardListOptions.value = res.data;
   // });
@@ -256,6 +268,14 @@ function openDialog() {
   });
   console.log(props.patientInfo, 'patientInfo');
   getDiagnosisInfo(undefined);
+  console.log(props.mainDiagnosis, 'mainDiagnosis');
+  if (props.mainDiagnosis) {
+    submitForm.diagnosisDefinitionId = props.mainDiagnosis.definitionId;
+    diagnosisDefinitionId = props.mainDiagnosis.definitionId;
+    diagnosisYbNo = props.mainDiagnosis.ybNo || '';
+    submitForm.medTypeCode = props.mainDiagnosis.medTypeCode;
+    diagnosisDefinitionList.value = [props.mainDiagnosis];
+  }
 }
 
 function getDiagnosisInfo(value) {
@@ -333,4 +353,4 @@ function close() {
 .patInfo-value {
   width: 100px;
 }
-</style>
+</style>