518合并代码

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1663,7 +1663,7 @@
         this.isVisibility = true
       },
       handleAdviceCommit() {
-        //
+       
           let results = []
           for (let i = 0; i < this.targetAdvices.length; i++) {
             for (let a = 0; a < this.checkedCities.length; a++) {
@@ -1680,9 +1680,8 @@
 
           var date = new Date()
           var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-          var minute =
-            date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-
+          var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+         
           if (results.length > 0) {
             if(!this.isLoading){
               if (this.is_pre == 1) {
@@ -1693,14 +1692,17 @@
                 }
 
                 var arr = this.dialysisPrescription
-                // console.log('arr', arr)
+               
 
                 const ParamsQuery = arr
-                // console.log('医嘱推送2', ParamsQuery)
+                
 
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
-                 ParamsQuery['patient_id'] = this.$route.query.patient_id
+                ParamsQuery['patient_id'] = this.$route.query.patient_id
+                if(this.$route.query.patient_id ==undefined){
+                  ParamsQuery['patient_id'] = this.patient.id
+                }
                 if (this.prescription.creater <= 0) {
                   ParamsQuery['mode'] = '1'
                 } else {
@@ -1713,6 +1715,8 @@
                   }
                 }
                 this.isLoading = true
+                console.log("ParamsQuery233232322323322332232323",ParamsQuery)
+
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -1726,9 +1730,7 @@
                       duration: 2000
                     })
                     var date = new Date()
-
-                    // console.log(this.start_time)
-
+                    
                     const params = {
                       advices: results,
                       advice_date: this.start_time.split(' ')[0],
@@ -1738,7 +1740,14 @@
                       start_time: this.start_time,
                       remark: ''
                     }
-                    CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
+                    var patient_id = 0
+                    if(this.$route.query.patient_id == undefined){
+                       patient_id = this.patient.id
+                    }else{
+                      patient_id = this.$route.query.patient_id
+                    }
+                  
+                    CreateGroupAdvice(patient_id, 0, params).then(
                       rs => {
                         var resp = rs.data
                         if (resp.state == 1) {
@@ -1767,11 +1776,9 @@
                   return
                 }
                 var arr = this.dialysisPrescription
-                // console.log('arr', arr)
-
+                
                 const ParamsQuery = arr
-                // console.log('医嘱推送3', ParamsQuery)
-
+              
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = 1
@@ -1806,7 +1813,13 @@
                       start_time: this.start_time,
                       remark: ''
                     }
-                    CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
+                    var patient_id = 0
+                    if(this.$route.query.patient_id == undefined){
+                       patient_id = this.patient.id
+                    }else{
+                      patient_id = this.$route.query.patient_id
+                    }
+                    CreateGroupAdvice(patient_id, 0, params).then(
                       rs => {
                         var resp = rs.data
                         if (resp.state == 1) {

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -124,8 +124,8 @@
     <div style="display:flex;justify-content: space-around;">
       <div>总费用:{{getAllPice()}}</div>
      <div>个人支付:
-        <span v-if="his_patient.balance_accounts_type == 2"></span> {{getAllPice()}}
-        <span v-if="his_patient.balance_accounts_type != 2"></span> {{getActPay()}}
+        <span v-if="his_record_patient.balance_accounts_type == 2">{{getAllPice()}}</span>
+        <span v-if="his_record_patient.balance_accounts_type != 2">{{getActPay()}}</span>
     </div>
      <div>基金支付记账:{{getFundPaySumamt()}}</div>
      <div>补充医疗支付记账:{{getHifesPay()}}</div>
@@ -179,6 +179,8 @@ export default {
       id:0,
       start_time:"",
       end_time:"",
+      his_record_patient:{},
+      orderList:[],
     }
   },
   methods: {
@@ -220,6 +222,11 @@ export default {
        if(response.data.state == 1){
           var list =  response.data.data.list
           this.his_patient = response.data.data.his_patient
+          this.his_record_patient = response.data.data.his_record_patient
+          console.log("his_record_patient",this.his_record_patient)
+
+          this.orderList = response.data.data.orderList
+          console.log("orderlist2332322333232323232",this.orderList)
           this.list = list
           this.tableData = []
           for(let i=0;i<list.length;i++){
@@ -297,11 +304,10 @@ export default {
                 }
               } 
             }
-            // console.log("项目new_arr",new_arr)
+           
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            // console.log("ar3233223232",new_arr)
-            // new_arr.push(obj)
+           
             this.tableData = new_arr
             }
 
@@ -322,7 +328,7 @@ export default {
             this.tableData = new_arr
           }      
           
-          // console.log("hh233223233232323232322332",this.tableData)
+         
        }
      })
     },
@@ -335,10 +341,8 @@ export default {
     },
     getActPay(){
       var act_pay = 0
-      for(let i=0;i<this.list.length;i++){
-        for(let j=0;j<this.list[i].orders.length;j++){
-           act_pay +=this.list[i].orders[j].acct_pay
-        }
+      for(let i=0;i<this.orderList.length;i++){
+         act_pay += this.orderList[i].psn_part_amt
       }
       return act_pay
     },

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -214,6 +214,7 @@ export default {
       start_time:"",
       end_time:"",
       his_record_patient:{},
+      orderList:[],
     }
   },
   methods: {
@@ -269,8 +270,8 @@ export default {
           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
-          console.log("listw3232323223",list)
-
+          
+          
           var new_arr = []
 
           for(let i=0;i<list.length;i++){
@@ -278,7 +279,7 @@ export default {
                new_arr.push(list[i].orders[j])
             }
           }
-          console.log("new_arr2332323232",new_arr)
+         
 
           var order_info = []
           for(let i=0;i<new_arr.length;i++){
@@ -301,7 +302,7 @@ export default {
             }
           }
 
-          console.log("order_info222222222222",order_info)
+        
           
           //合并，相同的合并在一起
 
@@ -331,7 +332,7 @@ export default {
             dataInfo[item_id].child.push(item)
           })
           let arr = Object.values(dataInfo) 
-          console.log("中欧地区3323323223322332322323323232",arr)
+         
           for(let i=0;i<arr.length;i++){
             for(let j=0;j<arr[i].child.length;j++){
                if(arr[i].advice_id >0){
@@ -366,7 +367,7 @@ export default {
                arr[i].count_number +=arr[i].child[j].cnt
             }
           }
-          console.log("arr2323233232322332",arr)
+       
           for(let i=0;i<arr.length;i++){
             if(arr[i].advice_id >0){
                arr[i].cost_type = this.getDrugType(arr[i].cost_type)
@@ -377,15 +378,15 @@ export default {
             arr[i].total_all = (arr[i].count_number * arr[i].pric).toFixed(2)
           }
           this.tableList = arr
-          console.log("tabl233232323232323232323232",this.tableList)
+    
           this.patient = response.data.data.patient
-          console.log("patient_2323322332",this.patient)
+          
           this.his_patient = response.data.data.his_patient
           this.hisDepatment =  response.data.data.hisDepatment
           this.order =  response.data.data.order
           this.his_record_patient = response.data.data.his_record_patient
           this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList  
-          
+         
           if(this.id == 1){
              var new_arr = []
              for(let i=0;i<this.tableList.length;i++){
@@ -758,8 +759,7 @@ export default {
         let new_drug_ids = this.unique(drug_ids)
         let new_project_ids = this.unique(project_ids)
         let list = []
-         
-         console.log("new_drug_ids232323323232332332233223",new_drug_ids)
+     
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
             let obj = {}
@@ -782,7 +782,7 @@ export default {
             list.push(obj)
 
           }
-          console.log("list23323232233232",list)
+        
 
         }
         if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
@@ -1101,7 +1101,7 @@ export default {
         obj['count'] = count
         this.tableList.push(obj)
       }
-     console.log("表格 2323323232323323323232323232323",this.tableList)
+    
            
       var objOne = {index:"合计",is_total:1,total:0}
       objOne.total = this.getTotalPrice(this.tableList)
@@ -1300,7 +1300,7 @@ export default {
       return total_price.toFixed(2)
     },
     getDrugType(id){
-      console.log("id2332323232233232232323",id)
+
       var name = ""
       for(let i=0;i<this.drugTypeList.length;i++){
          if(id == this.drugTypeList[i].value){

src/xt_pages/outpatientTool/detailPrint.vue

@@ -33,8 +33,8 @@
       <div class="listInfo">
         <div>总费用：{{ getAllPice() }}</div>
         <div>个人支付：
-          <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span>
+          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
           
           <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
           <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
@@ -142,6 +142,7 @@ export default {
       ],
       order:{},
       his_record_patient:{},
+      orderList:[],
     };
   },
   methods: {
@@ -197,8 +198,9 @@ export default {
          
          this.his_record_patient = response.data.data.his_record_patient
 
-          this.hisDepatment = response.data.data.hisDepatment;
-
+         this.hisDepatment = response.data.data.hisDepatment;
+          
+         this.orderList = response.data.data.orderList
           this.order = response.data.data.order
           this.tableData = [];
           for (let i = 0; i < list.length; i++) {
@@ -225,7 +227,7 @@ export default {
           this.tableData.push(obj);
 
 
-          console.log("表哥233232323232233232322323",this.tableData)
+         
           if (this.$route.query.keyword != "") {
             var new_arr = []
             for (let i = 0; i < this.tableData.length; i++) {
@@ -268,7 +270,7 @@ export default {
             objs.total_price = this.getPrice(new_arr)
             new_arr.push(objs)
             this.tableData = new_arr;
-            console.log("表哥2333333333333333333333333333",this.tableData)
+           
           }
 
           if(this.$route.query.id == 1){
@@ -301,10 +303,10 @@ export default {
                 }
               }
             }
-            console.log("项目new_arr",new_arr)
+         
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            console.log("ar3233223232",new_arr)
+           
             for(let i=0;i<new_arr.length;i++){
               new_arr[i].is_total = 1
             }
@@ -330,7 +332,7 @@ export default {
               new_arr[i].is_total = 1
             }
             new_arr.push(obj)
-            console.log("new_arr2332323232",new_arr)
+           
             this.tableData = new_arr
           }
 
@@ -346,15 +348,12 @@ export default {
       }
       return total_price;
     },
-    getActPay() {
-      console.log("hh23h323223323", this.list);
-      var act_pay = 0;
-      for (let i = 0; i < this.list.length; i++) {
-        for (let j = 0; j < this.list[i].orders.length; j++) {
-          act_pay += this.list[i].orders[j].acct_pay;
-        }
+    getActPay(){
+      var act_pay = 0
+      for(let i=0;i<this.orderList.length;i++){
+         act_pay += this.orderList[i].psn_part_amt
       }
-      return act_pay;
+      return act_pay
     },
     getFundPaySumamt() {
       var fund_pay_sumamt = 0;

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -189,7 +189,7 @@
           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
-          console.log("listw3232323223",list)
+          
 
           var new_arr = []
 
@@ -198,7 +198,7 @@
                new_arr.push(list[i].orders[j])
             }
           }
-          console.log("new_arr2332323232",new_arr)
+          
 
           var order_info = []
           for(let i=0;i<new_arr.length;i++){
@@ -220,7 +220,7 @@
               }
             }
           }
-          console.log("order_info222222222222",order_info)
+          
           
           //合并，相同的合并在一起
 
@@ -285,7 +285,7 @@
                arr[i].count_number +=arr[i].child[j].cnt
             }
           }
-          console.log("arr2323233232322332",arr)
+          
           var obj = {is_total:1,total:0}
           obj.total = this.getAllPiceTwo(arr)
           for(let i=0;i<arr.length;i++){
@@ -299,9 +299,9 @@
           arr.push(obj)
 
           this.tableList = arr
-          console.log("打印",this.tableList)
+         
           this.patient = response.data.data.patient
-          console.log("patinet",this.patient)
+         
           this.his_patient = response.data.data.his_patient
           this.hisDepatment =  response.data.data.hisDepatment
           this.order =  response.data.data.order
@@ -310,8 +310,7 @@
           this.schedule = response.data.data.schedule
           this.bedNumber = response.data.data.bedNumber
           if(this.$route.query.keyword !=""){
-            console.log("金拉风3322323232323",this.$route.query.keyword)
-            console.log("Ar23233232323223",this.tableList)
+           
             var new_arr = []
             for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].is_total!=1){
@@ -525,7 +524,7 @@
           
           }
          }
-         console.log("list232332322323332233223232323",list)
+       
         return list
       }, 
     
@@ -1034,7 +1033,7 @@
       return total_price.toFixed(2)
     },
     getDrugType(id){
-      console.log("id2332323232233232232323",id)
+    
       var name = ""
       for(let i=0;i<this.drugTypeList.length;i++){
          if(id == this.drugTypeList[i].value){

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -761,7 +761,7 @@
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-           
+            
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.loading = false

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -595,7 +595,8 @@ export default {
             stockOut: this.recordInfo.recordData
           };
        
-         
+          console.log("parasm2233223233232233232",params)
+        
           const loading = this.$loading({
             lock: true,
             text: 'Loading',