doctor

src/components/doctorCheck/CheckItemList.vue

@@ -159,9 +159,9 @@ export default {
       })
 
       //获取结果状态提示数据
-      getapi('/api/app/common-char/in-filter').then(res => {
+      postapi('/api/app/CommonChar/GetCommonCharList',{}).then(res => {
         if(res.code >= 0){
-          this.symbols = res.data.items
+          this.symbols = res.data
         }
       })      
     },
@@ -284,6 +284,8 @@ export default {
 
     //项目列为计算函数
     computeFun(index) {
+      // 有计算项的，才调用计算函数
+      let  haveComputeFun = false      
       let checkItem = this.doctorCheck.checkItemList[index]
       console.log('checkItem', checkItem)
       let body = {
@@ -296,7 +298,9 @@ export default {
           itemId: e.itemId,
           result: e.result
         })
+        if(e.isCalculationItem == 'Y') haveComputeFun = true
       });
+      if(!haveComputeFun) return  // 有计算项的，才调用计算函数
       let lfind = -1
       postapi('/api/app/diagnosisfunction/getcalculationfunctionresult', body).then(res => {
         if (res.code != -1) {

src/components/doctorCheck/PatientRegisterList.vue

@@ -8,10 +8,10 @@
             style="font-size: 24px;color: red;cursor:pointer;"></i>
         </el-tooltip>
       </div>
-      <div class="query">
-        <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:268px;" size="small" disabled>          
-          <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true" style="font-size: 20px;min-width:40px;margin: -10px;"></el-button>
+      <div class="query" style="display: flex;">
+        <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:238px;" size="small" disabled>
         </el-input>
+        <el-button icon="el-icon-search" @click="report.dialogCusOrgOCX = true" style="font-size: 20px;height:30px;min-width:30px; padding: 5px 5px;" size="small"></el-button>
       </div>   
 
       <div class="query">

src/components/report/CusOrgOCX.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex;">
-    <div v-if="useCusOrg" style="width: 180px;height:520px;overflow: scroll;border: 1px solid;">
+    <div v-if="useCusOrg" style="width: 180px;height:520px;overflow: scroll;border: 1px solid #EEE;">
       <el-tree :data="patientRegister.customerOrgTreeAll" :props="customerOrg.treeprops" @node-click="handleNode" />
     </div>