00

src/components/doctorCheck/ButtonList.vue

@@ -293,7 +293,8 @@ export default {
                 max: true,
                 visible: false,
                 diagnosis: 'AI诊断信息',
-            }
+            },
+            
         };
     },
 
@@ -328,7 +329,10 @@ export default {
         ...mapMutations(['doctorCheckPrBaseInit']),
         checkPagePriv,
 
+               
+
         prList() {
+            
             this.doctorCheck.doctorCheckDialogVisible = true
         },
 

src/components/doctorCheck/CheckItemList.vue

@@ -6,8 +6,7 @@
       <el-table-column prop="result" label="结果" min-width="200">
         <template slot-scope="scope">
           <div style="display: flex;">
-            <el-autocomplete style="width: 100%"
-              type="textarea" v-model="scope.row.result" placeholder="请输入结果值"
+            <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);
@@ -267,12 +266,12 @@ export default {
       curRow: {},
 
       // 医生诊台相关的本地设置
-      LocalConfig:{
-        doctorCheck:{
+      LocalConfig: {
+        doctorCheck: {
           isSelectAll: 'N', // 录入结果时，是否全选
           pacsDescFontSize: "14px", //描述内容的字体大小
         }
-      },      
+      },
     };
   },
 
@@ -281,7 +280,7 @@ export default {
 
     let LocalConfig = JSON.parse(window.localStorage.getItem("LocalConfig") || null)
     if (LocalConfig?.doctorCheck?.isSelectAll) this.LocalConfig.doctorCheck.isSelectAll = LocalConfig.doctorCheck.isSelectAll
-    if (LocalConfig?.doctorCheck?.pacsDescFontSize) this.LocalConfig.doctorCheck.pacsDescFontSize = LocalConfig.doctorCheck.pacsDescFontSize+'px'
+    if (LocalConfig?.doctorCheck?.pacsDescFontSize) this.LocalConfig.doctorCheck.pacsDescFontSize = LocalConfig.doctorCheck.pacsDescFontSize + 'px'
 
   },
 
@@ -719,23 +718,31 @@ export default {
     // 单击选择结果模版的结果
     clickResult(item) {
       let result = [];
-      if (this.moreResult.result) result = this.moreResult.result.split("；");
-      // 不用分隔符时，不判断包含关系
-      if (this.isSplitChooseResult == "Y" && result.indexOf(item.result) > -1)
-        return;
-      if (this.isSplitChooseResult == "Y" || result.length == 0) {
-        result.push(item.result);
+      // console.log('this.moreResult',JSON.stringify(this.moreResult))
+      // console.log('item',item)
+      //点击结果前 == 默认结果
+      if (this.moreResult.result == this.moreResult.defaultResult) {
+        this.moreResult.result = item.result
       } else {
-        result[result.length - 1] = result[result.length - 1] + item.result;
-      }
 
-      let ret = "";
-      result.forEach((e, i) => {
-        let splitStr = "；";
-        if (i == 0) splitStr = "";
-        ret += splitStr + e;
-      });
-      this.moreResult.result = ret;
+        if (this.moreResult.result) result = this.moreResult.result.split("；");
+        // 不用分隔符时，不判断包含关系
+        if (this.isSplitChooseResult == "Y" && result.indexOf(item.result) > -1)
+          return;
+        if (this.isSplitChooseResult == "Y" || result.length == 0) {
+          result.push(item.result);
+        } else {
+          result[result.length - 1] = result[result.length - 1] + item.result;
+        }
+
+        let ret = "";
+        result.forEach((e, i) => {
+          let splitStr = "；";
+          if (i == 0) splitStr = "";
+          ret += splitStr + e;
+        });
+        this.moreResult.result = ret;
+      }
     },
 
     // 清除结果值
@@ -1090,5 +1097,4 @@ export default {
   background-color: v-bind("tipsSuper.backgroundColor") !important;
   color: v-bind("tipsSuper.color") !important;
 }
-
 </style>

src/components/doctorCheck/PatientRegisterList.vue

@@ -24,7 +24,7 @@
       <div class="query">
         <span>性别：</span>
         <el-select v-model="local.query.sex" placeholder="请选择" clearable style="width: 80px" size="small">
-          <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
+          <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
       </div>
@@ -81,7 +81,7 @@
           style="width:50px;height:26px;margin: 2px 0 2px -3px;">查询</el-button>
       </div>
     </div>
-  
+
     <!-- 人员列表 -->
     <el-table :data="dataList" border width="100%" :height="tableHeight" row-key="id" size="small" highlight-current-row
       @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info" style="border-radius:10px;">
@@ -108,10 +108,10 @@
       <el-table-column label="分组/套餐" width="150">
         <template slot-scope="scope">
           <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-            {{ dddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+            {{ scope.row.medicalPackageName }}
           </div>
           <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
-            {{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+            {{ scope.row.customerOrgGroupName }}
           </div>
         </template>
       </el-table-column>
@@ -245,7 +245,7 @@ export default {
           checkCompleteFlag: '',  //检查项目状态
           isAuditCheck: '',      //检查项目审核
           medicalTypeIds: [],
-          checkDoctorIds:[],
+          checkDoctorIds: [],
 
         },
         completeFlag: []
@@ -314,12 +314,33 @@ export default {
       }]
       this.patientRegister.query.cusOrgOCX = `(体检${today}~${today})`
 
-
+      /* 首次使用时，再调用
       //分组，所有分组，不限单位，不限次数
       postapi("/api/app/CustomerOrgGroup/GetBasicList").then((res) => {
         if (res.code > -1) {
           this.dict.customerOrgGroupAll = res.data;
         }
+      });      
+      */
+      //性别（查询）
+      getapi("/api/app/for-sex").then((res) => {
+        if (res.code == 1) {
+          this.dict.forSex = res.data;
+        }
+      });
+
+      //性别（仅档案用）
+      getapi("/api/app/sex").then((res) => {
+        if (res.code == 1) {
+          this.dict.sex = res.data;
+        }
+      });
+      
+      //体检类别
+      getapi("/api/app/medical-type/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.medicalType = res.data;
+        }
       });
 
       // 获取组合项目
@@ -330,6 +351,7 @@ export default {
         }
       });
 
