hah阿凡达

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1748,7 +1748,7 @@
                           置换液的速度<br />(ml/h)
                           </td>
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
-                          <td width="50" v-if=" org_id ==0 || org_id ==10489">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if=" org_id ==0 || org_id ==10489 || org_id == 10735">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />
                             <span v-if="org_id!=10471"> (ml)</span>
                             <span v-if="org_id==10471">L</span>
@@ -1989,7 +1989,7 @@
                           <td width="50" v-if="org_id == 10375"><br />
                             {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
                           </td>
-                          <td width="50" v-if="org_id == 10489 || org_id ==0"><br />
+                          <td width="50" v-if="org_id == 10489 || org_id ==0 || org_id == 10735"><br />
 
                                    {{
                                      monitor_record.ultrafiltration_rate

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

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

src/xt_pages/dialysis/doctorAdviceStaticPrint.vue

@@ -141,7 +141,7 @@
                   let { advice_name } = item
                   if (!dataInfo[advice_name]) {
                     dataInfo[advice_name] = {
-                      advice_name:item.advice_name,
+                      advice_name:item.advice_name.replace(/\s+/g, ''),
                       child: [],
                       count:0,
                       drug_id:item.drug_id,
@@ -157,7 +157,7 @@
                 if(arr.length > 0){
                   for(let i=0;i<doctorList.length;i++){
                     for(let j=0;j<arr.length;j++){
-                      if(doctorList[i].advice_name == arr[j].advice_name){
+                      if(doctorList[i].advice_name.replace(/\s+/g, '') == arr[j].advice_name){
                           arr[j].child.push(doctorList[i])
                       }
                     }

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -55,9 +55,9 @@
             <el-button type="primary" @click="toSeachOne">搜索</el-button>
           </div>
           <div style="flex: 1;text-align: right;">
-            <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=0  && org_id!=10340">药品统计</el-button>
+            <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=10340">药品统计</el-button>
 
-            <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 0 || org_id==10340">药品统计</el-button>
+            <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id==10340">药品统计</el-button>
             <el-button type="primary" size="small" @click="toStaticThree">药品月统计</el-button>
 
             <el-button type="primary" size="small" @click="toStaticTwo">耗材统计</el-button>
@@ -2081,7 +2081,7 @@ export default {
                   let { advice_name } = item
                   if (!dataInfo[advice_name]) {
                     dataInfo[advice_name] = {
-                      advice_name:item.advice_name,
+                      advice_name:item.advice_name.replace(/\s+/g, ''),
                       child: [],
                       count:0,
                       drug_id:item.drug_id,
@@ -2098,7 +2098,7 @@ export default {
                 if(arr.length > 0){
                   for(let i=0;i<doctorList.length;i++){
                     for(let j=0;j<arr.length;j++){
-                      if(doctorList[i].advice_name == arr[j].advice_name){
+                      if(doctorList[i].advice_name.replace(/\s+/g, '') == arr[j].advice_name){
                           arr[j].child.push(doctorList[i])
                       }
                     }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1841,7 +1841,7 @@
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
-                        <td width="50" v-if="org_id ==10489">超滤率<br/>(ml/h)</td>
+                        <td width="50" v-if="org_id ==10489 || org_id == 10735 || org_id == 0">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600&& org_id != 10683">
                           超滤量<br />
                          <span v-if="org_id == 10471">L</span>
@@ -1970,7 +1970,7 @@
                         <td v-if="org_id == 10375"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
-                        <td v-if="org_id == 10489 "><br />
+                        <td v-if="org_id == 10489 || org_id == 10735 || org_id == 0"><br />
                           {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}
                         </td>
                         <td v-if="org_id!=10600 && org_id!=10644  && org_id!=10683">
@@ -5431,7 +5431,7 @@ export default {
               tempmonitorflag = false;
             }
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
-              if(this.org_id!=10683){
+              if(this.org_id!=10683 && this.org_id!=0  && this.org_id!=10644){
                 this.monitors[index].end = "【结束透析】";
               }
             }

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

@@ -304,6 +304,10 @@ export default {
     return total
    },
    GetDrugOverOnePrice(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+
+    console.log("hahhahha",totalone)
+    console.log("totaltwo",totaltwo)
+    console.log("totalthree",totalthree)
       var total = 0
       
       total = (totalone + totaltwo - totalthree).toFixed(2)

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -308,7 +308,7 @@ export default {
               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 if(this.org_id == 0 || this.org_id == 10164){
+              }else if(this.org_id == 0 || this.org_id == 10644){
                 list[i].addStockMoney = "/"
                 list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
               } else{
@@ -321,9 +321,13 @@ export default {
               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){
+              }else if(this.org_id == 0 || this.org_id == 10644){
                 list[i].stockOutprice = "/"
                 list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
+                if(list[i].saleOutMoney == "NaN"){
+                  list[i].saleOutMoney = ""
+                }
+                console.log("list[i].saleOutMoney",list[i].saleOutMoney)
               }else{
                 list[i].stockOutprice = "/"
                 list[i].saleOutMoney = "/"
@@ -350,6 +354,9 @@ export default {
                 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 = "/"
+                console.log("stockMoney-00000000000000",list[i].stockMoney)
+                console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)
+                console.log("saleOutMoney-00000000000000",list[i].saleOutMoney)
                 list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
                 // console.log("hahahha",list[i].overMoney)
               }else{

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -201,9 +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 if(this.org_id == 0 || this.org_id == 10164){
+                    }else if(this.org_id == 0 || this.org_id == 10644){
                       list[i].addStockMoney = "/"
                       list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+                     
                     }else{
                         list[i].addStockMoney = "/"
                         list[i].saleStockMoney = "/"
@@ -216,9 +217,10 @@ 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){
+                    }else if(this.org_id == 0 || this.org_id == 10644){
                       list[i].addStockMoney = "/"
                       list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+                      
                     }else{
                       list[i].stockOutprice = "/"
                       list[i].saleOutMoney = "/"
@@ -233,9 +235,12 @@ 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){
+                     }else if(this.org_id == 0 || this.org_id == 10644){
                       list[i].stockOutprice = "/"
                       list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
+                      if(list[i].saleOutMoney == "NaN"){
+                        list[i].saleOutMoney = ""
+                      }
                      }else{
                         list[i].overPrice = "/"
                         list[i].overMoney = "/"

src/xt_pages/user/courseOfDisease_new.vue

@@ -248,7 +248,7 @@
           <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>
+            :start_date="start_date" :end_date="end_date" :patient_id="patient_id" :num="num" :longAdvice="longAdvice"></text_content>
           </div>
         </div>
 
@@ -340,9 +340,9 @@
         template_id:0,
         title:"",
         templateList:[],
-        tab:[{id:1,name:'人促红注射液',type:'长期医嘱',start:'2024-12-04',dosage:"3000iu",pinlv:'一周三次',status:''},
-            {id:2,name:'人促红注射液2',type:'长期医嘱',start:'2024-12-05',dosage:"3000iu",pinlv:'一周三次',status:''}, 
-        ],
+        // tab:[{id:1,name:'人促红注射液',type:'长期医嘱',start:'2024-12-04',dosage:"3000iu",pinlv:'一周三次',status:''},
+        //     {id:2,name:'人促红注射液2',type:'长期医嘱',start:'2024-12-05',dosage:"3000iu",pinlv:'一周三次',status:''}, 
+        // ],
         prescriptionList:[],
         berforList:[],
         monitorList:[],
@@ -352,7 +352,8 @@
         patient:{},
         AuToShow:false,
 
-        num:22222222
+        num:"",
+        longAdvice:[]
       //   name:"",
       //  gander:"",
       //  age:0,
@@ -567,8 +568,8 @@
       auto_click(){
         this.start_date = this.getFirstDayOfWeek(new Date())
         this.end_date = this.getTime(new Date())
-        // this.getAutoPatientContent()
-        this.auto_dialog = true
+        this.getAutoPatientContent()
+        // this.auto_dialog = true
       },
       autotext_click(){
         
@@ -1246,7 +1247,7 @@
             
             this.patient = {}
             var patient = response.data.data.patient
-            console.log("patinet-=================",patient)
+           
             if(patient.gender == 1){
                patient.gender_name = "男"
             }
@@ -1254,8 +1255,7 @@
                patient.gender_name = "女"
             }
 
-           this.patient2 = patient
-           console.log('this.patient2',this.patient2);
+           this.patient = patient
             var dialysisOrderList =response.data.data.dialysisOrder
             
             var total_count = 0
@@ -1404,7 +1404,10 @@
             
            
            var longAdvice = response.data.data.longAdvice
+           console.log("longAdvice-------------------------",longAdvice)
+           this.longAdvice = longAdvice
 
+            this.auto_dialog  =  true
 
             // const contents = `<table border="1" class="table" style="border-collapse: collapse;width: 100%;">
             //   <tr>

src/xt_pages/user/firstDiseasePrint.vue

@@ -49,6 +49,7 @@
 
             </div>
           </div>
+           <span style="font-size:20px">主诉内容：</span>
             <div class="inline_block" style="margin-left: 30px">
                    <div v-html="hosDetail.main_content"> </div>
             </div>