新分支

src/xt_pages/device/airDisinfectTwo.vue

         })
         }, 
       AddCard(){
-        this.dialogFormVisible =  true
+        console.log("storeywowoowow",this.form.storey)
+        if(this.form.storey!=""){
+          console.log("进来2222")
+          getAirDisinfectWayLongTime(this.form.department).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+           
+           var first_total_time = 0
+         
+           var last_total_time = 0
+           if(list!=null && list.length>0){
+              for(let i=0;i<list.length;i++){
+                first_total_time += parseFloat(list[i].first_total_time)
+                last_total_time +=parseFloat(list[i].last_total_time)
+              }
+           
+            this.form.first_total_time = ""
+            this.form.first_total_time = first_total_time
+            this.first_total_time = first_total_time
+            this.form.last_total_time =""
+            this.form.last_total_time = last_total_time
+            this.last_total_time = last_total_time
+            }
+            this.dialogFormVisible = true
+          }  
+        })  
+        }else{
+          console.log("进来11111")
+          this.dialogFormVisible =  true
+        }
+       
       },
       AddCardOne(){
         getAirDisinfectWayLongTime(this.form.department).then(response=>{

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

                         <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
-                        <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
+                        <!-- <td width="60" style="height:20px;line-height:20px">温度<br />°C</td> -->
                         <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
 <!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
 
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
-                        <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
+                        <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td> -->
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
 <!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

                         <table class="table-box" style="margin-bottom: 20px">
                           <tbody>
                             <tr>
-                              <!-- <td width="70">其他记录:</td> -->
+                             <td width="100">输液量(ml):</td>
+                              <td width="100">
+                                <div class="under-line">
+                                  &nbsp;{{record.assessment_after_dislysis.transfusion_volume? record.assessment_after_dislysis.transfusion_volume: ""}}
+                                </div>
+                              </td>
+                              <td width=""></td>
+                            </tr>
+                          </tbody>
+                        </table>
+
+                        <table class="table-box" style="margin-bottom: 20px">
+                          <tbody>
+                            <tr>
                               <td width="70">特殊记录:</td>
                               <td width="">
                                 <div

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

           data["after_urea"] = this.form.after_urea
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
-          datap["transfusion_volume"] = this.form.transfusion_volume
+          data["transfusion_volume"] = this.form.transfusion_volume
           console.log("Data",data)
           console.log("Paramsquery",data)
 

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

           this.advices = tableAdvice;
         }
 
-        var arr = [] 
-        arr = this.unique(this.advices)
+        // var arr = [] 
+        // arr = this.unique(this.advices)
+        // console.log("arriooowo",arr)
+        // if(arr!=null && arr.length >0){
+  
+        //    for(let i=0;i<arr.length;i++){
+        //       if(arr[i].advice_name!="" && arr[i].advice_name!=undefined){
+        //         arr[i].prescription_id_no = 0
+        //         arr[i].prescription_id_no = parseInt(arr[i].prescription_id)  + parseInt(arr[i].groupno)
+        //       }else{
+        //         arr[i].prescription_id_no = 0
+        //       }
+             
+        //    }
+        //    let dataInfo = {}
+        //    arr.forEach((item, index) => {
+        //       let { prescription_id_no } = item
+        //       if (!dataInfo[prescription_id_no]) {
+        //         dataInfo[prescription_id_no] = {
+        //           prescription_id_no:item.prescription_id_no,
+        //           advice_name:item.advice_name,
+        //           start_time:item.start_time,
+        //           single_dose:item.single_dose,
+        //           single_dose_unit:item.unit,
+        //           execution_time:item.execution_time,
+        //           execution_staff:item.execution_staff, 
+        //           advice_doctor:item.advice_doctor,
+        //           checker:item.checker,
+        //           check_time:item.check_time,
+        //           delivery_way:item.delivery_way,
+        //           frequency_type:item.frequency_type,
+        //           prescribing_number:item.prescribing_number,
+        //           prescribing_number_unit:item.prescribing_number_unit,
+        //           single_dose:item.single_dose,
+        //           single_dose_unit:item.single_dose_unit,
+        //           child:[]
+                 
+        //         }
+        //       }
+        //     })
+        //     let newArr = Object.values(dataInfo)
+
+        //     if(newArr!=null && newArr.length>0){
+        //       for(let i=0;i<newArr.length;i++){
+        //         for(let i=0;i<arr[i].length;i++){
+        //            if(newArr[i].prescription_id_no == arr[i].prescription_id_no){
+        //                newArr[i].child.push(arr[i])
+        //            }
+        //         }
+        //       }
+        //     }
+        //     console.log("newARRWOOWOW",newArr)
+
+        // }
+
+
         this.advices = []
         this.advices= arr
-        console.log("wowoowowowo",arr)
+     
         console.log("advices-----------------",this.advices)
 
- 
+         
          
 
         // this.loading = false;

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

                   </tbody>
                 </table>
 
+                <table class="table-box">
+                  <tbody>
+                    <tr>
+                        <td width="100">输液量(ml):</td>
+                        <td width="140">
+                          <div class="under-line">&nbsp;<span>{{ afterdialysis.transfusion_volume ? afterdialysis.transfusion_volume : '' }}</span></div>
+                        </td>
+                        
+                        <td></td>
+                    </tr>
+                  </tbody>
+                </table>
+
+
                 <table class="table-box" style="margin-bottom:20px;">
                   <tbody>
                     <tr>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

         <div class="tableTitle">统计表</div>
         <div>
           <el-button type="primary" @click="exportList">按透析记录导出</el-button>
-          <el-button type="primary" @click="exportListOne">按排班导出</el-button>
+          <el-button type="primary" @click="exportListOne" v-if="org_id!=10558">按排班导出</el-button>
+
+          <el-button type="primary" @click="exportListTwo" v-if="org_id == 10558">按排班导出</el-button>
         </div>
        
         <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
       patient_id:0,
       modeIdCount:[],
       scheduleCount:[],
+      scheduleList:[],
+      org_id:0,
     };
   },
   methods: {
           console.log("modeidcount=====",modeIdCount)
 
         
-         
+          var scheduleList = response.data.data.scheduleList
+          console.log("scheduleList",scheduleList)
+
+
+          if(scheduleList.length!=null && scheduleList.length>0){
+              let dataInfo = {}
+              scheduleList.forEach((item, index) => {
+                let { patient_id } = item
+                if (!dataInfo[patient_id]) {
+                  dataInfo[patient_id] = {
+                    patient_id,
+                    name:item.name,
+                    id_card_no:item.id_card_no,
+                    dialysis_no:item.dialysis_no,
+                    total_dialysis:item.total_dialysis,
+                    user_sys_before_count:item.user_sys_before_count,
+                    mode_id: []
+                  }
+                }
+              })
+              let list = Object.values(dataInfo)
+              list.map(item => {
+              for (let i = 0; i < list.length; i++) {
+                if (item.patient_id === list[i].patient_id) {
+                  item.mode_id.push(list[i].mode_id)
+                }
+              }
+             })
+             
+             console.log("listowowowoowowowow",list)
+
+             this.scheduleList = []
+             this.scheduleList = list
+          }
 
           for(let i=0;i<modeIdCount.length;i++){
             if(modeIdCount[i].mode_id == 1){
               }
             }
           })