+
       // 用户 
       let operatorTypes = ["2", "3"]
       if (this.win == 'doctorCheck') operatorTypes = ["1", "3"]

src/components/patientRegister/PatientRegisterEdit.vue

@@ -515,8 +515,8 @@
         <div v-show="checkPagePriv(pagePriv.privs, '全单位支付')" class="btn">
           <el-button type="primary" class="commonbutton" @click="btnPayTypeFlag('1')">全单位支付</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '全免费')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="btnPayTypeFlag('2')">全免费</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs, '全赠送')" class="btn">
+          <el-button type="primary" class="commonbutton" @click="btnPayTypeFlag('2')">全赠送</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '收费')" class="btn">
           <el-button type="success" class="commonbutton" @click="toCharge(form)" :disabled="!form.id">收费</el-button>

src/store/index.js

@@ -324,7 +324,7 @@ export default new Vuex.Store({
                 //支付方式,比如是0自费、2免费、1单位支付
                 { id: "0", displayName: "个人支付" },
                 { id: "1", displayName: "单位支付" },
-                { id: "2", displayName: "免费" },
+                { id: "2", displayName: "赠送" },
             ],
             cardMode: [
                 { id: "0", displayName: "充值卡" },

src/views/doctorCheck/doctorCheck.vue

@@ -204,6 +204,7 @@ export default {
       let sysParam = await postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId })
       this.doctor_check_check_charge = sysParam.data.toUpperCase()
 
+      /* 首次使用时调用，无需预加载
       //性别（仅档案用）
       getapi("/api/app/sex").then((res) => {
         if (res.code == 1) {
@@ -319,7 +320,8 @@ export default {
       //   this.patientRegister.customerOrgTreeAll = res.data;
       //   tcdate(this.patientRegister.customerOrgTreeAll)
       // });
-
+      
+      
       postapi('/api/app/CustomerOrg/GetCustomerOrgByParentId', { parentId: null })
         .then(res => {
           if (res.code > -1) {
@@ -330,7 +332,7 @@ export default {
             tcdate(this.patientRegister.customerOrgTreeAll)
           }
         })
-
+      */ 
 
       console.log("dict", this.dict);
     },