doctor

src/components/doctorCheck/CheckItemList.vue

@@ -6,17 +6,11 @@
       <el-table-column prop="result" label="结果" min-width="200">
         <template slot-scope="scope">
           <div style="display: flex;">
-            <el-input v-if="scope.row.lineModeFlag == '0'" style="width: 100%;" v-model="scope.row.result"
-              placeholder="请输入结果值" @select="handleSelect" :disabled="rowResultDisabled(scope.row)"
-              :data-lineModeFlag="scope.row.lineModeFlag" size="small"
-              @input="madeTooltips(scope.$index); computeFun(scope.$index)" v-bind:class="scope.row.class">
-            </el-input>
-            <el-input v-else style="width: 100%;" type="textarea" v-model="scope.row.result" placeholder="请输入结果值"
-              @select="handleSelect" :disabled="rowResultDisabled(scope.row)" :autosize="{ minRows: 2, maxRows: 10 }"
+            <el-autocomplete style="width: 100%;" type="textarea" v-model="scope.row.result" placeholder="请输入结果值"
+              :disabled="rowResultDisabled(scope.row)" :autosize="{ minRows: 1, maxRows: 10 }" :trigger-on-focus="false" :fetch-suggestions="querySearch"
               :data-lineModeFlag="scope.row.lineModeFlag" @input="madeTooltips(scope.$index); computeFun(scope.$index)"
               v-bind:class="scope.row.class">
-            </el-input>
-
+            </el-autocomplete>
             <el-button type="danger" style="min-width:23px;padding:2px;" icon="el-icon-caret-bottom"
               @click="btnMoreResult(scope.row, scope.$index)" :disabled="rowResultDisabled(scope.row)"
               size="small"></el-button>
@@ -41,10 +35,10 @@
               </el-tag>
             </div>
           </div>
-          <div>特殊符号：</div> 
+          <div>特殊符号：</div>
           <div style="overflow-y:auto; width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
             <div v-for="item in symbols" :key="item.id" style="margin: 1px; 2px;cursor:pointer;"
-              @click="insertSymbols(item.displayName)" >
+              @click="insertSymbols(item.displayName)">
               <el-tag style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 15px;">
                 {{ item.displayName }}
               </el-tag>
@@ -105,7 +99,7 @@ export default {
       selection: { // 光标位置
         start: 0, end: 0
       },
-      symbols:[], //特殊符号
+      symbols: [], //特殊符号
 
     };
   },
@@ -159,11 +153,11 @@ export default {
       })
 
       //获取结果状态提示数据
-      postapi('/api/app/CommonChar/GetCommonCharList',{}).then(res => {
-        if(res.code >= 0){
+      postapi('/api/app/CommonChar/GetCommonCharList', {}).then(res => {
+        if (res.code >= 0) {
           this.symbols = res.data
         }
-      })      
+      })
     },
 
     // 颜色转换
@@ -285,7 +279,7 @@ export default {
     //项目列为计算函数
     computeFun(index) {
       // 有计算项的，才调用计算函数
-      let  haveComputeFun = false      
+      let haveComputeFun = false
       let checkItem = this.doctorCheck.checkItemList[index]
       console.log('checkItem', checkItem)
       let body = {
@@ -298,9 +292,9 @@ export default {
           itemId: e.itemId,
           result: e.result
         })
-        if(e.isCalculationItem == 'Y') haveComputeFun = true
+        if (e.isCalculationItem == 'Y') haveComputeFun = true
       });
