hah阿凡达

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1763,7 +1763,7 @@
                             "
                             width="50"
                           >
-                          <span v-if="org_id!=10683">置换量</span>
+                          <span v-if="org_id!=10683">置换量(L)</span>
                           <span v-if="org_id==10683">置换液速度</span>
                             <br />
                             <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724 && org_id!=10644">

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

@@ -1221,7 +1221,10 @@ export default {
               ParamsQuery['mode'] = '3'
             }
           }
-
+          
+          if(this.form.machine_run == 0){
+            this.form.machine_run = ""
+          }
           const data = {}
           data['weight_after'] = this.form.weight_after ? parseFloat(this.form.weight_after) : 0
           data['weight_loss'] = this.form.weight_loss ? parseFloat(this.form.weight_loss) : 0
@@ -1291,7 +1294,7 @@ export default {
           data["lapse"] = this.form.lapse
           data["consciousness"] = this.form.consciousness
           data["fallrisk"] = this.form.fallrisk
-          data["machine_run"] = this.form.machine_run
+          data["machine_run"] = this.form.machine_run?this.form.machine_run:""
           data["after_urea"] = this.form.after_urea
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume

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

@@ -3023,6 +3023,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10735){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '6:30'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            }else if(this.$store.getters.xt_user.org.id == 10353){
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'

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

@@ -2889,7 +2889,7 @@ export default {
         this.form.diastolic_bp = ""; // this.last_monitor_record.diastolic_blood_pressure;
         this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume: "";
         // 静脉压
-        if (this.org_id == 10060 || this.org_id == 10387) {
+        if (this.org_id == 10060 || this.org_id == 10387 || this.org_id ==10735) {
           this.form.venous_pressure = resp.monitor.venous_pressure;
         }else if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10469 || this.org_id == 10471 ){
           this.form.venous_pressure = 80
@@ -2913,7 +2913,7 @@ export default {
         this.form.arterial_pressure_type = resp.monitor.arterial_pressure_type
           ? resp.monitor.arterial_pressure_type
           : 1;
-        if (this.org_id == 10060  || this.org_id == 10387) {
+        if (this.org_id == 10060  || this.org_id == 10387 || this.org_id == 10735) {
           this.form.transmembrane_pressure = resp.monitor.transmembrane_pressure;
         }else if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
           this.form.transmembrane_pressure = 60

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1853,11 +1853,11 @@
                           <span v-if="org_id == 10683">置换液速度</span>
                           <span v-if="org_id!=10683">置换量</span>
                           <br />
-                          <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724 && org_id!=10644">
+                          <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724 && org_id!=10644 && org_id!=10353">
                             <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
                             <span v-if="org_id==10683">(ml/h)</span>
                           </span>
-                          <span v-if="org_id==10598 || org_id == 10567 || org_id == 10724 || org_id == 10644">(L)</span>
+                          <span v-if="org_id==10598 || org_id == 10567 || org_id == 10724 || org_id == 10644 || org_id== 10353">(L)</span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 0 || org_id == 10724">KT/V</td>

src/xt_pages/stock/drugs/components/purchaseDrugQuery.vue

@@ -404,15 +404,25 @@ export default {
               list[i].drugAddOne= 0
               list[i].drugOutOne =0
               list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
-          
+              
+            
               list[i].drugInMoney = list[i].last_price
               list[i].drugSaleMoney = (list[i].drugIn * list[i].drugInMoney).toFixed(2)
 
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-           
-              list[i].drugAddPrice = list[i].last_price
-              list[i].drugAddSalePrice = (list[i].drugAdd * list[i].drugAddPrice).toFixed(2)
+            
+              if(this.org_id == 0 || this.org_id == 10644){
+                list[i].drugAddPrice = ""
+                list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+              }else{
+                list[i].drugAddPrice = list[i].last_price
+                list[i].drugAddSalePrice = (list[i].drugAdd * list[i].drugAddPrice).toFixed(2)
+              }
+
+             
+
+
 
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
@@ -1063,8 +1073,6 @@ export default {
     var total = 0
     var totalone = 0
     var totaltwo = 0
-    var max_str = "";
-    var min_str = "";
     if(arr!=null && arr.length > 0){
       for(let i=0;i<arr.length;i++){
         totalone += arr[i].count
@@ -1081,6 +1089,25 @@ export default {
     return total
 
    },
+   drugAddInfoOnePirce(arr,min_number,min_unit,max_unit,arr2){
+    var total = 0
+    var totalone_price = 0
+    var total_two_price = 0
+    if(arr!=null && arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        totalone_price += arr[i].count * arr[i].price
+      }
+    }
+    if(arr2!=null && arr2.length >0){
+      for(let i=0;i<arr2.length;i++){
+        total_two_price += arr2[i].count * arr[i].price
+      }
+    }
+    total = totalone_price + total_two_price
+
+    
+    return total
+   },
    getdrugAddPrice(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
     var totalone =0

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

@@ -216,6 +216,101 @@ export default {
 
   },
   methods:{
+    GetInitStartFlowPice(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
+      var total_one_price =0
+      var total_two_price = 0
+      var total_three_price =0
+      var total_four_price =0
+      var total_five_price = 0
+      var total =0
+   
+      if(val1!=null && val1.length>0){
+         for(let i=0;i<val1.length;i++){
+          total_one_price +=val1[i].count*val1[i].price
+         }
+      }  
+
+      if(val2!=null && val2.length>0){
+         for(let i=0;i<val2.length;i++){
+          total_two_price +=val2[i].count*val2[i].price
+         }
+      }  
+    
+      console.log("val3",val3)
+      if(val3!=null && val3.length>0){
+         for(let i=0;i<val3.length;i++){
+          total_three_price +=val3[i].count*val3[i].price
+         }
+      }  
+      if(val4!=null && val4.length>0){
+         for(let i=0;i<val4.length;i++){
+          total_four_price +=val4[i].count*val4[i].price
+         }
+      }  
+
+      if(val5!=null && val5.length>0){
+         for(let i=0;i<val5.length;i++){
+          total_five_price +=val5[i].count*val5[i].price
+         }
+      }  
+     
+      var total = (total_one_price + total_two_price -total_three_price-total_four_price + total_five_price).toFixed(2)
+       
+       return total
+    },
+    drugAddInfoOnePirce(arr,min_number,min_unit,max_unit,arr2){
+        var total = 0
+        var totalone_price = 0
+        var total_two_price = 0
+        if(arr!=null && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            totalone_price += arr[i].count * arr[i].price
+          }
+        }
+        if(arr2!=null && arr2.length >0){
+          for(let i=0;i<arr2.length;i++){
+            total_two_price += arr2[i].count * arr[i].price
+          }
+        }
+        total = totalone_price + total_two_price
+
+        
+        return total
+    },
+    getDrugOutPriceOne(arr,min_number,min_unit,max_unit,arr2,arr3){
+    var total = 0
+    var totalone_price = 0
+    var total_two_price = 0
+    var total_three_price = 0
+   
+    if(arr!=null&&arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        totalone_price +=arr[i].count * arr[i].price
+      }
+    }
+    if(arr2!=null && arr2.length>0){
+      for(let i=0;i<arr2.length;i++){
+        total_two_price +=arr2[i].count * arr[i].price
+      }
+    }
+    if(arr3!=null && arr3.length>0){
+      for(let i=0;i<arr3.length;i++){
+        total_three_price +=arr3[i].count * arr[i].price
+      }
+    }
+ 
+    total = (totalone_price + total_two_price - total_three_price).toFixed(2)
+
+    return total
+   },
+   GetDrugOverOnePrice(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      var total = 0
+      
+      total = (totalone + totaltwo - totalthree).toFixed(2)
+       
+      return total
+       
+    },
     changeStorehouseName(){
 
     },
@@ -393,7 +488,7 @@ export default {
                }
              }
 
-            if(this.org_id !=10210 && this.org_id!=0 && this.org_id !=10402 && this.org_id !=10215){
+            if(this.org_id !=10210 && this.org_id !=10402 && this.org_id !=10215){
 
                //  新版
              if(list[i].new_drug_in_flow_info!=null && list[i].new_drug_in_flow_info.length>0){
@@ -447,7 +542,7 @@ export default {
               list[i].drugAddOne= 0
               list[i].drugOutOne =0
               
-              if(this.org_id ==10210  || this.org_id ==10402 || this.org_id ==10215 || this.org_id == 0 || this.org_id ==10191){
+              if(this.org_id ==10210  || this.org_id ==10402 || this.org_id ==10215 || this.org_id ==10191){
                  list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
               }else{
                 list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
@@ -456,10 +551,18 @@ export default {
 
            
               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
-              list[i].drugInMoney = list[i].last_price
-              if(this.org_id == 0 || this.org_id == 10697){
-                list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
+             
+              if(this.org_id == 0 || this.org_id == 10644){
+                list[i].drugInMoney = ""
               }else{
+                list[i].drugInMoney = list[i].last_price
+              }
+              if(this.org_id == 10697){
+                list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
+              }else if(this.org_id == 0 || this.org_id == 10644){
+              
+                list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
+              } else{
                 list[i].drugSaleMoney = "/"
               }
              
@@ -467,10 +570,13 @@ export default {
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               
-              if(this.org_id == 0 || this.org_id == 10697){
+              if( this.org_id == 10697){
                  list[i].drugAddPrice = list[i].last_price
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
-              }else{
+              }else if(this.org_id == 0 || this.org_id == 10644){
+                list[i].drugAddPrice = "/"
+                list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+              } else{
                 list[i].drugAddPrice = "/"
                 list[i].drugAddSalePrice = "/"
               }
@@ -479,10 +585,13 @@ export default {
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
            
-              if(this.org_id == 0 || this.org_id == 10697){
+              if( this.org_id == 10697){
                 list[i].drugOutPrice = list[i].retail_price
                 list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
-              }else{
+              }else if(this.org_id == 0 || this.org_id == 10644){
+                list[i].drugOutPrice = "/"
+                list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
+              } else{
                 list[i].drugOutPrice = "/"
                 list[i].drugOutSalePrice = "/"
               }
@@ -496,17 +605,20 @@ export default {
             }
              
             list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
-            if(this.org_id == 0 || this.org_id == 10697){
+            if(this.org_id == 10697){
                 list[i].overDrugPrice = list[i].retail_price
                 list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
-            }else{
+            }else if(this.org_id == 0 || this.org_id ==10644){
+                list[i].overDrugPrice = ""
+                list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)
+            } else{
              list[i].overDrugPrice = "/"
              list[i].oveDrugSaleMoney = "/"
             }
            
             }
             
-            if(this.org_id == 0 || this.org_id == 10697){
+            if(this.org_id == 10697){
               if(list!=null && list.length>0){
                 var obj = {drug_type:"",drug_name:"合计",dose:"",dose_unit:"",min_number:"",min_unit:"",max_unit:"",medical_insurance_number:"",manufacturer:"",dealer:"",drugIn:"",drugInMoney:"",drugSaleMoney:0,drugAdd:"",drugAddPrice:"",drugAddSalePrice:0,drugOut:"",drugOutPrice:"",drugOutSalePrice:0,overDrug:"",overDrugPrice:"",oveDrugSaleMoney:0}
                 for(let i=0;i<list.length;i++){

src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue

@@ -349,7 +349,7 @@ export default {
                 list[i].drugAddOne= 0
                 list[i].drugOutOne =0
                
-                if(this.org_id ==10210 || this.org_id ==10402 || this.org_id ==10215){
+                if(this.org_id ==10210 || this.org_id ==10402 || this.org_id ==10215  || this.org_id ==10191){
                    list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
                 }else{
                   list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
@@ -357,12 +357,17 @@ export default {
               
                list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
                
-                // list[i].drugInMoney = "/"
-                // list[i].drugSaleMoney = "/"
-
+               if(this.org_id == 0 || this.org_id == 10644){
+                list[i].drugInMoney = ""
+              }else{
                 list[i].drugInMoney = list[i].last_price
-                if(this.org_id == 0 || this.org_id == 10697){
+              }
+
+                if( this.org_id == 10697){
                   list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
+                }else if(this.org_id == 0 || this.org_id == 10644){
+                  list[i].drugAddPrice = ""
+                  list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 }else{
                   list[i].drugSaleMoney = "/"
                 }
@@ -370,27 +375,30 @@ export default {
                 list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                 list[i].drugAddOne= this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                
-                // list[i].drugAddPrice = "/"
-                // list[i].drugAddSalePrice = "/"
-
-                if(this.org_id == 0 || this.org_id == 10697){
+               
+                if(this.org_id == 10697){
                  list[i].drugAddPrice = list[i].last_price
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
-              }else{
-                list[i].drugAddPrice = "/"
-                list[i].drugAddSalePrice = "/"
-              }
-
+                }else if(this.org_id == 0 || this.org_id ==10644){
+                  list[i].drugAddPrice = "/"
+                  list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+                } else{
+                  list[i].drugAddPrice = "/"
+                  list[i].drugAddSalePrice = "/"
+                }
+ 
                 list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
                 list[i].drugOutOne = this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
                 
-                // list[i].drugOutPrice = "/"
-                // list[i].drugOutSalePrice = "/"
+              
 
-                if(this.org_id == 0 || this.org_id == 10697){
+                if( this.org_id == 10697){
                   list[i].drugOutPrice = list[i].retail_price
                   list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
-                }else{
+                }else if(this.org_id == 0 || this.org_id == 10644){
+                  list[i].drugOutPrice = "/"
+                  list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
+                } else{
                   list[i].drugOutPrice = "/"
                   list[i].drugOutSalePrice = "/"
                 }
@@ -401,18 +409,20 @@ export default {
                 }else{
                   list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 }
-                // list[i].overDrugPrice = "/"
-                // list[i].oveDrugSaleMoney = "/"
+               
                 list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
-                if(this.org_id == 0 || this.org_id == 10697){
+                if(this.org_id == 10697){
                   list[i].overDrugPrice = list[i].retail_price
                   list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
-                }else{
+                }else if(this.org_id == 0 || this.org_id ==10644){
+                  list[i].overDrugPrice = ""
+                  list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)
+                } else{
                   list[i].overDrugPrice = "/"
                   list[i].oveDrugSaleMoney = "/"
                 }
             }
-            if(this.org_id == 0 || this.org_id == 10697){
+            if(this.org_id == 10697){
               if(list!=null && list.length>0){
                 var obj = {drug_type:"",drug_name:"合计",dose:"",dose_unit:"",min_number:"",min_unit:"",max_unit:"",medical_insurance_number:"",manufacturer:"",dealer:"",drugIn:"",drugInMoney:"",drugSaleMoney:0,drugAdd:"",drugAddPrice:"",drugAddSalePrice:0,drugOut:"",drugOutPrice:"",drugOutSalePrice:0,overDrug:"",overDrugPrice:"",oveDrugSaleMoney:0}
                 for(let i=0;i<list.length;i++){
@@ -1475,7 +1485,103 @@ export default {
          return 0
        }
      
+    },
+    
+    GetInitStartFlowPice(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
+      var total_one_price =0
+      var total_two_price = 0
+      var total_three_price =0
+      var total_four_price =0
+      var total_five_price = 0
+      var total =0
+   
+      if(val1!=null && val1.length>0){
+         for(let i=0;i<val1.length;i++){
+          total_one_price +=val1[i].count*val1[i].price
+         }
+      }  
+
+      if(val2!=null && val2.length>0){
+         for(let i=0;i<val2.length;i++){
+          total_two_price +=val2[i].count*val2[i].price
+         }
+      }  
+    
+      console.log("val3",val3)
+      if(val3!=null && val3.length>0){
+         for(let i=0;i<val3.length;i++){
+          total_three_price +=val3[i].count*val3[i].price
+         }
+      }  
+      if(val4!=null && val4.length>0){
+         for(let i=0;i<val4.length;i++){
+          total_four_price +=val4[i].count*val4[i].price
+         }
+      }  
+
+      if(val5!=null && val5.length>0){
+         for(let i=0;i<val5.length;i++){
+          total_five_price +=val5[i].count*val5[i].price
+         }
+      }  
+     
+      var total = (total_one_price + total_two_price -total_three_price-total_four_price + total_five_price).toFixed(2)
+       
+       return total
+    },
+    drugAddInfoOnePirce(arr,min_number,min_unit,max_unit,arr2){
+        var total = 0
+        var totalone_price = 0
+        var total_two_price = 0
+        if(arr!=null && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            totalone_price += arr[i].count * arr[i].price
+          }
+        }
+        if(arr2!=null && arr2.length >0){
+          for(let i=0;i<arr2.length;i++){
+            total_two_price += arr2[i].count * arr[i].price
+          }
+        }
+        total = totalone_price + total_two_price
+
+        
+        return total
+    },
+    getDrugOutPriceOne(arr,min_number,min_unit,max_unit,arr2,arr3){
+    var total = 0
+    var totalone_price = 0
+    var total_two_price = 0
+    var total_three_price = 0
+   
+    if(arr!=null&&arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        totalone_price +=arr[i].count * arr[i].price
+      }
+    }
+    if(arr2!=null && arr2.length>0){
+      for(let i=0;i<arr2.length;i++){
+        total_two_price +=arr2[i].count * arr[i].price
+      }
+    }
+    if(arr3!=null && arr3.length>0){
+      for(let i=0;i<arr3.length;i++){
+        total_three_price +=arr3[i].count * arr[i].price
+      }
     }
+ 
+    total = (totalone_price + total_two_price - total_three_price).toFixed(2)
+
+    return total
+   },
+   GetDrugOverOnePrice(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      var total = 0
+      
+      total = (totalone + totaltwo - totalthree).toFixed(2)
+       
+      return total
+       
+    },
    },
     created(){
       this.org_id =  this.$store.getters.xt_user.org_id

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -281,17 +281,21 @@ export default {
                   list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                 }else{
                   list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
-                  // console.log("剩余库存---------------",list[i].stockIn)
+                  
                   if(list[i].stockIn <0){
                     list[i].stockIn =0
                   }
                 }
                
               }
-              //  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
-               if(this.org_id == 0 || this.org_id ==10697){
+             
+               if(this.org_id ==10697){
                   list[i].stock_in_price = list[i].buy_price
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
+               }else if(this.org_id == 0 || this.org_id == 10644){
+                 list[i].stock_in_price = "/"
+                list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)).toFixed(2)
+                
                }else{
                 list[i].stock_in_price = "/"
                 list[i].stockMoney = "/"
@@ -301,23 +305,31 @@ export default {
               
               list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
 
-              if(this.org_id == 0 || this.org_id ==10697){
+              if(this.org_id ==10697){
                list[i].addStockMoney = list[i].buy_price 
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
-              }else{
+              }else if(this.org_id == 0 || this.org_id == 10164){
+                list[i].addStockMoney = "/"
+                list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+              } else{
                list[i].addStockMoney = "/"
                list[i].saleStockMoney = "/"
               }
              
 
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-              if(this.org_id == 0 || this.org_id == 10697){
+              if(this.org_id == 10697){
                 list[i].stockOutprice = list[i].packing_price
                 list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
+              }else if(this.org_id == 0 || this.org_id == 10164){
+                list[i].stockOutprice = "/"
+                list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
               }else{
                 list[i].stockOutprice = "/"
                 list[i].saleOutMoney = "/"
               }
+
+
              
               if(this.org_id == 10265){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
@@ -333,9 +345,13 @@ export default {
                
               }
             
-              if(this.org_id == 0 || this.org_id ==10697){
+              if(this.org_id ==10697){
                 list[i].overPrice = list[i].packing_price
                 list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
+              }else if(this.org_id == 0 || this.org_id ==10644){
+                list[i].overPrice = "/"
+                list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
+                // console.log("hahahha",list[i].overMoney)
               }else{
                 list[i].overPrice = "/"
                 list[i].overMoney = "/"
@@ -351,13 +367,12 @@ export default {
               if(list.length!=null){
                 for(let i=0;i<list.length;i++){
                  
-                  //  obj.stock_in_price += (this.tableList[i].stock_in_price).toFixed(2)
                   obj.stockMoney += parseFloat(list[i].stockMoney) 
-                  //  obj.stockOutprice += (this.tableList[i].stockOutprice).toFixed(2)
+                 
                   obj.saleStockMoney += parseFloat(list[i].saleStockMoney)
 
                   obj.saleOutMoney += parseFloat(list[i].saleOutMoney)
-                  //  obj.overPrice += (this.tableList[i].overPrice).toFixed(2)
+                 
                   obj.overMoney += parseFloat(list[i].overMoney)
 
                 }
@@ -721,6 +736,28 @@ export default {
       return 0
     }
   },
+  getWarehouseInfoOnePrice(val,val2){
+    var count_price =0 
+    var count_one_price = 0
+    var all_count_price = 0
+    if(val!=null && val.length >0){
+     for(let i=0;i<val.length;i++){
+      count_price +=val[i].count * val[i].price
+     }
+    }
+    if(val2!=null && val2.length > 0){
+     for(let i=0;i<val2.length;i++){
+      count_one_price +=val2[i].count * val[i].price
+     }
+    }
+    all_count_price = count_price + count_one_price
+
+    if(all_count_price > 0 ){
+      return all_count_price
+    }else{
+      return 0
+    }
+  },
   getAddStockMony(val,val2){
     var total_price =0 
     var total_price_one = 0
@@ -901,6 +938,35 @@ export default {
       return 0
      }
    },
+   getWarehosueOutInfoPrice(val,val2,val3){
+     var count_price = 0
+     var count_one_price = 0
+     var all_count_price = 0
+     var count_two_price = 0
+     if(val!=null && val.length >0){
+       for(let i=0;i<val.length;i++){
+        count_price += val[i].count * val[i].price
+       }
+     }
+     if(val2!=null && val2.length > 0){
+      for(let i=0;i<val2.length;i++){
+        count_one_price +=val2[i].count  * val[i].price
+      }
+     }
+     if(val3!=null && val3.length > 0){
+      for(let i=0;i<val3.length;i++){
+        count_two_price +=val3[i].count  * val[i].price
+      }
+     }
+     console.log("本期减少",count_price)
+     console.log("盘亏",count_one_price)
+     console.log("退库",all_count_price)
+     all_count_price = count_price +count_one_price - count_two_price
+     console.log("数据我哦我我",all_count_price)
+     if(all_count_price >0){
+       return all_count_price
+     }
+   },
    stockOutprice(val,val2,val3){
      var total_price = 0
      var total_price_one = 0
@@ -1207,6 +1273,17 @@ export default {
       }
       return count
     },
+    getAllStockInPrice(val){
+       var total_price =0
+       if(val!=null && val.length>0){
+         for(let i=0;i<val.length;i++){
+            total_price += val[i].warehousing_count * val[i].price
+         }
+
+       }
+       return total_price
+    },
+
     getAllOutStockIn(val){
        var count = 0 
        if(val!=null && val.length>0){
@@ -1216,6 +1293,15 @@ export default {
        }
        return count
     },
+    getAllOutStockInPrice(val){
+      var total_price = 0 
+       if(val!=null && val.length>0){
+         for(let i=0;i<val.length;i++){
+          total_price += val[i].count * val[i].price
+         }
+       }
+       return total_price
+    },
     getAllStockInFlow(val){
       var count = 0
       if(val!=null && val.length>0){
@@ -1225,6 +1311,15 @@ export default {
       }
       return count
     },
+    getAllStockInFlowPrice(val){
+      var total_price = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+          total_price+= val[i].count * val[i].total_price
+        }
+      }
+      return total_price
+    },
     getAllStockOutFlow(val){
       var count = 0
       if(val!=null && val.length>0){
@@ -1234,6 +1329,15 @@ export default {
       }
       return count
     },
+    getAllStockOutFlowPrice(val){
+      var total_price = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+          total_price+= val[i].count * val[i].price
+        }
+      }
+      return total_price
+    },
     getAllQuery(){
 
      this.getlist()

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -187,7 +187,10 @@ export default {
                     if(this.org_id == 0 || this.org_id ==10697){
                       list[i].stock_in_price = list[i].buy_price
                       list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
-                    }else{
+                    }else if(this.org_id == 0 || this.org_id == 10644){
+                      list[i].stock_in_price = "/"
+                      list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)).toFixed(2)
+                    } else{
                       list[i].stock_in_price = "/"
                       list[i].stockMoney = "/"
                     }
@@ -198,7 +201,10 @@ export default {
                     if(this.org_id == 0 || this.org_id ==10697){
                         list[i].addStockMoney = list[i].buy_price 
                         list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
-                      }else{
+                    }else if(this.org_id == 0 || this.org_id == 10164){
+                      list[i].addStockMoney = "/"
+                      list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+                    }else{
                         list[i].addStockMoney = "/"
                         list[i].saleStockMoney = "/"
                       }
@@ -210,6 +216,9 @@ export default {
                     if(this.org_id == 0 || this.org_id == 10697){
                       list[i].stockOutprice = list[i].packing_price
                       list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
+                    }else if(this.org_id == 0 || this.org_id == 10164){
+                      list[i].addStockMoney = "/"
+                      list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
                     }else{
                       list[i].stockOutprice = "/"
                       list[i].saleOutMoney = "/"
@@ -224,6 +233,9 @@ export default {
                     if(this.org_id == 0 || this.org_id ==10697){
                       list[i].overPrice = list[i].packing_price
                       list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
+                     }else if(this.org_id == 0 || this.org_id == 10164){
+                      list[i].stockOutprice = "/"
+                      list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                      }else{
                         list[i].overPrice = "/"
                         list[i].overMoney = "/"
@@ -359,7 +371,7 @@ export default {
       return "0.00"
      }
    },
-     saleOutprice(val,val2,val3){
+    saleOutprice(val,val2,val3){
      var total_price = 0
      var total_price_one = 0
      var all_price = 0
@@ -792,6 +804,16 @@ export default {
       }
       return count
     },
+    getAllStockInPrice(val){
+       var total_price =0
+       if(val!=null && val.length>0){
+         for(let i=0;i<val.length;i++){
+            total_price += val[i].warehousing_count * val[i].price
+         }
+
+       }
+       return total_price
+    },
     getAllOutStockIn(val){
        var count = 0 
        if(val!=null && val.length>0){
@@ -801,6 +823,15 @@ export default {
        }
        return count
     },
+    getAllStockInFlowPrice(val){
+      var total_price = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+          total_price+= val[i].count * val[i].total_price
+        }
+      }
+      return total_price
+    },
     getAllStockInFlow(val){
       var count = 0
       if(val!=null && val.length>0){
@@ -818,7 +849,78 @@ export default {
         }
       }
       return count
-    } 
+    },
+    getAllOutStockInPrice(val){
+      var total_price = 0 
+       if(val!=null && val.length>0){
+         for(let i=0;i<val.length;i++){
+          total_price += val[i].count * val[i].price
+         }
+       }
+       return total_price
+    },
+    getAllStockOutFlowPrice(val){
+      var total_price = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+          total_price+= val[i].count * val[i].price
+        }
+      }
+      return total_price
+    },
+    getWarehouseInfoOnePrice(val,val2){
+      var count_price =0 
+      var count_one_price = 0
+      var all_count_price = 0
+      if(val!=null && val.length >0){
+      for(let i=0;i<val.length;i++){
+        count_price +=val[i].count * val[i].price
+      }
+      }
+      if(val2!=null && val2.length > 0){
+      for(let i=0;i<val2.length;i++){
+        count_one_price +=val2[i].count * val[i].price
+      }
+      }
+      all_count_price = count_price + count_one_price
+
+      if(all_count_price > 0 ){
+        return all_count_price
+      }else{
+        return 0
+      }
+    },
+    getWarehosueOutInfoPrice(val,val2,val3){
+     var count_price = 0
+     var count_one_price = 0
+     var all_count_price = 0
+     var count_two_price = 0
+     if(val!=null && val.length >0){
+       for(let i=0;i<val.length;i++){
+        count_price += val[i].count * val[i].price
+       }
+     }
+     if(val2!=null && val2.length > 0){
+      for(let i=0;i<val2.length;i++){
+        count_one_price +=val2[i].count  * val[i].price
+      }
+     }
+     if(val3!=null && val3.length > 0){
+      for(let i=0;i<val3.length;i++){
+        count_two_price +=val3[i].count  * val[i].price
+      }
+     }
+     console.log("本期减少",count_price)
+     console.log("盘亏",count_one_price)
+     console.log("退库",all_count_price)
+     all_count_price = count_price +count_one_price - count_two_price
+     console.log("数据我哦我我",all_count_price)
+     if(all_count_price >0){
+       return all_count_price
+     }else{
+      return 0
+     }
+   },
 
    },
     created(){

src/xt_pages/user/courseOfDisease_new.vue

@@ -165,53 +165,7 @@
         width="70%"
         top="0"
         >
-        <div>
-          <div style="display:flex;position: absolute;top: 20px;left: 20%;">
-            <div>
-              取值时间:
-              <el-select v-model="quzhi_date" @change="datachange" placeholder="请选择" style="width: 120px;">
-                <el-option
-                  v-for="item in quzhi_options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </div>
-            <div style="margin:0 10px">
-              <el-date-picker
-               @change="changStartDate"
-                v-model="start_date"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-                style="width: 150px;">
-              </el-date-picker>
-              <span>-</span>
-              <el-date-picker
-               @change="changEndDate"
-                v-model="end_date"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-                style="width: 150px;">
-              </el-date-picker>
-            </div>
-            <div>
-              <el-button type="primary" size="small" @click="autotext_click">
-                生成
-              </el-button>
-              <el-button type="primary" size="small" @click="auto_dialog=false">
-                取消
-              </el-button>
-            </div>
-          </div>
-          <div v-show="AuToShow">
-            <text_content @new_content="newcontent" :patient="patient" :prescriptionList="prescriptionList" :berforList="berforList" 
-            :monitorList="monitorList" :dryweightList="dryweightList" :inpectionList="inpectionList" :dialysisOrderList="dialysisOrderList" 
-            :start_date="start_date" :end_date="end_date" :patient_id="patient_id" :num="num"></text_content>
-          </div>
-        </div>
+     
 
       </el-dialog>
 
@@ -313,12 +267,12 @@
         patient:{},
         AuToShow:false,
 
-        num:22222222
+        num:22222222,
       //   name:"",
       //  gander:"",
       //  age:0,
       //  dialysis_no:"",
-      //  patient_new:{},
+       patient_new:{},
       //  prescriptionList:[],
       //  berforList:[],
       //  monitorList:[],
@@ -577,9 +531,10 @@
         //     }
         //   }
         // })
+         this.getAutoPatientContent()
          this.AuToShow = true
 
-      //  this.getAutoPatientContent()
+      
       },
       // 本周
       getFirstDayOfWeek(date){
@@ -758,6 +713,8 @@
           if(response.data.state == 1){
           
             var prescription =  response.data.data.prescription
+
+            this.patient_new = response.data.data.patient
             var hd_total =0
             var hdArr =[]
             var hdf_total =0

src/xt_pages/user/text_content.vue

@@ -178,6 +178,9 @@ export default{
     },
     num:{
       type:Number
+    },
+    patient_new:{
+      type:Object
     }
    },
   data(){