DOCTOR SEO

src/components/doctorCheck/CheckItemList.vue

@@ -27,7 +27,7 @@
             "
             :autosize="{ minRows: 1, maxRows: 100 }"
             :data-ismultiline="scope.row.isMultiLine"
-            @input="madeTooltips(scope.$index)"
+            @input="madeTooltips(scope.$index);computeFun(scope.$index)"
             v-bind:class="scope.row.class"
           /> 
         </template>
@@ -50,7 +50,7 @@
 // 0-无参考范围，1-数字型，2-字符型，3-性激素
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { deepCopy } from '../../utlis/proFunc'
+import { arrayExistObj, deepCopy } from '../../utlis/proFunc'
 
 export default {
   components: {},
@@ -162,7 +162,7 @@ export default {
           // console.log('1、3')
           if(checkItem.result && checkItem.referenceRangeValue){
             let tempResult = checkItem.result.replaceAll('<','').replaceAll('>','').replaceAll('=','').replaceAll('≤','').replaceAll('≥','').replaceAll(' ','')
-            // console.log('tempResult',isNaN(tempResult),tempResult)
+            console.log('tempResult',isNaN(tempResult),tempResult)
             if(isNaN(tempResult)) break;            
             let result = Number(tempResult)
             let criticalRangeValue = checkItem.criticalRangeValue
@@ -216,6 +216,41 @@ export default {
       // console.log(`this.${tooltips}`,this[tooltips])
     },
 
+    //项目列为计算函数
+    computeFun(index){
+      let checkItem = this.doctorCheck.checkItemList[index]
+      console.log('checkItem',checkItem)
+      let body = {
+        registerCheckId:checkItem.registerCheckId,
+        items:[]
+      }
+
+      this.doctorCheck.checkItemList.forEach(e => {
+        body.items.push({
+          itemId: e.itemId,
+          result: e.result
+        })
+      });
+      let lfind = -1
+      postapi('/api/app/diagnosisfunction/getcalculationfunctionresult',body).then(res => {
+        if(res.code != -1){
+          // console.log('res.data',res.data)
+          res.data.items.forEach(e => {
+            lfind = arrayExistObj(this.doctorCheck.checkItemList,"itemId",e.itemId)
+            if(lfind > -1){
+              if(e.result != this.doctorCheck.checkItemList[lfind].result){                
+                this.doctorCheck.checkItemList[lfind].result = e.result
+                console.log('e',lfind,this.doctorCheck.checkItemList[lfind])
+                this.madeTooltips(lfind)
+              }
+            }
+          });
+        }
+      })
+    },
+
+
+
     //选择项目
     rowClick(row) {
       this.doctorCheck.checkItem = row;

src/components/patientRegister/PatientRegisterEdit.vue

@@ -1854,15 +1854,13 @@ export default {
         this.$message.warning("请先保存人员信息！")
         return
       }
-
+ 
+      this.chargeVisible = true
       //多次重复点击时，刷新处理
-      this.chargePatientRegisterNo = ''
+      this.chargePatientRegisterNo = patientRegisterNo
       setTimeout(() => { 
-        this.chargePatientRegisterNo = patientRegisterNo
-      }, 100)
-            
-      //this.$router.push({ path: "/charge" });
-      this.chargeVisible = true
+        this.dataTransOpts.refresh.charge.S++
+      }, 20)
 
     },
 

src/store/index.js

@@ -289,6 +289,7 @@ export default new Vuex.Store({
                 asbitem: { S: 0, M: 0 }, // 组合项目
                 customer_org_group: { S: 0, M: 0 }, // 单位分组
                 customer_org_group_detail: { S: 0, M: 0 }, // 单位分组包含的组合项目明细
+                charge: { S: 0, M: 0 }, // 收费
                 menu_info: { S: 0, M: 0 }, // 菜单与页面
                 patient_register: { S: 0, M: 0 }, // 体检人员记录
                 register_asbitem: { S: 0, M: 0 }, // 体检人员登记的项目（合并前）
@@ -303,6 +304,7 @@ export default new Vuex.Store({
                 asbitem: { id: '' }, // 组合项目
                 customer_org_group: { id: '' }, // 单位分组
                 customer_org_group_detail: { id: '' }, // 单位分组包含的组合项目明细
+                charge: { id: '' }, // 收费
                 menu_info: { id: '' }, // 菜单与页面
                 patient_register: { id: '' },
                 register_asbitem: { id: '' },
@@ -317,6 +319,7 @@ export default new Vuex.Store({
                 asbitem: [], // 组合项目
                 customer_org_group: [], // 单位分组
                 customer_org_group_detail: [], // 单位分组包含的组合项目明细
+                charge: [], // 收费
                 menu_info: [], // 菜单与页面
                 patient_register: [],
                 register_asbitem: [],

src/views/charge/charge.vue

@@ -337,7 +337,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window", "dict", "dataTransOpts", "patientRegister", "customerOrg"]),
   },
 
   methods: {
@@ -424,7 +424,7 @@ export default {
               setTimeout(() => {
                 this.$refs['patientList'].setCurrentRow(this.patientList[0]) 
                 this.rowClick(this.patientList[0])
-              }, 100)
+              }, 20)
             })            
           }else{
             this.asbItemsForFee = []
@@ -1169,17 +1169,13 @@ export default {
 
   //监听事件()
   watch: {
-    "patientRegisterNo":{
+    "dataTransOpts.refresh.charge.S":{
       immediate: true, // 立即执行
       // // deep: true, // 深度监听复杂类型内变化
       handler(newVal,oldVal){
-        console.log('watch:patientRegisterNo:',newVal,oldVal)
-        if(newVal != oldVal){
-          if(newVal){
-            this.query.patientRegisterNo = newVal
-            this.Query("patientRegisterNo")
-          }         
-        }
+        console.log(`watch: 收费 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `,this.patientRegisterNo)
+        this.query.patientRegisterNo = this.patientRegisterNo
+        this.Query("patientRegisterNo")          
       }
     },
   },