提交merge1.3

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

@@ -101,9 +101,9 @@
               >
                 <el-option
                   v-for="item in diagnosisListOption"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
+                  :key="item.definitionId"
+                  :label="item.name + '--' + item.ybNo"
+                  :value="item.definitionId"
                 />
               </el-select>
             </el-form-item>
@@ -432,7 +432,7 @@ import { computed, onMounted, ref } from 'vue';
 import { reactive } from 'vue';
 // import { useModal, useDict } from '@/hooks';
 import { parseTime, formatNumber } from '@/utils/his';
-import { queryYbCatalogue, getDiagnosisList } from './api';
+import { queryYbCatalogue, getDiagnosisListEle } from './api';
 import { debounce } from 'lodash-es';
 
 import {
@@ -565,7 +565,7 @@ const unitMap = ref({
 
 function getInit(searchKey) {
   if(searchKey) {
-      getDiagnosisList(searchKey).then(res => {
+      getDiagnosisListEle(searchKey,infoForm.encounterId).then(res => {
         diagnosisListOption.value = res.data
       })
   }