-        //  console.log("list---",list)
+        
           this.DialysisData = list
          }
       })
         })
       },
 
+
+      exportListTwo(){
+       for(let i=0;i<this.scheduleList.length;i++){
+         this.scheduleList[i].index = i+1
+         this.scheduleList[i].HD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD")
+         this.scheduleList[i].HDF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF")
+         this.scheduleList[i].HDHP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD+HP")
+         this.scheduleList[i].HP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HP")
+         this.scheduleList[i].HF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HF")
+         this.scheduleList[i].SCUF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"SCUF")
+         this.scheduleList[i].IUF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"IUF")
+         this.scheduleList[i].HFHD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HFHD")
+         this.scheduleList[i].HFHDHP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HFHD+HP")
+         this.scheduleList[i].HDFHP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF+HP")
+         this.scheduleList[i].CRRT = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"CRRT")
+         this.scheduleList[i].OTR = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"腹水回输")
+
+         this.scheduleList[i].IUFHD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"IUF+HD")
+         this.scheduleList[i].UF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"UF")
+         this.scheduleList[i].HDPlus = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD+")
+         this.scheduleList[i].IHDF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"I-HDF")
+         this.scheduleList[i].HDGT = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD高通")
+         this.scheduleList[i].CVVH = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"CVVH")
+         this.scheduleList[i].CVVHD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"CVVHD")
+         this.scheduleList[i].CVVHDF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"CVVHDF")
+         this.scheduleList[i].PE = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"PE")
+         this.scheduleList[i].XUEHP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"血浆胆红素吸附+HP")
+         this.scheduleList[i].HPD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HPD")
+         this.scheduleList[i].HDP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDP")
+
+         this.scheduleList[i].age = this.getAge(this.scheduleList[i].id_card_no)
+         this.scheduleList[i].total_count = this.getScheduleDialysisCount(this.scheduleList[i].patient_id)
+       }
+       console.log("hhh2323323232",this.scheduleList)
+       import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
+
+        const data = this.formatJson(filterVal, this.scheduleList)
+
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析详情'
+         })
+          this.downloadLoading = false
+        })
+      },
+
       formatJson(filterVal, jsonData) {
         return jsonData.map(v =>
           filterVal.map(j => {
 
   },
   created(){
+    this.org_id = this.$store.getters.xt_user.org.id
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    nowDate.setMonth(nowDate.getMonth() - 3);
+    nowDate.setMonth(nowDate.getMonth() - 1);
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();