src/xt_pages/Dialysisanalysis/summary/index.vue

@@ -155,6 +155,8 @@ export default {
               label: key // 可以自定义表头名称
             }));
             // this.tableData = response.data.data.list
+            console.log(this.columns)
+
 
 
             this.tableData = response.data.data.list.map(row => {
@@ -165,6 +167,9 @@ export default {
               return newRow;
             });
 
+            console.log( this.tableData)
+
+
             // 将 JSON 数据设置为表格数据
 
           } else {

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -239,7 +239,7 @@
                 {{ scope.row.frequency }}
               </template>
             </el-table-column>
-            
+
             <el-table-column
               prop="name"
               label="天数"
@@ -262,7 +262,7 @@
             </el-table-column>
             <el-table-column label="药品追溯码" width="162" align="center">
               <template slot-scope="scope">
-                <div @click="getDrugCode(scope.row.ID,scope.row.data_sources,scope.row.DrugCode,scope.$index)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div> 
+                <div @click="getDrugCode(scope.row.ID,scope.row.data_sources,scope.row.DrugCode,scope.$index)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div>
               </template>
             </el-table-column>
             <el-table-column
@@ -574,33 +574,33 @@ export default {
         }else{
           return ""
         }
-      
+
       }
 
     },
     // 追溯码
     getDrugCode(id,DataSources,DrugCode,index){
-      
+
       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 0){
         var params = {
             drug_id:this.drug_id,
             start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
         }
-       
+
         getDrugTocalCount(params).then(response=>{
           if(response.data.state == 1){
-            
+
             var adviceList = response.data.data.adviceList
 
            this.scan_code = response.data.data.drug.scan_code
-              
+
             var str = ""
             if(adviceList!=null && adviceList.length>0){
               for(let i=0;i<adviceList.length;i++){
                 if(adviceList[i].drug_code!=""){
-                  str+=adviceList[i].drug_code 
+                  str+=adviceList[i].drug_code
                 }
-              
+
               }
             }
             var new_arr = str.split(",");
@@ -608,20 +608,20 @@ export default {
             console.log("adviceList==========",new_arr)
 
             if(new_arr!=null && new_arr.length>0){
-              
+
               let dataInfo = {}
               new_arr.forEach((item, index) => {
                 if (!dataInfo[item]) {
                     dataInfo[item] = {
                     drug_code:item,
-                    child: [], 
+                    child: [],
                   }
                 }
               })
               let arr = Object.values(dataInfo)
 
               if(arr!=null && arr.length>0){
-                
+
                 for(let i=0;i<arr.length;i++){
                   for(let j=0;j<new_arr.length;j++){
                       if(arr[i].drug_code == new_arr[j]){
@@ -630,11 +630,11 @@ export default {
                   }
                 }
               }
-              
+
               this.newArrList = []
               this.newArrList = arr
-               
-              this.id = id 
+
+              this.id = id
               var is_source =0
               if (DataSources == "his处方"){
                   is_source = 1
@@ -649,13 +649,13 @@ export default {
               this.$nextTick(()=>{
                 this.$refs.Datefrom.focus()
               })
-              
+
             }
           }
         })
 
       }else{
-        this.id = id 
+        this.id = id
         var is_source =0
         if (DataSources == "his处方"){
           is_source = 1
@@ -675,14 +675,15 @@ export default {
     saveTextArea(){
 
 
-      
+
        var params = {
         id:this.id,
         data_source:this.is_source,
         drug_code:this.textarea,
        }
        console.log("paramss",params)
-      
+
+
       changeDrugCode(params).then(response=>{
          if(response.data.state == 1){
             this.$message.success("保存成功!")
@@ -702,15 +703,15 @@ export default {
         var textarea = ""
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
 
-      
+
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10726){
-          
+
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
-         
+
           var total_one = 0
           var total_two = 0
 
-          
+
 
           var arr= []
           arr = textarea.split(",")
@@ -721,14 +722,14 @@ export default {
                 if (!dataInfo[item]) {
                     dataInfo[item] = {
                     drug_code:item,
-                    child: [], 
+                    child: [],
                   }
                  }
                })
                let new_arr = Object.values(dataInfo)
 
                if(new_arr!=null && new_arr.length>0){
-                
+
                  for(let i=0;i<new_arr.length;i++){
                    for(let j=0;j<arr.length;j++){
                       if(new_arr[i].drug_code == arr[j]){
@@ -738,13 +739,13 @@ export default {
                  }
                }
             arrList = new_arr
-            
+
           }
 
           var is_err_check = false
           var i_index = ""
           var drug_code = ""
-       
+
           if(arr!=null && arr.length>0){
             for(let i=0;i<arr.length;i++){
 
@@ -763,8 +764,8 @@ export default {
                     }
                   }
                  }
-                
-                
+
+
 
                }
 
@@ -773,7 +774,7 @@ export default {
           if(is_err_check == true){
               arr.splice(i_index,1)
           }
-         
+
           for(let i=0;i<this.newArrList.length;i++){
              if(drug_code == this.newArrList[i].drug_code){
                  total_one = this.newArrList[i].child.length
@@ -788,23 +789,23 @@ export default {
 
           console.log("total_one-----------",total_one)
           console.log("total_two-----------",total_two)
-   
+
           if(this.scan_code>0){
             if((total_one + total_two)>this.scan_code){
               this.$message.error("扫码次数已经超过限制!")
               arr.splice(i_index,1)
             }
           }
-         
+
          var is_arr = this.hasDuplicates(arr)
 
-       
+
 
         this.textarea = arr.join(",")
 
         }else{
           var arr = textarea.split(",");
-          
+
           var lastElement = arr[arr.length - 2];
 
           if(lastElement.length!=20){
@@ -812,7 +813,7 @@ export default {
             arr.splice(arr.length-2,1)
           }
           console.log("arr-------------",arr)
-         
+
           this.textarea = ""
           this.textarea = arr.join(",")
 
@@ -821,7 +822,7 @@ export default {
           // var i_index = ""
           // var arr = textarea.split(",")
           // if(arr!=null && arr.length>0){
-            
+
           //   for(let i=0;i<arr.length;i++){
           //     console.log("arrp[i].")
           //     i_index = i
@@ -832,23 +833,23 @@ export default {
           //       }else{
           //         newArr.push(arr[i])
           //       }
-                
+
           //     }
           //   }
           // }
-         
+
           // if(is_err_check == 1){
           //    newArr.splice(i_index,1)
           // }
 
-          
+
           // if(newArr!=null && newArr.length>0){
-           
+
           //   this.textarea = newArr.join(",")
           // }
           // this.textarea = textarea
         }
-       
+
       }
     },
     tt() {},
@@ -934,7 +935,7 @@ export default {
           data.forEach((el, index) => {
             dose_unit.push(this.getDose_unit(el.total));
           });
-        
+
           dose_unit = this.unique_unit(dose_unit);
           console.log(dose_unit,'dose_unit')
           // // 数据合计
@@ -1457,8 +1458,8 @@ export default {
             this.tableData = []
             this.tableData = list
           }
-         
-         
+
+
           this.total = res.data.data.total; //合计
         } else {
           this.$message.error(res.data.msg);
@@ -1529,7 +1530,7 @@ export default {
       return uniqueNumbers.length !== arr.length;
     },
     getDrugIdentificationCode(id){
-       
+
       var drug_identification_code = ""
       for(let i=0;i<this.baseList.length;i++){
           if(id == this.baseList[i].id){

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -69,13 +69,13 @@
           >
             <el-table-column prop="date" label="患者姓名" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.Name ? scope.row.Name : "" }}</span>
+                <span>{{ scope.row.name ? scope.row.name : "" }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="name" label="透析号" width="100">
               <template slot-scope="scope">
                 <span>{{
-                  scope.row.DialysisNo ? scope.row.DialysisNo : ""
+                  scope.row.dialysis_no ? scope.row.dialysis_no : ""
                 }}</span>
               </template>
             </el-table-column>
@@ -97,13 +97,13 @@
           >
             <el-table-column prop="date" label="患者姓名" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.Name ? scope.row.Name : "" }}</span>
+                <span>{{ scope.row.name ? scope.row.name : "" }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="name" label="透析号" width="100">
               <template slot-scope="scope">
                 <span>{{
-                  scope.row.DialysisNo ? scope.row.DialysisNo : ""
+                  scope.row.dialysis_no ? scope.row.dialysis_no : ""
                 }}</span>
               </template>
             </el-table-column>
@@ -189,7 +189,7 @@
             </el-table-column>
             <el-table-column label="规格" width="100" align="center">
               <template slot-scope="scope">
-                <span>{{getSpecaiName(scope.row.DrugId)}}</span>
+                <span>{{ scope.row.Spec}}</span>
               </template>
             </el-table-column>
             <el-table-column label="单次用量" width="100" align="center">
@@ -223,12 +223,12 @@
             </el-table-column>
             <el-table-column label="生产厂商" width="100" align="center">
               <template slot-scope="scope">
-                <span>{{ getManutuer(scope.row.DrugId) }}</span>
+                <span>{{ (scope.row.MName) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="药品追溯码" width="162" align="center">
               <template slot-scope="scope">
-                <div @click="getDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode,scope.$index,scope.row.DrugId)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div>
+                <div @click="getDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode,scope.$index,scope.row.DrugId,scope.row.Type)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div>
               </template>
             </el-table-column>
             <el-table-column label="开立医生" width="150" align="center">
@@ -245,7 +245,7 @@
             </el-table-column>
             <el-table-column label="国家编码" width="162" align="center">
               <template slot-scope="scope">
-                <span>{{getDrugName(scope.row.DrugId)}}</span>
+                <span>{{ scope.row.Bm}}</span>
               </template>
             </el-table-column>
 
@@ -426,17 +426,15 @@ export default {
       textAreaList:[],
       scan_code:"",
       printShow:false,
+      drug_type:1, //1是药品，2耗材
     };
   },
- 
+
   created() {
     this.init();
-    this.gettodaynumber();
-    this.fun3();
     this.getgetpartitionlist();
+    this.fun3();
     this.org_id = this.$store.getters.xt_user.org.id
-    // this.getwaitmount();//fun3
-    // this.selectedbydefault();
   },
   methods: {
     getTotal(){
@@ -455,9 +453,9 @@ export default {
         }else{
           return ""
         }
-       
+
       }
-     
+
     },
     openDialog(){
       this.$nextTick(() => {
@@ -493,7 +491,6 @@ export default {
       console.log("this.alreadmount", this.alreadmount);
     },
     async fun3() {
-      console.log("fun3");
       this.fun1().then((val) => {
         this.fun2();
       });
@@ -539,7 +536,7 @@ export default {
       console.log("state--",this.state)
       this.currentRow = val;
       console.log("this.currentRow", this.currentRow);
-    
+
       if (this.state == 1) {
         this.tableData = []
         this.patients = {}
@@ -577,21 +574,27 @@ export default {
     },
     //包装selectedbydefault
     fun2() {
-      console.log("3333333this.waitmount_data", this.waitmount_data);
-      // return new Promise((resolve, reject) => {
       if (this.state == 1 && this.waitmount_data.length > 0) {
         this.$refs.table01.setCurrentRow(this.waitmount_data[0]);
+        this.currentRow = this.waitmount_data[0]
         this.handleCurrentChange(this.waitmount_data[0]);
+        console.log(" this.currentRow111")
+        console.log( this.currentRow)
+
+
       }
       if (this.state == 2 && this.alreadmount_data.length > 0) {
         this.$refs.table02.setCurrentRow(this.alreadmount_data[0]);
+        this.currentRow = this.alreadmount_data[0]
         this.handleCurrentChange(this.alreadmount_data[0]);
+        console.log(" this.currentRow222")
+        console.log( this.currentRow)
       }
       // });
     },
     changeTimes() {
       this.gettodaynumber();
-      this.getwaitmount();
+      // this.getwaitmount();
       this.fun3();
     },
     //获取当天发药的人数
@@ -623,8 +626,7 @@ export default {
         if (res.data.state == 1) {
           this.waitmount_data=[]
           var list = res.data.data.list;
-          this.baseList =[]
-          this.baseList = res.data.data.baseList
+
           if (this.shift != 0 || this.partition != 0) {
             if (this.waitmount_data == null) {
               this.waitmount = 0;
@@ -736,7 +738,6 @@ export default {
     },
     //包装getwaitmount
     async fun1() {
-      // return new Promise((resolve, reject) => {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
@@ -746,86 +747,21 @@ export default {
       await waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
           this.waitmount_data=[]
-          var list = res.data.data.list;
           this.patientList = []
-          this.patientList = res.data.data.patientList
-          var listTwo = res.data.data.listTwo
-          var newArr =[]
-          if(listTwo!=null && listTwo.length>0){
-             for(let i=0;i<listTwo.length;i++){
-              listTwo[i].PatientID = 0
-              listTwo[i].Name=""
-              listTwo[i].DialysisNo=""
-              listTwo[i].PatientID = listTwo[i].patient_id
-              listTwo[i].Name = listTwo[i].patient.name
-              listTwo[i].DialysisNo = listTwo[i].patient.dialysis_no
-              newArr.push(listTwo[i])
-             }
-          }
-          if(list!=null && list.length>0){
-            for(let i=0;i<list.length;i++){
-              this.waitmount_data.push(list[i])
-            }
-            if(newArr!=null && newArr.length>0){
-               for(let i=0;i<newArr.length;i++){
-                this.waitmount_data.push(newArr[i])
-               }
-            }
-          }
-          if(list==null){
-            if(newArr!=null && newArr.length>0){
-               for(let i=0;i<newArr.length;i++){
-                this.waitmount_data.push(newArr[i])
-               }
-            }
+          this.patientList = res.data.data.wait_patientList
+          this.waitmount_data =  this.patientList
+          this.waitmount =this.waitmount_data.length
 
-          }
-
-          console.log("1111111");
         }
       });
       await issueddrugs(params).then((res) => {
         if (res.data.state == 1) {
           this.alreadmount_data = []
-          var list = res.data.data.list;
-          var listTwo = res.data.data.listTwo
-          var newArr =[]
-          if(listTwo!=null && listTwo.length>0){
-             for(let i=0;i<listTwo.length;i++){
-              listTwo[i].PatientID = 0
-              listTwo[i].Name=""
-              listTwo[i].DialysisNo=""
-              listTwo[i].PatientID = listTwo[i].patient_id
-              listTwo[i].Name = listTwo[i].patient.name
-              listTwo[i].DialysisNo = listTwo[i].patient.dialysis_no
-              newArr.push(listTwo[i])
-             }
-          }
-          if(list!=null && list.length>0){
-            for(let i=0;i<list.length;i++){
-              this.alreadmount_data.push(list[i])
-            }
-            if(newArr!=null && newArr.length>0){
-               for(let i=0;i<newArr.length;i++){
-                this.alreadmount_data.push(newArr[i])
-               }
-            }
-          }
-          if(list==null){
-            if(newArr!=null && newArr.length>0){
-               for(let i=0;i<newArr.length;i++){
-                this.alreadmount_data.push(newArr[i])
-               }
-            }
-
-          }
-
-          console.log("1111111s");
+          this.alreadmount_data =  res.data.data.user_patientList
+          this.alreadmount = this.alreadmount_data.length
         }
       });
-      console.log("222222222");
 
-      // })
     },
     getPatientName(patient_id){
       var name = ""
@@ -855,14 +791,14 @@ export default {
       // });
       console.log("val2332323223",this.currentRow)
       var params = {
-        patient_id: this.currentRow.PatientID,
+        patient_id: this.currentRow.id,
         is_medicine: val,
         time: this.start_time,
       };
       getpharmacycontent(params).then((res) => {
         if (res.data.state == 1) {
           //  loading.close()
-         
+
            var list = res.data.data.list;
            console.log("hhhhawoowowow",res.data.data)
            this.baseList =[]
@@ -987,11 +923,8 @@ export default {
     // 搜索患者
     searchAction() {
       this.tableData = null;
-      this.getwaitmount();
-      if (this.shift != 0 || this.partition != 0) {
-      } else {
-        this.gettodaynumber();
-      }
+      this.fun3();
+      // this.gettodaynumber();
     },
 
     // 药品发药
@@ -1012,6 +945,7 @@ export default {
             return false
           } else {
             var tmp = that.currentRow.PatientID;
+            console.log(that.currentRow)
             var params = {
               patient_id: that.currentRow.PatientID,
               time: that.start_time,
@@ -1080,9 +1014,11 @@ export default {
         })
 
       }else{
-        var tmp = this.currentRow.PatientID;
+        var tmp = this.currentRow.id;
+        console.log(this.currentRow)
+
         var params = {
-          patient_id: this.currentRow.PatientID,
+          patient_id: this.currentRow.id,
           time: this.start_time,
         };
         this.$confirm("确定是否对该患者进行发药?", "患者发药", {
@@ -1156,9 +1092,9 @@ export default {
               });
             return false
           } else {
-            var tmp = that.currentRow.PatientID;
+            var tmp = that.currentRow.id;
             var params = {
-              patient_id: that.currentRow.PatientID,
+              patient_id: that.currentRow.id,
               admin_user_id: that.$store.getters.xt_user.user.id,
               time: that.start_time,
             };
@@ -1227,9 +1163,9 @@ export default {
             .catch(() => {});
         })
       }else{
-        var tmp = this.currentRow.PatientID;
+        var tmp = this.currentRow.id;
         var params = {
-          patient_id: this.currentRow.PatientID,
+          patient_id: this.currentRow.id,
           time: this.start_time,
         };
         this.$confirm("确定是否对该患者进行退药?", "患者退药", {
@@ -1285,102 +1221,108 @@ export default {
        }
        return spc
     },
-    getDrugCode(id,DataSources,DrugCode,index,DrugId){
-      
-     // 针对百霖
-       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id==0|| this.$store.getters.xt_user.org.id==10726){
+    getDrugCode(id,DataSources,DrugCode,index,DrugId,type){
+      this.drug_type = type
+      console.log(type)
+      console.log( this.drug_type)
+      if (type == 1){
+        // 针对百霖
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id==0|| this.$store.getters.xt_user.org.id==10726){
           var params = {
             drug_id:DrugId,
             start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
           }
-         getDrugTocalCount(params).then(response=>{
-           if(response.data.state == 1){
-             
-            var adviceList = response.data.data.adviceList
-
-            var drug = response.data.data.drug
-              
-            this.scan_code = drug.scan_code
-
-
-            var str = ""
-            if(adviceList!=null && adviceList.length>0){
-              for(let i=0;i<adviceList.length;i++){
-                if(adviceList[i].drug_code!=""){
-                  str+=adviceList[i].drug_code 
+          getDrugTocalCount(params).then(response=>{
+            if(response.data.state == 1){
+              var adviceList = response.data.data.adviceList
+              var drug = response.data.data.drug
+              this.scan_code = drug.scan_code
+              var str = ""
+              if(adviceList!=null && adviceList.length>0){
+                for(let i=0;i<adviceList.length;i++){
+                  if(adviceList[i].drug_code!=""){
+                    str+=adviceList[i].drug_code
+                  }
                 }
-               
               }
-            }
-            var new_arr = str.split(",");
+              var new_arr = str.split(",");
 
-            console.log("adviceList==========",new_arr)
+              console.log("adviceList==========",new_arr)
 
-            if(new_arr!=null && new_arr.length>0){
-               
-               let dataInfo = {}
-               new_arr.forEach((item, index) => {
-                if (!dataInfo[item]) {
+              if(new_arr!=null && new_arr.length>0){
+
+                let dataInfo = {}
+                new_arr.forEach((item, index) => {
+                  if (!dataInfo[item]) {
                     dataInfo[item] = {
-                    drug_code:item,
-                    child: [], 
+                      drug_code:item,
+                      child: [],
+                    }
                   }
-                 }
-               })
-               let arr = Object.values(dataInfo)
+                })
+                let arr = Object.values(dataInfo)
 
-               if(arr!=null && arr.length>0){
-                
-                 for(let i=0;i<arr.length;i++){
-                   for(let j=0;j<new_arr.length;j++){
+                if(arr!=null && arr.length>0){
+
+                  for(let i=0;i<arr.length;i++){
+                    for(let j=0;j<new_arr.length;j++){
                       if(arr[i].drug_code == new_arr[j]){
-                         arr[i].child.push(new_arr[j])
+                        arr[i].child.push(new_arr[j])
                       }
-                   }
-                 }
-               }
-               
-               this.newArrList = []
-               this.newArrList = arr
-               console.log("newARRlIST----------",this.newArrList)
-            }
-              
-            this.drug_id = DrugId
-            this.id = id
-            var is_source =0
-            if (DataSources == "his处方"){
-              is_source = 1
-            }
-            if (DataSources == "临时医嘱"){
-              is_source = 2
+                    }
+                  }
+                }
+
+                this.newArrList = []
+                this.newArrList = arr
+                console.log("newARRlIST----------",this.newArrList)
+              }
+
+              this.drug_id = DrugId
+              this.id = id
+              var is_source =0
+              if (DataSources == "his处方"){
+                is_source = 1
+              }
+              if (DataSources == "临时医嘱"){
+                is_source = 2
+              }
+              this.is_source = is_source
+              this.textarea = DrugCode
+              this.currentIndex = index
+
+              this.dialogVisibleOne = true
             }
-            this.is_source = is_source
-            this.textarea = DrugCode
-            this.currentIndex = index
-            
-            this.dialogVisibleOne = true
-           }
-         })
-       }else{
-        
+          })
+        }else{
+
+          this.drug_id = DrugId
+          this.id = id
+          var is_source =0
+          if (DataSources == "his处方"){
+            is_source = 1
+          }
+          if (DataSources == "临时医嘱"){
+            is_source = 2
+          }
+          this.is_source = is_source
+          this.textarea = DrugCode
+          this.currentIndex = index
+          this.dialogVisibleOne = true
+        }
+        this.$nextTick(()=>{
+          this.$refs.inputRef.focus()
+        })
+
+      }else{
         this.drug_id = DrugId
         this.id = id
-        var is_source =0
-        if (DataSources == "his处方"){
-          is_source = 1
-        }
-        if (DataSources == "临时医嘱"){
-          is_source = 2
-        }
-        this.is_source = is_source
+        this.is_source = 3
         this.textarea = DrugCode
         this.currentIndex = index
         this.dialogVisibleOne = true
-       }
-       this.$nextTick(()=>{
-        this.$refs.inputRef.focus()
-       })
-     
+
+      }
 
     },
     saveTextArea(){
@@ -1408,19 +1350,18 @@ export default {
      console.log("event------------",event.key)
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
-       
+
         var textarea = ""
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-        
 
-        
 
-        
-         
+
+
+
+
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10726){
 
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
-             
           var total_one = 0
           var total_two = 0
 
@@ -1433,14 +1374,14 @@ export default {
                 if (!dataInfo[item]) {
                     dataInfo[item] = {
                     drug_code:item,
-                    child: [], 
+                    child: [],
                   }
                  }
                })
                let new_arr = Object.values(dataInfo)
 
                if(new_arr!=null && new_arr.length>0){
-                
+
                  for(let i=0;i<new_arr.length;i++){
                    for(let j=0;j<arr.length;j++){
                       if(new_arr[i].drug_code == arr[j]){
@@ -1450,13 +1391,13 @@ export default {
                  }
                }
             arrList = new_arr
-            
+
           }
 
           var is_err_check = false
           var i_index = ""
           var drug_code = ""
-       
+
           if(arr!=null && arr.length>0){
             for(let i=0;i<arr.length;i++){
 
@@ -1478,8 +1419,8 @@ export default {
                     }
                  }
 
-               
-                
+
+
 
                }
 
@@ -1488,7 +1429,7 @@ export default {
           if(is_err_check == true){
               arr.splice(i_index,1)
           }
-         
+
           for(let i=0;i<this.newArrList.length;i++){
              if(drug_code == this.newArrList[i].drug_code){
                  total_one = this.newArrList[i].child.length
@@ -1504,24 +1445,24 @@ export default {
 
           console.log("数量1--------------",total_one)
           console.log("数量2---------------",total_two)
-        
-        
-          
+
+
+
           if(this.scan_code>0){
             if((total_one + total_two)>this.scan_code){
               this.$message.error("扫码次数已经超过限制!")
               arr.splice(i_index,1)
             }
           }
-         
+
          var is_arr = this.hasDuplicates(arr)
 
           this.textarea = arr.join(",")
         }else{
           // console.log("haaaaaaaaaaaaaaaaaaa",textarea)
-          
+
           var arr = textarea.split(",");
-          
+
           var lastElement = arr[arr.length - 2];
 
           if(lastElement.length!=20){
@@ -1529,26 +1470,26 @@ export default {
             arr.splice(arr.length-2,1)
           }
           console.log("arr-------------",arr)
-         
+
           this.textarea = ""
           this.textarea = arr.join(",")
 
           // this.textarea = textarea
         }
-        
 
-       
+
+
       }
 
       this.getTotal()
     },
-    
+
     hasDuplicates(arr) {
       const uniqueNumbers = [...new Set(arr)];
       return uniqueNumbers.length !== arr.length;
     },
     getDrugIdentificationCode(id){
-       
+
       var drug_identification_code = ""
       for(let i=0;i<this.baseList.length;i++){
           if(id == this.baseList[i].id){
@@ -1557,23 +1498,12 @@ export default {
       }
       return drug_identification_code
     },
-    getDrugScanCode(drug_id){
-      var scan_code = ""
-      for(let i=0;i<this.baseList.length;i++){
-       if(drug_id == this.baseList[i].id){
-          scan_code = this.baseList[i].scan_code
-       }
-      }
-      return scan_code
-    }
-
-
 
   },
   watch:{
 
   }
-  
+
 };
 </script>
 

src/xt_pages/Pharmacy/drugCode.vue

@@ -108,17 +108,17 @@
         <template slot-scope="scope">{{ getPatientName(scope.row.patient_id) }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
-        <template slot-scope="scope">{{ getTime(scope.row.advice_date) }}</template>
+        <template slot-scope="scope">{{is_type == 3 ? getTime(scope.row.record_date): getTime(scope.row.advice_date) }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="药品名称">
-        <template slot-scope="scope">{{ scope.row.advice_name }}</template>
+        <template slot-scope="scope">{{ is_type == 3 ? scope.row.good_info.good_name :scope.row.advice_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="规格">
-        <template slot-scope="scope">{{ getDrugSpec(scope.row.drug_id) }}</template>
+        <template slot-scope="scope">{{is_type == 3 ? scope.row.good_info.specification_name : getDrugSpec(scope.row.drug_id) }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="开药总量">
-        <template slot-scope="scope">{{ scope.row.prescribing_number }}{{
-            scope.row.prescribing_number_unit
+        <template slot-scope="scope">{{ is_type == 3 ? scope.row.count : scope.row.prescribing_number }}{{
+            is_type == 3 ? scope.row.unit :scope.row.prescribing_number_unit
           }}
         </template>
       </el-table-column>
@@ -135,15 +135,12 @@
           <div v-if="scope.row.is_upload == 2 || scope.row.is_upload == 0">未上传</div>
         </template>
       </el-table-column>
-
       <el-table-column align="center" prop="name" label="发药状态" v-if="is_type == 1">
         <template slot-scope="scope">
           <div v-if="scope.row.is_medicine == 1">已发药</div>
           <div v-if="scope.row.is_medicine == 2 || scope.row.is_medicine == 0">未发药</div>
         </template>
       </el-table-column>
-
-
       <el-table-column align="center" prop="name" label="结算状态" v-if="is_type == 1">
         <template slot-scope="scope">
 
@@ -151,13 +148,9 @@
           <div v-if="scope.row.pre.order_status != 2">未结算</div>
         </template>
       </el-table-column>
-
       <el-table-column align="center" prop="name" label="操作" width="200">
         <template slot-scope="scope">
           <div>
-            <!--             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">未上传</el-button>-->
-            <!--            <el-button type="primary" v-if="scope.row.is_upload == 0 || scope.row.is_upload == 2" @click="toUpload(scope.row)">上传</el-button>-->
-
             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="revokeDrugCode(scope.row)">撤销
             </el-button>
             <el-button type="primary" v-if="scope.row.is_upload == 0" @click="toUpload(scope.row)">上传</el-button>
@@ -165,10 +158,7 @@
           </div>
         </template>
       </el-table-column>
-
-
     </el-table>
-
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -254,8 +244,10 @@ export default {
         {id: "1", name: '未结算'},
       ],
       advice_items:[
-        {id:"1",name:"HIS系统"},
+        {id:"1",name:"HIS系统药品"},
         {id:"2",name:"血透系统"},
+        {id:"3",name:"HIS系统耗材"},
+
       ],
       patientList: [],
       drugList: [],
@@ -279,65 +271,130 @@ export default {
       this.getlist()
     },
     toUpload(row) {
-      if (row.drug_code.length == 0) {
-        this.$message.error("追溯码不能为空");
-        return
-      }
-      let ids = row.id
-      var that = this;
-      let params = {
-        id: ids,
-        admin_user_id: this.$store.getters.xt_user.user.id,
-        is_type:this.is_type,
-      };
-
-      axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
-        if (response.data.state == 0) {
-          // that.$message.error(response.data.data.msg);
+      if(this.is_type == 3){
+        if (row.drug_code.length == 0) {
+          this.$message.error("追溯码不能为空");
+          return
+        }
+        let ids = row.id
+        var that = this;
+        let params = {
+          id: ids,
+          admin_user_id: this.$store.getters.xt_user.user.id,
+          is_type:this.is_type,
+        };
+
+        axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
+          if (response.data.state == 0) {
+            // that.$message.error(response.data.data.msg);
+            that.$confirm("请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+
+
+            })
+              .catch(() => {
+              });
+            return false
+          } else {
+
+            //有打开则调用接口
+            axios.get('http://127.0.0.1:9532/api/changedrug/six', {params: params}).then(function (response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  that.getlist()
+                }
+              }
+            }).catch(function (error) {
+            })
+          }
+        }).catch(function (error) {
           that.$confirm("请检查医保程序是否有打开", "提示", {
             confirmButtonText: "确 定",
             cancelButtonText: "取 消",
             type: "warning",
           }).then(() => {
-
-
           })
             .catch(() => {
             });
-          return false
-        } else {
-
-          //有打开则调用接口
-          axios.get('http://127.0.0.1:9532/api/changedrug/five', {params: params}).then(function (response) {
-            if (response.data.state == 0) {
-              that.$message.error(response.data.data.msg);
-              return false
-            } else {
-              if (response.data.data.failed_code == -10) {
-                that.$confirm(response.data.data.msg, '医保错误信息', {
-                  confirmButtonText: '确 定',
-                  type: 'warning'
-                }).then(() => {
+        })
 
-                }).catch(() => {
-                })
+      }else {
+        if (row.drug_code.length == 0) {
+          this.$message.error("追溯码不能为空");
+          return
+        }
+        let ids = row.id
+        var that = this;
+        let params = {
+          id: ids,
+          admin_user_id: this.$store.getters.xt_user.user.id,
+          is_type:this.is_type,
+        };
+
+        axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
+          if (response.data.state == 0) {
+            // that.$message.error(response.data.data.msg);
+            that.$confirm("请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+
+
+            })
+              .catch(() => {
+              });
+            return false
+          } else {
+
+            //有打开则调用接口
+            axios.get('http://127.0.0.1:9532/api/changedrug/five', {params: params}).then(function (response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
               } else {
-                that.getlist()
+                if (response.data.data.failed_code == -10) {
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  that.getlist()
+                }
               }
-            }
-          }).catch(function (error) {
+            }).catch(function (error) {
+            })
+          }
+        }).catch(function (error) {
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
           })
-        }
-      }).catch(function (error) {
-        that.$confirm("请检查医保程序是否有打开", "提示", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning",
-        }).then(() => {
+            .catch(() => {
+            });
         })
-          .catch(() => {
-          });
-      })
+
+      }
+
 
 
     },
@@ -438,7 +495,7 @@ export default {
           }
        })
       }
-      if(this.is_type == 2){
+      if(this.is_type == 3){
         var params = {
           id: this.id,
           data_source: 2,
@@ -455,6 +512,23 @@ export default {
          })
       }
 
+      if(this.is_type == 3){
+        var params = {
+          id: this.id,
+          data_source: 3,
+          drug_code: this.textarea,
+        }
+        changeDrugCode(params).then(response=>{
+          this.$message.success("保存成功!")
+          for (let i = 0; i < this.tableData.length; i++) {
+            if (this.currentIndex == i) {
+              this.tableData[i].drug_code = this.textarea
+            }
+          }
+          this.dialogVisibleOne = false
+        })
+      }
+
     },
     getPatientName(id) {
       var name = ""
@@ -568,77 +642,155 @@ export default {
       // 判断结束时间是否在一个月内
       return endDate <= oneMonthLater;
     }, batchUpload() {
-      var that = this
-      let ids  = ""
-      for (var i = 0; i < this.selection.length; i++){
-        if (ids.length == 0){
-          ids = this.selection[i].id
-        }else{
-          ids = ids + "," + this.selection[i].id
+      if(this.is_type == 3){
+        var that = this
+        let ids  = ""
+        for (var i = 0; i < this.selection.length; i++){
+          if (ids.length == 0){
+            ids = this.selection[i].id
+          }else{
+            ids = ids + "," + this.selection[i].id
+          }
         }
-      }
-      if(ids.length == 0 ){
-        this.$message.error("请勾选需要上传的数据");
-        return
-      }
-      let params = {
-        id: ids,
-        admin_user_id: this.$store.getters.xt_user.user.id,
-        is_type:this.is_type
+        if(ids.length == 0 ){
+          this.$message.error("请勾选需要上传的数据");
+          return
+        }
+        let params = {
+          id: ids,
+          admin_user_id: this.$store.getters.xt_user.user.id,
+          is_type:this.is_type
+
+        };
+        axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
+          if (response.data.state == 0) {
+            // that.$message.error(response.data.data.msg);
+            that.$confirm("请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+
+            })
+              .catch(() => {
+
+              });
+            return false
+          } else {
+            that.isloading = true
+
+            //有打开则调用接口
+            axios.get('http://127.0.0.1:9532/api/changedrug/six', {params: params}).then(function (response) {
+              if (response.data.state == 0) {
+                that.isloading = false
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                that.isloading = false
+                if (response.data.data.failed_code == -10) {
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  that.getlist()
+                }
+              }
+            }).catch(function (error) {
+              that.isloading = false
+            })
+          }
+        }).catch(function (error) {
 
-      };
-      axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
-        if (response.data.state == 0) {
-          // that.$message.error(response.data.data.msg);
           that.$confirm("请检查医保程序是否有打开", "提示", {
             confirmButtonText: "确 定",
             cancelButtonText: "取 消",
             type: "warning",
           }).then(() => {
-
           })
             .catch(() => {
-
             });
-          return false
-        } else {
-          that.isloading = true
+        })
 
-          //有打开则调用接口
-          axios.get('http://127.0.0.1:9532/api/changedrug/five', {params: params}).then(function (response) {
-            if (response.data.state == 0) {
-              that.isloading = false
-              that.$message.error(response.data.data.msg);
-              return false
-            } else {
-              that.isloading = false
-              if (response.data.data.failed_code == -10) {
-                that.$confirm(response.data.data.msg, '医保错误信息', {
-                  confirmButtonText: '确 定',
-                  type: 'warning'
-                }).then(() => {
 
-                }).catch(() => {
-                })
+      }else{
+        var that = this
+        let ids  = ""
+        for (var i = 0; i < this.selection.length; i++){
+          if (ids.length == 0){
+            ids = this.selection[i].id
+          }else{
+            ids = ids + "," + this.selection[i].id
+          }
+        }
+        if(ids.length == 0 ){
+          this.$message.error("请勾选需要上传的数据");
+          return
+        }
+        let params = {
+          id: ids,
+          admin_user_id: this.$store.getters.xt_user.user.id,
+          is_type:this.is_type
+
+        };
+        axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
+          if (response.data.state == 0) {
+            // that.$message.error(response.data.data.msg);
+            that.$confirm("请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+
+            })
+              .catch(() => {
+
+              });
+            return false
+          } else {
+            that.isloading = true
+
+            //有打开则调用接口
+            axios.get('http://127.0.0.1:9532/api/changedrug/five', {params: params}).then(function (response) {
+              if (response.data.state == 0) {
+                that.isloading = false
+                that.$message.error(response.data.data.msg);
+                return false
               } else {
-                that.getlist()
+                that.isloading = false
+                if (response.data.data.failed_code == -10) {
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  that.getlist()
+                }
               }
-            }
-          }).catch(function (error) {
-            that.isloading = false
-          })
-        }
-      }).catch(function (error) {
+            }).catch(function (error) {
+              that.isloading = false
+            })
+          }
+        }).catch(function (error) {
 
-        that.$confirm("请检查医保程序是否有打开", "提示", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning",
-        }).then(() => {
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+          })
+            .catch(() => {
+            });
         })
-          .catch(() => {
-          });
-      })
+
+
+      }
 
     }, query() {
       this.getlist()
@@ -678,8 +830,14 @@ export default {
           this.$message.error(response.data.msg)
           return false
         } else {
+          if(this.is_type !=  3){
+            this.tableData = response.data.data.list
+
+          }else{
+            this.tableData = response.data.data.project_list
+
+          }
 
-          this.tableData = response.data.data.list
           this.total = response.data.data.total
           this.drugList = response.data.data.drug
           this.patientList = response.data.data.patients

src/xt_pages/Pharmacy/print/patientPrintTwo.vue

@@ -29,7 +29,7 @@
         <span>入院诊断:{{ getdiagnosis(diagnosis) }}</span>
       </div>
       <div>
-        <table class="table" border="1" 
+        <table class="table" border="1"
           style="border-collapse: collapse;border-left: none;border-right: none;width: 100%;text-align: center;">
           <tr>
             <td>药品名称</td>
@@ -44,13 +44,13 @@
           </tr>
           <tr v-for="item in tableData" >
             <td>{{item.Name}}</td>
-            <td>{{getSpecaiName(item.DrugId)}}</td>
+            <td>{{item.Spec}}</td>
             <td>{{item.SingleDosage}}</td>
             <td>{{item.Frequency}}</td>
             <td>{{ item.Days }}</td>
             <td>{{ item.Usage }}<span>{{item.Total}}</span></td>
-           
-            <td>{{item.Price}}</td> 
+
+            <td>{{item.Price}}</td>
             <td>{{item.Total_cost.toFixed(2)}}</td>
             <td>{{getTime(item.ExecutionTime) }}</td>
           </tr>
@@ -148,11 +148,14 @@ export default {
       this.visibility = true;
       console.log("val",val)
       this.tableData = []
-      this.tableData = val
+      for(let i =0; i < val.length;i++){
+        if(val[i].Type == 1){
+          this.tableData.push(val[i])
+        }
+      }
       this.Doctor = val[0].Doctor
       this.name = data.Name
       this.DialysisNo = data.DialysisNo
-      this.baseList = base
       this.patients = patients
       this.doctors = doctors
       this.diagnosearr = arr
@@ -165,7 +168,7 @@ export default {
       }
       var Price_zong2 =0
       for(let i in this.tableData){
-        
+
         const str = this.tableData[i].Total
         const num = str.replace(/[^\d]/g,"")
         // 每一行的金额
@@ -278,15 +281,7 @@ export default {
       //   ],
       // });
     },
-    getSpecaiName(drug_id){
-       var spc =""
-       for(let i=0;i<this.baseList.length;i++){
-         if(drug_id == this.baseList[i].id){
-           spc = this.baseList[i].dose + this.baseList[i].dose_unit +"*"+this.baseList[i].min_number+this.baseList[i].min_unit+"/"+this.baseList[i].max_unit
-         }
-       }
-       return spc
-    },
+
     getTime(val) {
         if(val < 0){
           return ""
@@ -296,7 +291,7 @@ export default {
         }else {
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
         }
-    }, 
+    },
     getdoctors(id){
       for(let i in this.doctors){
         if(this.doctors[i].id == id){

src/xt_pages/drugSourceCode/drugQuery.vue

@@ -158,7 +158,7 @@
                  highlight-current-row>
 
         <el-table-column align="center" prop="name" label="就诊ID">
-          <template slot-scope="scope">{{scope.row.mdtrt_id}}</template>
+          <template slot-scope="scope">{{scope.row.MdtrtId}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="药品名称">
           <template slot-scope="scope">{{scope.row.MedinsListName}}</template>

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -8,6 +8,14 @@
         <div>{{record_date}}</div>
       </el-form-item>
 
+      <el-form-item label="本次结算应上传最小包装药品追溯码数量：" prop="name" :validate-event="is_Name">
+        <el-input class="number_style" type="number" v-model="form.pack_num" ></el-input>
+      </el-form-item>
+
+      <el-form-item label="本次结算应上传最小包装耗材追溯码数量：" prop="name" :validate-event="is_Name">
+        <el-input class="number_style" type="number" v-model="form.good_pack_num" ></el-input>
+      </el-form-item>
+
       <el-form-item label="总计：" prop="name" :validate-event="is_Name">
         <el-input class="number_style" type="number" v-model="form.total" :disabled="true"></el-input>
       </el-form-item>
@@ -15,7 +23,6 @@
         <el-input class="number_style" type="number" v-model="form.medical_insurance_price" :disabled="true"></el-input>
       </el-form-item>
 
-
       <el-form-item class="number_style" label="自费：" prop="age" :validate-event="is_Name">
         <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
       </el-form-item>
@@ -193,6 +200,8 @@
           { id: 2, name: '使用共济个账' },
         ],
         form: {
+          pack_num:0,
+          good_pack_num:0,
           medical_insurance_price:0,
           private_price:'',//自费12
           pay_way:"",
@@ -264,6 +273,8 @@
           wechat_pay:"",
           ali_pay:"",
           jifen_pay:"",
+          pack_num:0,
+          good_pack_num:0,
         },
 
       }
@@ -387,6 +398,8 @@
 
         if(this.order && this.order.id > 0){
           this.form.acct_pay = this.order.acct_pay
+          this.form.pack_num = this.order.pack_num
+          this.form.good_pack_num = this.order.good_pack_num
           this.form.psn_pay = this.order.psn_cash_pay
           this.form.total = this.order.medfee_sumamt
           this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -97,8 +97,8 @@
                    {{item.count_number }}{{item.unit }}
                 </td>
                 <td style="text-align:center" >
-                   <span v-if="item.is_total == 1">{{ item.total }}</span>
-                   <span v-if="item.is_total == 2">{{ (item.pric * item.count_number).toFixed(2) }}</span>
+                   <span v-if="item.is_total == 1">{{ getAllPice() }}</span>
+                   <span v-if="item.is_total == 2">{{ getT(item) }}</span>
                 </td>
                 <td style="text-align:center" >
                   {{getChrgitmLv(item.medical_insurance_level)}}
@@ -246,6 +246,7 @@
                 cost_type:"",
                 name:"",
                 pric:item.pric,
+                det_sun:item.det_item_fee_sumamt,
                 chrgitm_lv:"",
                 advice_id:item.advice_id,
                 project_id:item.project_id,
@@ -271,8 +272,7 @@
                   arr[i].unit = arr[i].child[0].advice.prescribing_number_unit
                   arr[i].cost_type = arr[i].child[0].advice.drug.drug_type
                   arr[i].medical_insurance_level = arr[i].child[0].chrgitm_lv
-
-
+                 // arr[i].record_date = arr[i].child[0].advice.advice_date
                }
                if(arr[i].project_id > 0){
                   arr[i].record_date = arr[i].child[0].project.record_date
@@ -422,6 +422,8 @@
             }
             this.tableList = []
             this.tableList = tempList
+            console.log("this.tableList")
+            console.log( this.tableList)
 
         }
      })
@@ -705,7 +707,9 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
         if(this.tableList[i].is_total ==2){
-          total_price += (this.tableList[i].pric * parseInt(this.tableList[i].count_number))
+          for(let a = 0; a < this.tableList[i].child.length; a++){
+            total_price += this.tableList[i].child[a].det_item_fee_sumamt
+          }
         }
       }
       if(total_price > 0){
@@ -926,7 +930,15 @@
         }
       }
       return med_chrgitm_type
-    },
+    },getT(item){
+        let total = 0
+        // for()
+          for(let a = 0; a < item.child.length; a++){
+            total += item.child[a].det_item_fee_sumamt
+          }
+          return total.toFixed(2)
+        // console.log(item)
+      },
     getChrgitmLv(value){
       var name = ""
       for(let i=0;i<this.medicalInsuranceLevelList.length;i++){
@@ -958,7 +970,9 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "西药"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
 
@@ -968,7 +982,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "中成药"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -977,7 +994,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "中草药"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -986,7 +1006,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "检验费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -995,7 +1018,10 @@
      var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "输氧费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1004,7 +1030,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "手术费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1013,7 +1042,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "化验费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1022,7 +1054,10 @@
      var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "输血费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1031,7 +1066,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "诊断费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1040,7 +1078,10 @@
      var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "治疗费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1049,7 +1090,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "护理费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1058,7 +1102,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "床位费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1067,7 +1114,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "麻醉费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1076,7 +1126,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "材料费"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)
@@ -1085,7 +1138,10 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].cost_type == "其他"){
-            total_price += this.tableList[i].count_number * this.tableList[i].pric
+            // total_price += this.tableList[i].count_number * this.tableList[i].pric
+           for(let a = 0; a < this.tableList[i].child.length; a++){
+             total_price += this.tableList[i].child[a].det_item_fee_sumamt
+           }
          }
       }
       return total_price.toFixed(2)