新分支

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -525,9 +525,9 @@
         </div>
       </div>
       
-      <!-- <div style="margin-left: 1050px; margin-bottom: 10px;">
+      <div style="margin-left: 1050px; margin-bottom: 10px;">
         <el-button type="primary" size="small" @click="toExport">导出</el-button>
-      </div> -->
+      </div>
 
       <el-table
         :row-style="{ color: '#303133' }"
@@ -2220,6 +2220,7 @@ export default {
         
          if(this.SchedualPatientsTableData!=null){
           for(let i=0;i<this.SchedualPatientsTableData.length;i++){
+
              this.SchedualPatientsTableData[i].index = i + 1
              this.SchedualPatientsTableData[i].start_time_one = ""
              this.SchedualPatientsTableData[i].start_time_two = ""
@@ -2228,46 +2229,181 @@ export default {
              this.SchedualPatientsTableData[i].start_time_five = ""
              this.SchedualPatientsTableData[i].start_time_six = ""
              this.SchedualPatientsTableData[i].start_time_seven = ""
+
+             this.SchedualPatientsTableData[i].blood_press_one = ""
+             this.SchedualPatientsTableData[i].blood_press_two = ""
+             this.SchedualPatientsTableData[i].blood_press_three = ""
+             this.SchedualPatientsTableData[i].blood_press_four = ""
+             this.SchedualPatientsTableData[i].blood_press_five = ""
+             this.SchedualPatientsTableData[i].blood_press_six = ""
+             this.SchedualPatientsTableData[i].blood_press_seven = ""
+
+
+             this.SchedualPatientsTableData[i].temperature_one = ""
+             this.SchedualPatientsTableData[i].temperature_two = ""
+             this.SchedualPatientsTableData[i].temperature_three = ""
+             this.SchedualPatientsTableData[i].temperature_four = ""
+             this.SchedualPatientsTableData[i].temperature_five = ""
+             this.SchedualPatientsTableData[i].temperature_six = ""
+             this.SchedualPatientsTableData[i].temperature_seven = ""
+
+             this.SchedualPatientsTableData[i].breathing_rate_one = ""
+             this.SchedualPatientsTableData[i].breathing_rate_two = ""
+             this.SchedualPatientsTableData[i].breathing_rate_three = ""
+             this.SchedualPatientsTableData[i].breathing_rate_four = ""
+             this.SchedualPatientsTableData[i].breathing_rate_five = ""
+             this.SchedualPatientsTableData[i].breathing_rate_six = ""
+             this.SchedualPatientsTableData[i].breathing_rate_seven = ""
+
+             this.SchedualPatientsTableData[i].pulse_frequency_one = ""
+             this.SchedualPatientsTableData[i].pulse_frequency_two = ""
+             this.SchedualPatientsTableData[i].pulse_frequency_three = ""
+             this.SchedualPatientsTableData[i].pulse_frequency_four = ""
+             this.SchedualPatientsTableData[i].pulse_frequency_five = ""
+             this.SchedualPatientsTableData[i].pulse_frequency_six = ""
+             this.SchedualPatientsTableData[i].pulse_frequency_seven = ""
+
+
+
+
+
              if(this.SchedualPatientsTableData[i].monitoring_record!=null&&this.SchedualPatientsTableData[i].monitoring_record.length>0){
              
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==1){
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=1){
                 if(this.SchedualPatientsTableData[i].monitoring_record[0].operate_time!=undefined){
                 this.SchedualPatientsTableData[i].start_time_one =this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[0].operate_time) 
                }
+               if(this.SchedualPatientsTableData[i].monitoring_record[0].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[0].diastolic_blood_pressure!=undefined ){
+                this.SchedualPatientsTableData[i].blood_press_one = this.SchedualPatientsTableData[i].monitoring_record[0].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[0].diastolic_blood_pressure
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[0].temperature!=undefined){
+                this.SchedualPatientsTableData[i].temperature_one =   this.SchedualPatientsTableData[i].monitoring_record[0].temperature
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[0].breathing_rate!=undefined){
+                 this.SchedualPatientsTableData[i].breathing_rate_one = this.SchedualPatientsTableData[i].monitoring_record[0].breathing_rate
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[0].pulse_frequency!=undefined){
+                this.SchedualPatientsTableData[i].pulse_frequency_one = this.SchedualPatientsTableData[i].monitoring_record[0].pulse_frequency
+               }
+               
               }
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==2){
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=2){
                 if(this.SchedualPatientsTableData[i].monitoring_record[1].operate_time!=undefined){
                 this.SchedualPatientsTableData[i].start_time_two = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[1].operate_time)
                }
+               if(this.SchedualPatientsTableData[i].monitoring_record[1].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[1].diastolic_blood_pressure!=undefined ){
+                this.SchedualPatientsTableData[i].blood_press_two = this.SchedualPatientsTableData[i].monitoring_record[1].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[1].diastolic_blood_pressure
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[1].temperature!=undefined){
+                this.SchedualPatientsTableData[i].temperature_two =   this.SchedualPatientsTableData[i].monitoring_record[1].temperature
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[1].breathing_rate!=undefined){
+                 this.SchedualPatientsTableData[i].breathing_rate_two = this.SchedualPatientsTableData[i].monitoring_record[1].breathing_rate
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[1].pulse_frequency!=undefined){
+                this.SchedualPatientsTableData[i].pulse_frequency_two = this.SchedualPatientsTableData[i].monitoring_record[1].pulse_frequency
+               }
               }
 
-              if(this.SchedualPatientsTableData[i].monitoring_record.length==3){
+              if(this.SchedualPatientsTableData[i].monitoring_record.length>=3){
                 if(this.SchedualPatientsTableData[i].monitoring_record[2].operate_time!=undefined){
                  this.SchedualPatientsTableData[i].start_time_three = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[2].operate_time) 
                }   
+               if(this.SchedualPatientsTableData[i].monitoring_record[2].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[2].diastolic_blood_pressure!=undefined ){
+                this.SchedualPatientsTableData[i].blood_press_three = this.SchedualPatientsTableData[i].monitoring_record[2].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[2].diastolic_blood_pressure
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[2].temperature!=undefined){
+                this.SchedualPatientsTableData[i].temperature_three =   this.SchedualPatientsTableData[i].monitoring_record[2].temperature
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[2].breathing_rate!=undefined){
+                 this.SchedualPatientsTableData[i].breathing_rate_three = this.SchedualPatientsTableData[i].monitoring_record[2].breathing_rate
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[2].pulse_frequency!=undefined){
+                this.SchedualPatientsTableData[i].pulse_frequency_three= this.SchedualPatientsTableData[i].monitoring_record[2].pulse_frequency
+               }
               }
               
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==4){
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=4){
                 if(this.SchedualPatientsTableData[i].monitoring_record[3].operate_time!=undefined){
                   this.SchedualPatientsTableData[i].start_time_four = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[3].operate_time)
                 }