-      if(!haveComputeFun) return  // 有计算项的，才调用计算函数
+      if (!haveComputeFun) return  // 有计算项的，才调用计算函数
       let lfind = -1
       postapi('/api/app/diagnosisfunction/getcalculationfunctionresult', body).then(res => {
         if (res.code != -1) {
@@ -398,7 +392,7 @@ export default {
     },
 
     querySearch(queryString, cb) {
-      var restaurants = deepCopy(this.restaurants); //[{ value: '阴性' },{ value: '阳性' }]
+      var restaurants = []; //不需要字典库显示  deepCopy(this.restaurants) [{ value: '阴性' },{ value: '阳性' }]
       restaurants.forEach((item) => {
         return (item.value = item.result);
       });
@@ -463,11 +457,11 @@ export default {
     },
 
     // 光标位置插入特殊符号
-    insertSymbols(symbols){
-      let result = this.moreResult.result||''
-      if(result){
-        result = result.substring(0,this.selection.start) + symbols + result.substring(this.selection.end)
-      }else{
+    insertSymbols(symbols) {
+      let result = this.moreResult.result || ''
+      if (result) {
+        result = result.substring(0, this.selection.start) + symbols + result.substring(this.selection.end)
+      } else {
         result = symbols
       }
       this.moreResult.result = result

src/components/doctorCheck/CheckSumSug.vue

@@ -25,7 +25,7 @@
         </el-table>
       </div>
       <div
-        :style="`display: flex;position: absolute; top:${window.pageHeight - sumHeight - 38}px;right:${sumWidth + 125}px;z-index: 3000;`">
+        :style="`display: flex;position: absolute; top:${window.pageHeight - sumHeight - 38}px;right:${sumWidth + 125}px;z-index: 1;`">
         <div v-show="checkPagePriv(pagePriv.privs, '生成小结')">
           <el-button type="primary" class="btnClass" @click="btnMakeDiagnosis"
             :disabled="doctorBtnDisabled('btnMakeDiagnosis')">生成小结</el-button>
@@ -47,7 +47,7 @@
         </div>
       </div>
       <div
-        :style="`display: flex;position: absolute; top:${window.pageHeight - sumHeight - 38}px;right:125px;z-index: 3000;`">
+        :style="`display: flex;position: absolute; top:${window.pageHeight - sumHeight - 38}px;right:125px;z-index: 1;`">
         <div v-show="checkPagePriv(pagePriv.privs, '新增建议')">
           <el-button type="primary" class="btnClass" @click="addSuggestion"
             :disabled="doctorBtnDisabled('addSuggestion')">新增建议</el-button>

src/components/sumDoctorCheck/SumPREdit.vue

@@ -1,6 +1,14 @@
 <template>
   <div style="display: flex;height:32px;margin-top: 2px;">
     <div style="display: flex; flex-wrap: wrap;height:32px; width: 100%">
+      <div>
+        <span class="query">体检结论</span>
+        <el-select v-model="dataTransOpts.tableS.patient_register.medicalConclusionId" filterable clearable
+          :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" placeholder="请选择" style="width: 80px"
+          size="small">
+          <el-option v-for="item in medicalConclusion" :key="item.id" :label="item.displayName" :value="item.id" />
+        </el-select>
+      </div>
       <div>
         <span class="query">总检医生</span>
         <el-select v-model="dataTransOpts.tableS.patient_register.summaryDoctorId" filterable clearable
@@ -48,7 +56,7 @@ export default {
   data() {
     return {
       users: [],
-
+      medicalConclusion:[],
     };
   },
 
@@ -65,12 +73,22 @@ export default {
   methods: {
     // 初始化字典数据
     dictInit() {
+      // 获取用户信息
       getapi('/api/identity/users/getlist')
         .then(res => {
           if (res.code != -1) {
             this.users = res.data.items
           }
         })
+      
+      // 获取体检结论信息
+      getapi('/api/app/medical-conclusion/in-type')
+        .then(res => {
+          if (res.code != -1) {
+            this.medicalConclusion = res.data.items
+          }
+        })
+      
     },
 
   },

src/components/sumDoctorCheck/SumSug.vue

@@ -327,7 +327,8 @@ export default {
                 await this.$confirm('检测到该人员已经生成过总检信息。', '确认信息', {
                   distinguishCancelAndClose: true,
                   confirmButtonText: '重新生成总检信息',
-                  cancelButtonText: '获取上次总检信息'
+                  cancelButtonText: '获取上次总检信息',
+                  showClose:false
                 })
                 isGetExistData = 'N'
               } catch (error) {