+                if(this.SchedualPatientsTableData[i].monitoring_record[3].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[3].diastolic_blood_pressure!=undefined ){
+                this.SchedualPatientsTableData[i].blood_press_four = this.SchedualPatientsTableData[i].monitoring_record[3].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[3].diastolic_blood_pressure
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[3].temperature!=undefined){
+                this.SchedualPatientsTableData[i].temperature_four = this.SchedualPatientsTableData[i].monitoring_record[3].temperature
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[3].breathing_rate!=undefined){
+                 this.SchedualPatientsTableData[i].breathing_rate_four = this.SchedualPatientsTableData[i].monitoring_record[3].breathing_rate
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[3].pulse_frequency!=undefined){
+                this.SchedualPatientsTableData[i].pulse_frequency_four= this.SchedualPatientsTableData[i].monitoring_record[3].pulse_frequency
+               }
               }
             
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==5){
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=5){
                 if(this.SchedualPatientsTableData[i].monitoring_record[4].operate_time!=undefined){
                   this.SchedualPatientsTableData[i].start_time_five = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[4].operate_time) 
                 }
+                if(this.SchedualPatientsTableData[i].monitoring_record[4].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[4].diastolic_blood_pressure!=undefined ){
+                this.SchedualPatientsTableData[i].blood_press_five = this.SchedualPatientsTableData[i].monitoring_record[4].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[4].diastolic_blood_pressure
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[4].temperature!=undefined){
+                this.SchedualPatientsTableData[i].temperature_five =   this.SchedualPatientsTableData[i].monitoring_record[4].temperature
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[4].breathing_rate!=undefined){
+                 this.SchedualPatientsTableData[i].breathing_rate_five = this.SchedualPatientsTableData[i].monitoring_record[4].breathing_rate
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[4].pulse_frequency!=undefined){
+                this.SchedualPatientsTableData[i].pulse_frequency_five= this.SchedualPatientsTableData[i].monitoring_record[4].pulse_frequency
+               }
               }
               
-              if(this.SchedualPatientsTableData[i].monitoring_record.length ==6){
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >=6){
                 if(this.SchedualPatientsTableData[i].monitoring_record[5].operate_time!=undefined){
                 this.SchedualPatientsTableData[i].start_time_six = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[5].operate_time) 
                }
+               if(this.SchedualPatientsTableData[i].monitoring_record[5].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[5].diastolic_blood_pressure!=undefined ){
+                this.SchedualPatientsTableData[i].blood_press_six = this.SchedualPatientsTableData[i].monitoring_record[5].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[5].diastolic_blood_pressure
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[5].temperature!=undefined){
+                this.SchedualPatientsTableData[i].temperature_six =   this.SchedualPatientsTableData[i].monitoring_record[5].temperature
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[5].breathing_rate!=undefined){
+                 this.SchedualPatientsTableData[i].breathing_rate_six = this.SchedualPatientsTableData[i].monitoring_record[5].breathing_rate
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[5].pulse_frequency!=undefined){
+                this.SchedualPatientsTableData[i].pulse_frequency_six= this.SchedualPatientsTableData[i].monitoring_record[5].pulse_frequency
+               }
+
+
               }
-              if(this.SchedualPatientsTableData[i].monitoring_record.length == 7){
+              if(this.SchedualPatientsTableData[i].monitoring_record.length >= 7){
                 if(this.SchedualPatientsTableData[i].monitoring_record[6].operate_time!=undefined){
                  this.SchedualPatientsTableData[i].start_time_seven = this.getTimeOne(this.SchedualPatientsTableData[i].monitoring_record[6].operate_time) 
                }
+               if(this.SchedualPatientsTableData[i].monitoring_record[6].systolic_blood_pressure!=undefined &&this.SchedualPatientsTableData[i].monitoring_record[6].diastolic_blood_pressure!=undefined ){
+                this.SchedualPatientsTableData[i].blood_press_seven = this.SchedualPatientsTableData[i].monitoring_record[6].systolic_blood_pressure + "/" +this.SchedualPatientsTableData[i].monitoring_record[6].diastolic_blood_pressure
+               }
+               if(this.SchedualPatientsTableData[i].monitoring_record[6].temperature!=undefined){
+                this.SchedualPatientsTableData[i].temperature_seven =   this.SchedualPatientsTableData[i].monitoring_record[6].temperature
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[6].breathing_rate!=undefined){
+                 this.SchedualPatientsTableData[i].breathing_rate_seven = this.SchedualPatientsTableData[i].monitoring_record[6].breathing_rate
+               }
+
+               if(this.SchedualPatientsTableData[i].monitoring_record[6].pulse_frequency!=undefined){
+                this.SchedualPatientsTableData[i].pulse_frequency_seven= this.SchedualPatientsTableData[i].monitoring_record[6].pulse_frequency
+               }
               }
            
             
@@ -2278,10 +2414,11 @@ export default {
           
          }
          console.log("监测统计",this.SchedualPatientsTableData)
-         const multiHeader = [['序号','机号','排班日期','上机时间','透析号','姓名','透析模式','目标超滤量','透前血压','干体重','透前称重','透后称重','监测时间']]
-         const header = ['','','','','','','','','','','','1','2','3','4','5','6','7']
-         const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:D2', 'E1:E2','F1:F2','G1:G2','H1:H2', 'I1:I2','J1:J2','K1:K2','L1:L2','M1:S1']
-          const filterVal = ['index', 'number', 'sch_time', 'start_time', 'dialysis_no', 'name', 'mode_name', 'target_ultrafiltration', 'pressure_name', 'dry_weight', 'dialysis_before_weight', 'dialysis_after_weight','start_time_one','start_time_one','start_time_one','start_time_one','start_time_one','start_time_one','start_time_one']
+        
+         const multiHeader = [['序号','机号','排班日期','上机时间','透析号','姓名','透析模式','目标超滤量','透前血压','干体重','透前称重','透后称重','监测时间','','','','','','','透中血压','','','','','','','体温','','','','','','','呼吸','','','','','','','脉搏','','','','','','']]
+         const header = ['','','','','','','','','','','','','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次',]
+         const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:D2', 'E1:E2','F1:F2','G1:G2','H1:H2', 'I1:I2','J1:J2','K1:K2','L1:L2','M1:S1','T1:Z1','AA1:AG1','AH1:AN1','AO1:AU1']
+        const filterVal = ['index', 'number', 'sch_time', 'start_time', 'dialysis_no', 'name', 'mode_name', 'target_ultrafiltration', 'pressure_name', 'dry_weight', 'dialysis_before_weight', 'dialysis_after_weight','start_time_one','start_time_two','start_time_three','start_time_four','start_time_five','start_time_six','start_time_seven','blood_press_one','blood_press_two','blood_press_three','blood_press_four','blood_press_five','blood_press_six','blood_press_seven','temperature_one','temperature_two','temperature_three','temperature_four','temperature_five','temperature_six','temperature_seven','breathing_rate_one','breathing_rate_two','breathing_rate_three','breathing_rate_four','breathing_rate_five','breathing_rate_six','breathing_rate_seven','pulse_frequency_one','pulse_frequency_two','pulse_frequency_three','pulse_frequency_four','pulse_frequency_five','pulse_frequency_six','pulse_frequency_seven']
      
          const data = this.formatJson(filterVal, this.SchedualPatientsTableData) 
          const filename = '监测数据'

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -48,7 +48,7 @@
         </el-date-picker>
         <el-button type="primary" size="small" @click="toPrint">打印</el-button>
 
-        <el-button type="primary" size="small" @click="toExport">导出</el-button>
+        <!-- <el-button type="primary" size="small" @click="toExport">导出</el-button> -->
 
       </div>
       <div></div>

src/xt_pages/role/admin.vue

@@ -57,15 +57,24 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTestThree">创建合同</el-button> -->
+          @click="toTestThree">创建合同</el-button>
 
-          <!-- <el-button
+          <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toTestSeven">添加合同签署人</el-button> -->
 
+         
+         <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestNight">后台签署</el-button> -->
+          
+
           <!-- <el-button   type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
@@ -227,7 +236,7 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -581,6 +590,15 @@ export default {
            this.$message.success("保存")
         }
       })
+    },
+    toTestNight(){
+      toTestNight().then(response=>{
+        if(response.data.state == 1){
+          var sign =  response.data.data.sign
+          console.log("sign",sign)
+          this.$message.success("保存")
+        }
+      })
     }
   },
   watch: {