Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/Dialysisanalysis/new_otherIndicators/index.vue

@@ -49,7 +49,7 @@ export default {
       this.indicators = []
       getStatisticsList(params).then(response => {
         if (response.data.state == 1) {
-          this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
+          // this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
           console.log('444444444',this.indicators);
           for(let i = 0; i < this.indicators.length; i++){
             this.indicators[i]["check_type"] = 1

src/xt_pages/Dialysisanalysis/weightblood/components/after_Blood.vue

@@ -49,19 +49,19 @@
           <div class="echart" id="mychart"  style="width:100%;height:60vh"></div>
         </div>
 
-          <div style="position: fixed;right: 5%;top: 50vh;">
-            <el-popover
-              placement="left"
-              title="提示"
-              width="500"
-              trigger="click"
-              content="1. 统计时间段内所有患者每次透析时的年龄和透前血压，根据不同年龄的标准值计算达标率。
-                        2. 患者＜60 岁的透前血压以收缩压＜140 或舒张压＜90 为达标值；患者≥60岁的透前血压以收缩压＜160 或舒张压＜90 为达标值。
-                        3. 控制率=（≥60 岁患者的达标例次+＜60 岁患者的达标例次）/时间段内总例次 x100%。">
-              <img src="@/assets/img/xiang.png" alt="" style="height: 20px;width: 20px;" slot="reference">
-              <!-- <el-button slot="reference">click 激活</el-button> -->
-            </el-popover>
-          </div>
+        <div style="position: fixed;right: 5%;top: 50vh;">
+          <el-popover
+            placement="left"
+            title="提示"
+            width="500"
+            trigger="click"
+            content="1. 统计时间段内所有患者每次透析时的年龄和透前血压，根据不同年龄的标准值计算达标率。
+                      2. 患者＜60 岁的透前血压以收缩压＜140 或舒张压＜90 为达标值；患者≥60岁的透前血压以收缩压＜160 或舒张压＜90 为达标值。
+                      3. 控制率=（≥60 岁患者的达标例次+＜60 岁患者的达标例次）/时间段内总例次 x100%。">
+            <img src="@/assets/img/xiang.png" alt="" style="height: 20px;width: 20px;" slot="reference">
+            <!-- <el-button slot="reference">click 激活</el-button> -->
+          </el-popover>
+        </div>
       </div>
     </div>
 
@@ -130,6 +130,7 @@
               style="width: 100%;"
               :header-cell-style = "{'text-align':'center'}"
               :cell-style="{'text-align':'center'}"
+              v-loading="loading"
               height="380">
               <el-table-column
                 prop="index"
@@ -217,6 +218,7 @@ import html2canvas from "html2canvas"
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
         status_id:"",
+        loading:false,
       }
     },
     methods:{
@@ -398,6 +400,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading =true
         Getbpdetail(params).then(response =>{
           if(response.data.state ==1){
             const list = response.data.data.list
@@ -419,6 +422,7 @@ import html2canvas from "html2canvas"
               this.total = response.data.data.total
             }
           }
+          this.loading =false
           console.log('55555透后',response);
         })
       },

src/xt_pages/Dialysisanalysis/weightblood/components/before_Blood.vue

@@ -130,6 +130,7 @@
               style="width: 100%;"
               :header-cell-style = "{'text-align':'center'}"
               :cell-style="{'text-align':'center'}"
+              v-loading="loading"
               height="380">
               <el-table-column
                 prop="index"
@@ -224,7 +225,7 @@ import html2canvas from "html2canvas"
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
         status_id:"",
-
+        loading:false,
       }
     },
     methods:{
@@ -404,6 +405,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading =true
         Getbpdetail(params).then(response =>{
           console.log('Getbpdetail血压',response.data);
           if(response.data.state){
@@ -428,6 +430,7 @@ import html2canvas from "html2canvas"
             }
           }
           console.log('55555',response);
+          this.loading =false
         })
       },
       // 选择日期

src/xt_pages/Dialysisanalysis/weightblood/components/blood_table.vue

@@ -54,8 +54,8 @@
             </div>
             <div>
               统计类型:
-              <el-select v-model="blood_value" placeholder="请选择" style="width: 100px;">
-                <el-option :key="0" label="不限" :value="0"></el-option>
+              <el-select v-model="blood_value" placeholder="请选择" style="width: 150px;">
+                <!-- <el-option :key="0" label="不限" :value="0"></el-option> -->
                 <el-option
                   v-for="item in blood_options"
                   :key="item.value"
@@ -77,6 +77,7 @@
         <el-table :data="tableData" border style="width: 100%"
         :header-cell-style="{textAlign: 'center'}"
         :cell-style="{ textAlign: 'center' }"
+        v-loading="loading"
         height="380">
           <el-table-column
             prop="index"
@@ -186,7 +187,7 @@ import html2canvas from "html2canvas"
         total:0,
         tableData:[],
         status_value:1,
-        blood_value:0,
+        blood_value:1,
         status_options:[{value:1,label:'达标'},{value:2,label:'不达标'}],
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
@@ -197,6 +198,7 @@ import html2canvas from "html2canvas"
 
 
         input:'',
+        loading:true
       }
     },
     methods:{
@@ -309,6 +311,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading =true
         Getbpdetail(params).then(response =>{
           if(response.data.state == 1){
             const list = response.data.data.list
@@ -336,6 +339,7 @@ import html2canvas from "html2canvas"
               this.total = response.data.data.total
             }
           }
+          this.loading =false
           console.log('77777血压表格',response);
         })
       },

src/xt_pages/Dialysisanalysis/weightblood/components/dialyze_after.vue

@@ -152,6 +152,7 @@
           <el-table :data="tableData" border style="width: 100%"
           :header-cell-style="{textAlign: 'center'}"
           :cell-style="{ textAlign: 'center' }"
+          v-loading="loading"
           height="380">
             <el-table-column
               prop="index"
@@ -255,7 +256,6 @@ import html2canvas from "html2canvas"
         dry_value:0,
         after_value:0,
         after_options:[],
-        Patient_name:'',
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
@@ -266,6 +266,7 @@ import html2canvas from "html2canvas"
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
 
         Patient_name:'',
+        loading:false,
       }
     },
     methods:{
@@ -505,6 +506,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading = true
         Getweightdetail(params).then(response =>{
           if(response.data.state == 1){
             const list = response.data.data.list
@@ -521,7 +523,7 @@ import html2canvas from "html2canvas"
                   dry_weight:item.dry_weight,
                   last_weight_after:item.last_weight_after,
                   weight_before:item.weight_before,
-                  weight_add:item.weight_add,
+                  weight_add:(item.weight_add*1).toFixed(2),
                   weight_after:item.weight_after
                 }
                 table.push(obj)
@@ -530,6 +532,7 @@ import html2canvas from "html2canvas"
               this.total = response.data.data.total
             }
           }
+          this.loading = false
           console.log('77777',response);
         })
       },

src/xt_pages/Dialysisanalysis/weightblood/components/dry_denominator.vue

@@ -153,6 +153,7 @@
           <el-table :data="tableData" border style="width: 100%"
           :header-cell-style="{textAlign: 'center'}"
           :cell-style="{ textAlign: 'center' }"
+          v-loading="loading"
           height="380">
             <el-table-column
               prop="index"
@@ -268,6 +269,7 @@ import html2canvas from "html2canvas"
 
 
         input:'',
+        loading:false
       }
     },
     methods:{
@@ -507,6 +509,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading = true
         Getweightdetail(params).then(response =>{
           if(response.data.state == 1){
             const list = response.data.data.list
@@ -523,7 +526,7 @@ import html2canvas from "html2canvas"
                   dry_weight:item.dry_weight,
                   last_weight_after:item.last_weight_after,
                   weight_before:item.weight_before,
-                  weight_add:item.weight_add,
+                  weight_add:(item.weight_add*1).toFixed(2),
                   weight_after:item.weight_after
                 }
                 table.push(obj)
@@ -531,6 +534,7 @@ import html2canvas from "html2canvas"
               this.tableData = table
               this.total = response.data.data.total
             }
+            this.loading = false
           }
           console.log('77777',response);
         })

src/xt_pages/Dialysisanalysis/weightblood/components/dry_weight.vue

@@ -129,6 +129,7 @@
               style="width: 100%;"
               :header-cell-style = "{'text-align':'center'}"
               :cell-style="{'text-align':'center'}"
+              v-loading="loading"
               height="380">
               <el-table-column
                 prop="index"
@@ -221,6 +222,7 @@ import html2canvas from "html2canvas"
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
         status_id:"",
+        loading:false,
       }
     },
     methods:{
@@ -338,12 +340,15 @@ import html2canvas from "html2canvas"
       },
       // 查询
       sete_click(){
+        
         this.getecharts()
       },
       // 详情查询
       detil_click(){
+        
         this.currentPage =1
         this.getdetail(this.status_value)
+        
       },
        // 下载
       Download_click(){
@@ -405,6 +410,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading = true
         Getweightdetail(params).then(response =>{
           if(response.data.state ==1){
             const list = response.data.data.list
@@ -424,6 +430,7 @@ import html2canvas from "html2canvas"
               this.tableData = table
               this.total = response.data.data.total
             }
+            this.loading = false
           }
           console.log('555553333干体重',response);
         })

src/xt_pages/Dialysisanalysis/weightblood/components/list_denominator.vue

@@ -152,6 +152,7 @@
           <el-table :data="tableData" border style="width: 100%"
           :header-cell-style="{textAlign: 'center'}"
           :cell-style="{ textAlign: 'center' }"
+          v-loading="loading"
           height="380">
             <el-table-column
               prop="index"
@@ -265,8 +266,8 @@ import html2canvas from "html2canvas"
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
 
-
         input:'',
+        loading:false,
       }
     },
     methods:{
@@ -510,6 +511,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading = true
         Getweightdetail(params).then(response =>{
           console.log('77777',response);
           if(response.data.state == 1){
@@ -527,7 +529,7 @@ import html2canvas from "html2canvas"
                   dry_weight:item.dry_weight,
                   last_weight_after:item.last_weight_after,
                   weight_before:item.weight_before,
-                  weight_add:item.weight_add,
+                  weight_add:(item.weight_add*1).toFixed(2),
                   weight_after:item.weight_after
                 }
                 table.push(obj)
@@ -535,6 +537,7 @@ import html2canvas from "html2canvas"
               this.tableData = table
               this.total = response.data.data.total
             }
+            this.loading = false
           }
 
         })

src/xt_pages/Dialysisanalysis/weightblood/components/weight_table.vue

@@ -92,6 +92,7 @@
         <el-table :data="tableData" border style="width: 100%"
           :header-cell-style="{textAlign: 'center'}"
           :cell-style="{ textAlign: 'center' }"
+          v-loading="loading"
           height="380">
             <el-table-column
               prop="index"
@@ -208,8 +209,9 @@ import html2canvas from "html2canvas"
         weight_value:0,
         dry_value:0,
         after_value:0,
+        loading:false
         // after_options:[],
-        Patient_name:'',
+
       }
     },
     methods:{
@@ -359,6 +361,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        this.loading = true
         Getweightdetail(params).then(response =>{
           if(response.data.state == 1){
             console.log('体重详情分析',response.data.data);
@@ -376,7 +379,7 @@ import html2canvas from "html2canvas"
                   dry_weight:item.dry_weight,
                   last_weight_after:item.last_weight_after,
                   weight_before:item.weight_before,
-                  weight_add:item.weight_add,
+                  weight_add:(item.weight_add*1).toFixed(2),
                   weight_after:item.weight_after
                 }
                 table.push(obj)
@@ -385,6 +388,7 @@ import html2canvas from "html2canvas"
               this.total = response.data.data.total
             }
           }
+          this.loading = false
           console.log('77777',response);
         })
       },

src/xt_pages/Dialysisanalysis/weightblood/index.vue

@@ -49,7 +49,7 @@ export default {
       this.indicators = []
       getStatisticsList(params).then(response => {
         if (response.data.state == 1) {
-          this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
+          // this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
           console.log('444444444',this.indicators);
           for(let i = 0; i < this.indicators.length; i++){
             this.indicators[i]["check_type"] = 1

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -19,12 +19,10 @@
           class="print_page_main_content"
         >
           <div style="display: inline-block; width: 100%; text-align: center">
-            <div
-              class="order-yy-name"
-              style="
-                letter-spacing: 0;
+            <div class="order-yy-name"
+              style="letter-spacing: 0;
                 font-weight: 600;
-                font-size: 22px;
+                font-size: 25px;
                 display: inline-block;
               "
             >
@@ -32,59 +30,59 @@
             </div>
           </div>
           
-          <div class="row">
-            <div class="inline_block">
-              姓名：
+          <div class="row" style="display: flex">
+            <div class="inline_block" style="flex: 1;">
+              姓名:
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.patient.name }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px">
-              性别：
+            <div class="inline_block" style="flex: 1;">
+              性别:
               <div class="under_line" style="width: 30px; text-align: center">
                 {{ record.patient.gender == 1 ? "男" : "女" }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px">
-              年龄：
+            <div class="inline_block" style="flex: 1;">
+              年龄:
               <div class="under_line" style="width: 30px; text-align: center">
                 <!-- {{ record.patient.age }} -->
                 {{ getAge(record.patient) }}
               </div>
               岁
             </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition!=1">
-                门诊：
+            <div class="inline_block" v-if="record.receive_assessment.condition!=1" style="flex: 1;">
+                门诊:
                 <div class="under_line" style="width: 30px; text-align: center">
                   <check-box :checked="record.patient.source == 1"></check-box>
                 </div>
               </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition==1">
-              住院：
+            <div class="inline_block" v-if="record.receive_assessment.condition==1" style="flex: 1;">
+              住院:
               <div class="under_line" style="width: 30px; text-align: center">
                 <check-box :checked="record.patient.source == 1"></check-box>
               </div>
             </div>
-            <div class="inline_block">
-              病区：
+            <div class="inline_block" style="flex: 1;">
+              病区:
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_zone.name}}
               </div>
             </div>
-            <div class="inline_block">
-              床号：
+            <div class="inline_block" style="flex: 1;">
+              床号:
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_number.number }}
               </div>
             </div>
-            <div class="inline_block">
-              透析号：
+            <div class="inline_block" style="flex: 1;">
+              透析号:
               <div class="under_line" style="width: 70px; text-align: center">
                 {{ record.patient.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px">
-              住院号：
+            <div class="inline_block" style="flex: 1;">
+              住院号:
               <div
                 class="under_line"
                 style="width: 70px; text-align: left"
@@ -103,7 +101,7 @@
           </div>
           <div class="row">
             <div style="">
-              诊断：
+              诊断:
               <div style="border-bottom: 1px solid black;width: 95%;text-align: left;word-break: break-all;
                   word-wrap: break-word;display: inline-block;white-space: unset;"
               >
@@ -1206,9 +1204,8 @@
                 </tr>
                 <tr>
                   <td>
-                    <div class="row"
-                      style="padding: 2px 0; line-height: 23px; display: flex"
-                    >
+                    <div class="row" style="padding: 2px 0; line-height: 23px; display: flex"
+>
                       <div class="inline_block" style="flex: 1">
                         上机护士:
                         <div class="under_line"
@@ -1409,7 +1406,7 @@
 
                       <div class="inline_block" style="flex: 1">
                         上机时间
-                        <div class="under_line" style="width: 80px; text-align: center">
+                        <div class="under_line" style="width: 65%; text-align: center">
                           <span style="height: 30px;display: inline-block;"></span>
                           
                           <span v-if="record.dialysis_order !=null">
@@ -1420,7 +1417,7 @@
                       </div>
                       <div class="inline_block" style="flex: 1">
                         下机时间:
-                        <div class="under_line" style="width: 80px; text-align: center">
+                        <div class="under_line" style="width: 65%; text-align: center">
                           <span style="height: 30px; display: inline-block">
                           </span>
                           <span v-if="record.dialysis_order!=null">

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -10,50 +10,50 @@
       >
         <div style="display: inline-block; width: 100%; text-align: center">
           <div class="order-yy-name"
-            style=" letter-spacing: 0;font-weight: 600;font-size: 22px;display: inline-block; "
+            style=" letter-spacing: 0;font-weight: 600;font-size: 25px;display: inline-block; "
           >
             {{ orgname }}
           </div>
           <div class="order-title"
-            style=" letter-spacing: 0; font-weight: 600; font-size: 22px;"
+            style=" letter-spacing: 0; font-weight: 600; font-size: 25px;"
           >
             血液净化治疗记录单
           </div>
         </div>
-        <div class="row">
-          <div class="inline_block">
-            姓名：
+        <div class="row" style="display: flex">
+          <div class="inline_block" style="flex: 1;">
+            姓名:
             <div class="under_line" style="width: 50px; text-align: center">
               {{ patientInfo.name }}
             </div>
           </div>
-          <div class="inline_block" style="margin-left: 10px">
-            性别：
+          <div class="inline_block" style="flex: 1;">
+            性别:
             <div class="under_line" style="width: 30px; text-align: center">
               {{ patientInfo_gender_1 ? "男" : "女" }}
             </div>
           </div>
-          <div class="inline_block" style="margin-left: 10px">
-            年龄：
+          <div class="inline_block" style="flex: 1;">
+            年龄:
             <div class="under_line" style="width: 30px; text-align: center">
               {{ getAge(patientInfo) }}
             </div>
             岁
           </div>
-          <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1">
-            门诊：
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1" style="flex: 1;">
+            门诊:
             <div class="under_line" style="width: 30px; text-align: center">
               <check-box :checked="patientInfo_source_1"></check-box>
             </div>
           </div>
-          <div class="inline_block" v-if="receiverTreatmentAccess.condition==1">
-            住院：
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition==1" style="flex: 1;">
+            住院:
             <div class="under_line" style="width: 30px; text-align: center">
               <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
             </div>
           </div>
-          <div class="inline_block">
-            病区：
+          <div class="inline_block" style="flex: 1;">
+            病区:
             <div class="under_line" style="width: 50px; text-align: center">
               <span v-if="receiverTreatmentAccess.condition != 1">{{
                 patientInfo.DialysisSchedule.device_zone.name
@@ -62,8 +62,8 @@
               }}</span>
             </div>
           </div>
-          <div class="inline_block">
-            床号：
+          <div class="inline_block" style="flex: 1;">
+            床号:
             <div class="under_line" style="width: 50px; text-align: center">
               <span>{{
                 dialysisOrder &&
@@ -74,14 +74,14 @@
               }}</span>
             </div>
           </div>
-          <div class="inline_block">
-            透析号：
+          <div class="inline_block" style="flex: 1;">
+            透析号:
             <div class="under_line" style="width: 70px; text-align: center">
               {{ patientInfo.dialysis_no }}
             </div>
           </div>
-          <div class="inline_block" style="margin-left: 5px;">
-            住院号：
+          <div class="inline_block" style="flex: 1;">
+            住院号:
             <div class="under_line" style="width: 70px;text-align: left">
               {{ receiverTreatmentAccess.admission_number ? receiverTreatmentAccess.admission_number :'/' }}
             </div>
@@ -89,7 +89,7 @@
         </div>
         <div class="row">
           <div style="">
-            诊断：
+            诊断:
             <div style="border-bottom: 1px solid black; width: 95%; text-align: left;word-wrap: break-word;
                 white-space: inherit;display: inline-block;"
             >
@@ -976,9 +976,7 @@
                     </div>
                   </div>
 
-                  <div class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
+                  <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                     <div class="inline_block" style="flex: 1">
                       透后体重:
                       <div class="under_line"
@@ -1000,8 +998,7 @@
 
                     <div class="inline_block" style="flex: 1">
                       体重减少:
-                      <div
-                        class="under_line"
+                      <div class="under_line"
                         style="width: 70px; text-align: center"
                       >
                         <!-- <span v-if="org_id!=10598 && org_id!=10551">{{
@@ -1102,46 +1099,46 @@
                   <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div>
-                      <div class="inline_block" style="flex: 1">
-                        上机护士:
-                        <div  class="under_line"
-                          style="width: 90px; text-align: center"
+                  
+                    <div class="inline_block" style="flex: 1">
+                      上机护士:
+                      <div  class="under_line"
+                        style="width: 90px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
                         >
-                          <span
-                            style="height: 30px; display: inline-block"
-                            v-if="
-                              setAdminUserES(
-                                dialysisOrder == null
-                                  ? 0
-                                  : dialysisOrder.start_nurse
-                              ) == ''
-                            "
-                          >
-                            {{
-                              getAdminUser(
-                                dialysisOrder == null
-                                  ? 0
-                                  : dialysisOrder.start_nurse
-                              )
-                            }}</span
-                          >
-                          <img
-                            style="height: 30px"
-                            :src="
-                              setAdminUserES(
-                                dialysisOrder == null
-                                  ? 0
-                                  : dialysisOrder.start_nurse
-                              )
-                            "
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
-                        </div>
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
                       </div>
                     </div>
+                    
 
                     <div class="inline_block" style="flex: 1">
                       <span>核对护士:</span>
@@ -1296,7 +1293,7 @@
                     <div class="inline_block" style="flex: 1">
                        上机时间
                       <div class="under_line"
-                        style="width: 80px; text-align: center"
+                        style="width: 65%; text-align: center"
                       >
                         <span style="height: 30px;display: inline-block;">
                           
@@ -1311,7 +1308,7 @@
                     <div class="inline_block" style="flex: 1">
                       下机时间:
                       <div class="under_line"
-                        style="width: 80px; text-align: center"
+                        style="width: 65%; text-align: center"
                       >
                         <span style="height: 30px; display: inline-block">
                         </span>
@@ -2271,358 +2268,358 @@ export default {
     };
   },
   methods: {
-      toUpload() {
-
-        let dom = document.getElementById("dialysis-print-box-1")
-        //调用方法下载
-        html2canvas(dom, {
-          useCORS: true, //允许跨域
-          allowTaint: false,
-          logging: false,
-          letterRendering: true,
-          ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
-          scale: 4, //按比例增加分辨率
-          background: '#fff',//pdf背景色为白色，默认是黑色的
-        }).then((canvas) => {
-          //返回图片dataURL，参数：图片格式和清晰度(0-1)
-          var pageData = canvas.toDataURL('image/jpeg', 1.0);
-
-          //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
-          var pdf = new jsPDF('', 'pt', 'a4');
-
-          //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
-          //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
-          pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
-
-          console.log("pdf222222222222222222",pdf)
-
-          var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
-          // console.log("base63",newBase64Data)
-          const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
-          console.log("blobwoowowowwo",blob)
-          this.openPdf(blob);
-
-          // var data = {
-          //   name:newBase64Data,
-          // }
-          // UploadPrintOrder(data).then(response=>{
-          //   if(response.data.state == 1){
-          //     var sign =  response.data.data.sign
-          //     console.log("SIGNWWOOWWO")
-          //     var pdfBase64 = response.data.data.pdfBase64
-          //     console.log("pdfBase64",pdfBase64)
-          //     this.$message.success("保存成功!")
-          //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
-          //     this.openPdf(blob);
-          //   }
-          // })
-
-          // this.viewPdf(newBase64Data)
-          //保存到pdf，名字是stone
-          // pdf.save('stone.pdf');
-
-        });
-      },
-
-     viewPdf(content) {
-       console.log("content",content);
-       const blob = this.base64ToBlob(content);
-       if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-         window.navigator.msSaveOrOpenBlob(blob);
-       } else {
-         const fileURL = URL.createObjectURL(blob);
-         console.log("fileUlrwowowoow",fileURL)
-         window.open(fileURL);//打开ppf文件
-       }
-     },
-     compare (property) {
-       return function (a, b) {
-           var value1 = a[property]
-           var value2 = b[property]
-           return value1 - value2
-       }
-     },
-
-     openPdf(blob) {
-       const objectUrl = URL.createObjectURL(blob);
-       const a = document.createElement('a');
-       a.href = objectUrl;
-       a.target = '_blank';
-       a.click();
-       URL.revokeObjectURL(objectUrl);
-     },
-      base64ToBlob(base64Data, contentType) {
-       contentType = contentType || '';
-       const sliceSize = 1024;
-       const byteCharacters = window.atob(base64Data);
-       const bytesLength = byteCharacters.length;
-       const slicesCount = Math.ceil(bytesLength / sliceSize);
-       const byteArrays = new Array(slicesCount);
-
-       for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
-         const begin = sliceIndex * sliceSize;
-         const end = Math.min(begin + sliceSize, bytesLength);
-
-         const bytes = new Array(end - begin);
-         for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
-           bytes[i] = byteCharacters[offset].charCodeAt(0);
-         }
-         byteArrays[sliceIndex] = new Uint8Array(bytes);
-       }
-
-       return new Blob(byteArrays, {
-         type: contentType
-       });
-     },
-
-     UploadPdf(res) {
-       let pdfBase64Str = res;
-       let title = "上传给后端的个人报告";
-       var myfile = this.dataURLtoFile(pdfBase64Str, title + ".pdf")
-       console.log("myfile",myfile)
-     },
-    // 获取当前年份，用于年龄计算
-    getoldAge() {
-      let date = new Date();
-      let year = date.getFullYear();
-      let year_d =
-        this.xtdate.split("-")[0] - this.patientInfo.birth.split("-")[0];
-      let year_m = this.xtdate.split("-")[1];
-      let birth_m = this.patientInfo.birth.split("-")[1];
-      let year_date = this.xtdate.split("-")[2];
-      let birth_date = this.patientInfo.birth.split("-")[2];
-      // console.log(year,'今年年月')
-      // console.log(this.xtdate.split('-'),'病人就诊年月')
-      console.log(this.patientInfo.birth, "病人生日");
-      // console.log(year_d,'year_d')
-      if (year_m < birth_m) {
-        return year_d - 1;
-      } else if (year_m == birth_m) {
-        if (year_date < birth_date) {
-          return year_d - 1;
-        } else {
-          return year_d;
-        }
-      } else {
-        return year_d;
-      }
-    },
-
     checkData() {
-      if (this.receiverTreatmentAccess.way == 0) {
-        this.$message.error("入科方式未填");
-      } else if (this.predialysis.symptom_before_dialysis == "") {
-        this.$message.error("透前症状未填");
-      } else if (this.predialysis.temperature == "") {
-        this.$message.error("透前体温未填");
-      } else if (this.predialysis.pulse_frequency == "") {
-        this.$message.error("透前脉搏未填");
-      } else if (this.predialysis.breathing_rate == "") {
-        this.$message.error("透前呼吸频率未填");
-      } else if (
+      var checkDate =[]
+      if(this.dialysisOrder && this.dialysisOrder.bed_id == 0 &&
+        this.patientInfo.DialysisSchedule.bed_id == 0
+      ){
+        const obj = "透析机型号"
+        checkDate.push(obj)
+      }
+      if (this.predialysis.temperature == '') {
+        const obj1 = "透前体温"
+        checkDate.push(obj1)
+      } if (this.predialysis.pulse_frequency == "") {
+        const obj2 = "透前脉搏"
+        checkDate.push(obj2)
+      } if (this.predialysis.breathing_rate == "") {
+         const obj3 = "透前呼吸"
+         checkDate.push(obj3)
+      } if (
         this.predialysis.systolic_blood_pressure == 0 ||
         this.predialysis.diastolic_blood_pressure == 0
       ) {
-        this.$message.error("透前血压未填完整");
-      } else if (this.predialysis.puncture_way == "") {
-        this.$message.error("穿刺方式未填");
-      } else if (this.predialysis.puncture_needle == "") {
-        this.$message.error("穿刺针未填");
-      } else if (
-        this.predialysis.blood_access_part_id == "" &&
-        this.predialysis.blood_access_part_opera_name == ""
+        const obj4 = "透前血压"
+        checkDate.push(obj4)
+      } if (this.prescription.dialysis_duration_hour == 0 && 
+            this.prescription.dialysis_duration_minute ==0
       ) {
-        this.$message.error("血管通路未填");
-      } else if (this.predialysis.internal_fistula == "") {
-        this.$message.error("透前内瘘未填");
-      } else if (this.predialysis.catheter == "") {
-        this.$message.error("透前导管未填");
-      } else if (this.prescription.mode_id == "") {
-        this.$message.error("透析方式未填");
-      } else if (
-        this.prescription.displace_liqui_part == 0 &&
-        this.prescription.mode_id == 2
+        const obj5 = "透析时间"
+        checkDate.push(obj5)
+      } if (this.prescription.mode == "") {
+        const obj6 = "透析方式"
+        checkDate.push(obj6)
+      } if (this.predialysis.blood_access_part_opera_name =='' ) {
+        const obj7 = "血管通路"
+        checkDate.push(obj7)
+      } if (this.predialysis.catheter == '' ) {
+        const obj8 = "导管"
+        checkDate.push(obj8)
+      } if (this.prescription.dialyzer_perfusion_apparatus == '' && 
+            this.prescription.dialysis_dialyszers ==''
       ) {
-        this.$message.error("置换方式未填");
-      } else if (
-        this.prescription.displace_liqui_value == 0 &&
-        this.prescription.mode_id == 2
+        const obj9 = "透析(滤)器"
+        checkDate.push(obj9)
+      } if (this.prescription.dialysis_irrigation == '') {
+        const obj10 = "灌流器"
+        checkDate.push(obj10)
+      } if (this.prescription.displace_liqui_part == ""&&
+            (this.prescription.mode_id ==2 || this.prescription.mode_id ==12)
       ) {
-        this.$message.error("置换量未填");
-      } else if (this.prescription.blood_flow_volume == 0) {
-        this.$message.error("血流量未填");
-      } else if (
-        this.prescription.dialysis_duration_hour == 0 &&
-        this.prescription.dialysis_duration_minute == 0
-      ) {
-        this.$message.error("透析时间未填");
-      } else if (
-        this.prescription.dialyzer_perfusion_apparatus == "" &&
-        this.prescription.dialysis_dialyszers == ""
+        const obj11 = "置换方式"
+        checkDate.push(obj11)
+      } if (this.prescription.replacement_total == "" &&
+            (this.prescription.mode_id ==2 || this.prescription.mode_id ==12)
       ) {
-        this.$message.error("透析器未填");
-      } else if (this.prescription.dialysis_irrigation == "") {
-        this.$message.error("灌流器未填");
-      } else if (
-        this.prescription.plasma_separator == "" &&
-        this.org_id == 9538
+        const obj12 = "置换量"
+        checkDate.push(obj12)
+      } if ( this.prescription.blood_flow_volume == '') {
+        const obj13 = "血流量"
+        checkDate.push(obj13)
+      } if (this.predialysis.dry_weight == "") {
+        const obj14 = "干体重"
+        checkDate.push(obj14)
+      } if (this.lastafterdialysis.weight_after == "") {
+        const obj15 = "上次透后体重"
+        checkDate.push(obj15)
+      } if (this.predialysis.weight_before == "" ) {
+        const obj16 = "透前体重"
+        checkDate.push(obj16)
+      } if (this.prescription.target_ultrafiltration == 0) {
+        const obj17 = "计划超滤量"
+        checkDate.push(obj17)
+      } if (this.prescription.dialysate_flow == 0 ) {
+        const obj18 = "透析液流量"
+        checkDate.push(obj18)
+      } if (this.prescription.kalium == 0) {
+        const obj19 = "钾"
+        checkDate.push(obj19)
+      } if (this.prescription.calcium == 0) {
+        const obj20 = "钙"
+        checkDate.push(obj20)
+      } if (this.prescription.sodium == 0) {
+        const obj21 = "钠"
+        checkDate.push(obj21)
+      }if (this.prescription.bicarbonate == 0) {
+        const obj22 = "碳酸氢根"
+        checkDate.push(obj22)
+      } if (this.prescription.anticoagulant_name == 0) {
+        const obj23 = "抗凝剂"
+        checkDate.push(obj23)
+      } if (this.prescription.anticoagulant_shouji == 0 &&
+        this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !=''
       ) {
-        this.$message.error("血浆分离器未填");
-      } else if (
-        this.prescription.bilirubin_adsorption_column == "" &&
-        this.org_id == 9538
+        const obj24 = "首剂"
+        checkDate.push(obj24)
+      }if (this.prescription.anticoagulant_zongliang == 0 &&
+        this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !='' && prescription.anticoagulant != 5
       ) {
-        this.$message.error("胆红素吸附柱未填");
-      } else if (this.predialysis.weight_before == 0) {
-        this.$message.error("透前体重未填");
-      } else if (this.predialysis.dry_weight == 0) {
-        this.$message.error("干体重未填");
-      } else if (this.prescription.target_ultrafiltration == 0) {
-        this.$message.error("计划超滤量未填");
-      } else if (this.prescription.calcium == 0) {
-        this.$message.error("钙未填");
-      } else if (this.prescription.sodium == 0) {
-        this.$message.error("钠未填");
-      } else if (this.prescription.kalium == 0) {
-        this.$message.error("钾未填");
-      } else if (this.prescription.bicarbonate == 0) {
-        this.$message.error("碳酸氢根未填");
-      } else if (this.prescription.dialysate_flow == 0) {
-        this.$message.error("透析液流量未填");
-      } else if (this.prescription.anticoagulant == 0) {
-        this.$message.error("抗凝剂未填");
-      } else if (
+        const obj25 = "总量"
+        checkDate.push(obj25)
+      } if (
         this.prescription.anticoagulant_gaimingcheng == "" &&
         this.prescription.anticoagulant == 5
       ) {
-        this.$message.error("钙名称未填");
-      } else if (
+        const obj26 = "钙名称"
+        checkDate.push(obj26)
+      } if (
         this.prescription.anticoagulant_gaijiliang == "" &&
         this.prescription.anticoagulant == 5
       ) {
-        this.$message.error("钙剂量未填");
-      } else if (this.afterdialysis.temperature == 0) {
-        this.$message.error("透后体温未填");
-      } else if (this.afterdialysis.pulse_frequency == 0) {
-        this.$message.error("透后脉搏未填");
-      } else if (this.afterdialysis.breathing_rate == 0) {
-        this.$message.error("透后呼吸频率未填");
-      } else if (
-        this.afterdialysis.systolic_blood_pressure == 0 ||
-        this.afterdialysis.diastolic_blood_pressure == 0
+        const obj27 = "钙剂量"
+        checkDate.push(obj27)
+      } if (this.afterdialysis.temperature == ''){
+        const obj28 = "透后温度"
+        checkDate.push(obj28)
+      } if (this.afterdialysis.pulse_frequency == 0) {
+        const obj29 = "透后脉搏"
+        checkDate.push(obj29)
+      } if (
+        this.afterdialysis.systolic_blood_pressure == '' &&
+        this.afterdialysis.diastolic_blood_pressure == ''
+      ){
+        const obj30 = "透后血压"
+        checkDate.push(obj30)
+      } if (this.afterdialysis.breathing_rate == 0) {
+        const obj31 = "透后呼吸"
+        checkDate.push(obj31)
+      } if (this.afterdialysis.cruor == '') {
+        const obj32 = "透析器凝血"
+        checkDate.push(obj32)
+      } if (this.afterdialysis.internal_fistula == '') {
+        const obj33 = "透后内瘘"
+        checkDate.push(obj33)
+      } if (this.afterdialysis.catheter =='') {
+        const obj34 = "透后导管"
+        checkDate.push(obj34)
+      } if (this.afterdialysis.actual_treatment_hour == 0 &&
+          this.afterdialysis.actual_treatment_minute == 0
       ) {
-        this.$message.error("透后血压未填完整");
-      } else if (
-        this.afterdialysis.actual_treatment_hour == 0 &&
-        this.afterdialysis.actual_treatment_minute == 0
-      ) {
-        this.$message.error("实际治疗时间未填");
-      } else if (this.afterdialysis.cruor == "") {
-        this.$message.error("透析器凝血未填");
-      } else if (this.afterdialysis.internal_fistula == "") {
-        this.$message.error("透后内瘘未填");
-      } else if (this.afterdialysis.catheter == "") {
-        this.$message.error("透后导管未填");
-      } else if (this.afterdialysis.weight_after == 0) {
-        this.$message.error("透后体重未填");
-      } else if (this.afterdialysis.weight_loss == 0) {
-        this.$message.error("透后体重减少未填");
-      } else if (this.afterdialysis.dialysis_intakes == 0) {
-        this.$message.error("透析中入量未填");
-      } else if (this.afterdialysis.actual_ultrafiltration == 0) {
-        this.$message.error("实际超滤量未填");
-      } else if (this.summary.dialysis_summary == "") {
-        this.$message.error("透析小结未填");
-      } else if (
-        this.dialysisOrder == null ||
-        this.dialysisOrder.puncture_nurse == 0
-      ) {
-        this.$message.error("穿刺护士未填");
-      } else if (
+        const obj35 = "实际治疗时间"
+        checkDate.push(obj35)
+      } if (this.afterdialysis.weight_after == 0) {
+        const obj36 = "透后体重"
+        checkDate.push(obj36)
+      } if (this.afterdialysis.dialysis_intakes_unit == 0) {
+        const obj37 = "透析中入量"
+        checkDate.push(obj37)
+      } if (this.afterdialysis.actual_ultrafiltration == 0) {
+        const obj38 = "实际超滤量"
+        checkDate.push(obj38)
+      } if (this.summary.dialysis_summary == '') {
+        const obj39 = "治疗小结"
+        checkDate.push(obj39)
+      } if (this.summary.mission == 0) {
+        const obj40 = "宣教知识"
+        checkDate.push(obj40)
+      } if (
         this.dialysisOrder == null ||
         this.dialysisOrder.start_nurse == 0
       ) {
-        this.$message.error("治疗护士未填");
-      } else if (this.dialysisOrder == null && this.check.creater == 0) {
-        this.$message.error("核对人员未填");
+        const obj41 = "上机护士"
+        checkDate.push(obj41)
+      } if (this.dialysisOrder == null && this.check.creater == 0) {
+        const obj42 = "核对人员"
+        checkDate.push(obj42)
       } else if (
         this.dialysisOrder != null &&
         this.dialysisOrder.start_nurse == this.check.modifier &&
         this.check.creater == 0
       ) {
-        this.$message.error("核对人员未填");
+        const obj42 = "核对人员"
+        checkDate.push(obj42)
       } else if (
         this.dialysisOrder != null &&
         this.dialysisOrder.start_nurse == this.check.creater &&
         this.check.modifier == 0
       ) {
-        this.$message.error("核对人员未填");
+        const obj42 = "核对人员"
+        checkDate.push(obj42)
       } else if (
         this.dialysisOrder != null &&
         this.dialysisOrder.start_nurse != this.check.creater &&
         this.dialysisOrder.start_nurse != this.check.modifier &&
         this.check.creater == 0
       ) {
-        this.$message.error("核对人员未填");
-      } else if (
+        const obj42 = "核对人员"
+        checkDate.push(obj42)
+      } if (
         this.dialysisOrder == null ||
         this.dialysisOrder.finish_nurse == 0
       ) {
-        this.$message.error("下机护士未填");
-      } else if (this.prescription.creater == 0) {
-        this.$message.error("医生签名未填");
-      } else if (this.tableAdvice.length > 0) {
-        let num = 0;
-        this.tableAdvice.map((item) => {
-          if (item.id > 0 && (item.created_time || item.start_time)) {
-            this.users.map((it) => {
-              if (it.id == item.advice_doctor) {
-                if (it.user_type == 3) {
-                  num++;
-                  this.$message.closeAll();
-                  this.$message.error("存在不是医生保存的医嘱");
-                } else if (
-                  it.id == item.execution_staff &&
-                  item.execution_staff > 0
-                ) {
-                  if (it.user_type == 2) {
-                    num++;
-                    this.$message.closeAll();
-                    this.$message.error("存在不是护士执行的医嘱");
-                  }
-                } else if (it.id == item.checker && item.checker > 0) {
-                  if (it.user_type == 2) {
-                    num++;
-                    this.$message.closeAll();
-                    this.$message.error("存在不是护士核对的医嘱");
-                  }
-                }
-              } else if (
-                it.id == item.execution_staff &&
-                item.execution_staff > 0
-              ) {
-                if (it.user_type == 2) {
-                  num++;
-                  this.$message.closeAll();
-                  this.$message.error("存在不是护士执行的医嘱");
-                }
-              } else if (it.id == item.checker && item.checker > 0) {
-                if (it.user_type == 2) {
-                  num++;
-                  this.$message.closeAll();
-                  this.$message.error("存在不是护士核对的医嘱");
-                }
+        const obj43 = "下机护士"
+        checkDate.push(obj43)
+      } if (this.prescription.creater == 0) {
+        const obj44 = "医生签名"
+        checkDate.push(obj44)
+      } if (this.dialysisOrder.start_time == '' && this.dialysisOrder != null) {
+        const obj45 = "上机时间"
+        checkDate.push(obj45)
+      } if (this.dialysisOrder.end_time == "" && this.dialysisOrder != null) {
+        const obj46 = "下机时间"
+        checkDate.push(obj46)
+      } if(this.new_doctor_advice_list.length > 0){
+          this.new_doctor_advice_list.map((item) =>{
+            if(item.id > 0 && (item.created_time || item.start_time)){
+              if(item.execution_staff ==0 && item.advice_doctor ==0){
+                const obj47 = '执行人员,医生签名'
+                checkDate.push(obj47)
               }
-            });
-          }
-        });
-        if (num == 0) {
-          this.$message.success("核对完成");
+            }
+          })
+      }
+ 
+      this.getcheckData(checkDate)
+    },
+    
+    toUpload() {
+
+      let dom = document.getElementById("dialysis-print-box-1")
+      //调用方法下载
+      html2canvas(dom, {
+        useCORS: true, //允许跨域
+        allowTaint: false,
+        logging: false,
+        letterRendering: true,
+        ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
+        scale: 4, //按比例增加分辨率
+        background: '#fff',//pdf背景色为白色，默认是黑色的
+      }).then((canvas) => {
+        //返回图片dataURL，参数：图片格式和清晰度(0-1)
+        var pageData = canvas.toDataURL('image/jpeg', 1.0);
+
+        //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
+        var pdf = new jsPDF('', 'pt', 'a4');
+
+        //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
+        //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+        pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
+
+        console.log("pdf222222222222222222",pdf)
+
+        var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
+        // console.log("base63",newBase64Data)
+        const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+        console.log("blobwoowowowwo",blob)
+        this.openPdf(blob);
+
+        // var data = {
+        //   name:newBase64Data,
+        // }
+        // UploadPrintOrder(data).then(response=>{
+        //   if(response.data.state == 1){
+        //     var sign =  response.data.data.sign
+        //     console.log("SIGNWWOOWWO")
+        //     var pdfBase64 = response.data.data.pdfBase64
+        //     console.log("pdfBase64",pdfBase64)
+        //     this.$message.success("保存成功!")
+        //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
+        //     this.openPdf(blob);
+        //   }
+        // })
+
+        // this.viewPdf(newBase64Data)
+        //保存到pdf，名字是stone
+        // pdf.save('stone.pdf');
+
+      });
+    },
+
+    viewPdf(content) {
+      console.log("content",content);
+      const blob = this.base64ToBlob(content);
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(blob);
+      } else {
+        const fileURL = URL.createObjectURL(blob);
+        console.log("fileUlrwowowoow",fileURL)
+        window.open(fileURL);//打开ppf文件
+      }
+    },
+    compare (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+    },
+
+    openPdf(blob) {
+      const objectUrl = URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = objectUrl;
+      a.target = '_blank';
+      a.click();
+      URL.revokeObjectURL(objectUrl);
+    },
+    base64ToBlob(base64Data, contentType) {
+      contentType = contentType || '';
+      const sliceSize = 1024;
+      const byteCharacters = window.atob(base64Data);
+      const bytesLength = byteCharacters.length;
+      const slicesCount = Math.ceil(bytesLength / sliceSize);
+      const byteArrays = new Array(slicesCount);
+
+      for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
+        const begin = sliceIndex * sliceSize;
+        const end = Math.min(begin + sliceSize, bytesLength);
+
+        const bytes = new Array(end - begin);
+        for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
+          bytes[i] = byteCharacters[offset].charCodeAt(0);
+        }
+        byteArrays[sliceIndex] = new Uint8Array(bytes);
+      }
+
+      return new Blob(byteArrays, {
+        type: contentType
+      });
+    },
+
+    UploadPdf(res) {
+      let pdfBase64Str = res;
+      let title = "上传给后端的个人报告";
+      var myfile = this.dataURLtoFile(pdfBase64Str, title + ".pdf")
+      console.log("myfile",myfile)
+    },
+    // 获取当前年份，用于年龄计算
+    getoldAge() {
+      let date = new Date();
+      let year = date.getFullYear();
+      let year_d =
+        this.xtdate.split("-")[0] - this.patientInfo.birth.split("-")[0];
+      let year_m = this.xtdate.split("-")[1];
+      let birth_m = this.patientInfo.birth.split("-")[1];
+      let year_date = this.xtdate.split("-")[2];
+      let birth_date = this.patientInfo.birth.split("-")[2];
+      // console.log(year,'今年年月')
+      // console.log(this.xtdate.split('-'),'病人就诊年月')
+      console.log(this.patientInfo.birth, "病人生日");
+      // console.log(year_d,'year_d')
+      if (year_m < birth_m) {
+        return year_d - 1;
+      } else if (year_m == birth_m) {
+        if (year_date < birth_date) {
+          return year_d - 1;
+        } else {
+          return year_d;
         }
       } else {
-        this.$message.success("核对完成");
+        return year_d;
       }
     },
+
+   
     getDisplaceLiquiPart: function (val) {
       let displace_liqui_part_name = "/";
       const displace_liqui_part = this.displaceLiquiPartOptions;
@@ -3421,6 +3418,16 @@ export default {
           return options[i].number_type
         }
       }
+    },
+    getcheckData(val){
+      if(val.length >0){
+        const a = val.join(',')
+        console.log('a',a);
+        this.$message.error(a +" 未填");
+        return a
+      }else{
+        this.$message.success('核对完成')
+      }
     }
 
   },

src/xt_pages/outpatientCharges/summary.vue

@@ -715,6 +715,7 @@ export default {
       settlementVisible: false,
       settlementObj: {},
       accounts_click_vi:false,
+      org_id:'',
     }
   },
 
@@ -757,6 +758,7 @@ export default {
     this.getDoctorList()
     this.getHisOrderList()
     this.getAllstaff()
+    this.org_id == this.$store.getters.xt_user.org.id
   },
 
   methods: {
@@ -3317,6 +3319,7 @@ export default {
           return false
         } else {
           let list = []
+          let list2 = []
           for (let i = 0; i < response.data.data.order.length; i++) {
             let order = response.data.data.order[i]
             let number = ''
@@ -3504,11 +3507,41 @@ export default {
               收费状态: order_status,
               退费日期: ''
             }
-
+            let obj2 = {
+              就诊号: order.mdtrt_id,
+              患者姓名: name,
+              患者性别: gender,
+              患者年龄: age,
+              开处时间: time,
+              参保号: order.his_patient.id_card_no,
+              应收金额: order.medfee_sumamt,
+              实收金额: order.medfee_sumamt,
+              医保统筹金额: order.hifp_pay,
+              大额基金金额: order.hifob_pay,
+              大病基金金额: order.hifmi_pay,
+              补充保险基金金额: order.hifes_pay,
+              医疗救助基金金额: order.maf_pay,
+              公务员基金: order.cvlserv_pay,
+              个人支付基金: order.psn_cash_pay,
+              个人账户支付金额: order.acct_pay,
+              医生姓名: doctor_name,
+              收费类别: balance_accounts,
+              总金额: order.medfee_sumamt,
+              现金支付: '',
+              账户支付: '',
+              支付宝支付: '',
+              微信支付: '',
+              其他支付: '',
+              收费时间: order.setl_time,
+              收费状态: order_status
+            }
             list.push(obj)
+            list2.push(obj2)
           }
-          import('@/vendor/Export2Excel').then((excel) => {
-            const tHeader = [
+          if(this.org_id != 10697 && this.org_id != 0){
+            import('@/vendor/Export2Excel').then((excel) => {
+              console.log('1111111南昌');
+              const tHeader = [
               '就诊号',
               '患者姓名',
               "患者性别",
@@ -3541,17 +3574,58 @@ export default {
               '收费时间',
               '收费状态',
               '退费日期'
-            ]
-            const filterVal = [
+              ]
+              const filterVal = [
+                '就诊号',
+                '患者姓名',
+                "患者性别",
+                "患者年龄",
+                '开处时间',
+                '险种类型',
+                '参保所属医保区划',
+                '参保号',
+                '属地名称',
+                '应收金额',
+                '实收金额',
+                '医保统筹金额',
+                '大额基金金额',
+                '大病基金金额',
+                '补充保险基金金额',
+                '医疗救助基金金额',
+                '公务员基金',
+                '个人支付基金',
+                '个人账户支付金额',
+                '科室',
+                '医生姓名',
+                '收费类别',
+                '收费者姓名',
+                '总金额',
+                '现金支付',
+                '账户支付',
+                '支付宝支付',
+                '微信支付',
+                '其他支付',
+                '收费时间',
+                '收费状态',
+                '退费日期'
+              ]
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: '消费明细'
+              })
+            })
+          }else{
+            import('@/vendor/Export2Excel').then((excel) => {
+              console.log('222222南昌');
+              const tHeader2 = [
               '就诊号',
               '患者姓名',
               "患者性别",
               "患者年龄",
               '开处时间',
-              '险种类型',
-              '参保所属医保区划',
               '参保号',
-              '属地名称',
               '应收金额',
               '实收金额',
               '医保统筹金额',
@@ -3562,10 +3636,8 @@ export default {
               '公务员基金',
               '个人支付基金',
               '个人账户支付金额',
-              '科室',
               '医生姓名',
               '收费类别',
-              '收费者姓名',
               '总金额',
               '现金支付',
               '账户支付',
@@ -3573,16 +3645,44 @@ export default {
               '微信支付',
               '其他支付',
               '收费时间',
-              '收费状态',
-              '退费日期'
-            ]
-            const data = this.formatJson(filterVal, list)
-            excel.export_json_to_excel({
-              header: tHeader,
-              data,
-              filename: '消费明细'
+              '收费状态'
+              ]
+              const filterVal2 = [
+                '就诊号',
+                '患者姓名',
+                "患者性别",
+                "患者年龄",
+                '开处时间',
+                '参保号',
+                '应收金额',
+                '实收金额',
+                '医保统筹金额',
+                '大额基金金额',
+                '大病基金金额',
+                '补充保险基金金额',
+                '医疗救助基金金额',
+                '公务员基金',
+                '个人支付基金',
+                '个人账户支付金额',
+                '医生姓名',
+                '收费类别',
+                '总金额',
+                '现金支付',
+                '账户支付',
+                '支付宝支付',
+                '微信支付',
+                '其他支付',
+                '收费时间',
+                '收费状态'
+              ]
+              const data = this.formatJson(filterVal2, list2)
+              excel.export_json_to_excel({
+                header: tHeader2,
+                data,
+                filename: '消费明细'
+              })
             })
-          })
+          }
         }
       })
     },

src/xt_pages/user/components/PatientDetail.vue

@@ -1269,7 +1269,7 @@
       </div>
       <div id="print-info-box" v-else>
         <div class="print_main_content" style="margin-top: 70px;">
-          <div class="order_title">{{ orgname }}<br/>血液净化患者首次门诊病历</div>
+          <div class="order_title" style="font-size: 25px;font-weight: 600;">{{ orgname }}<br/>血液净化治疗患者首次门诊病历</div>
           <div >
             <table >
               <tbody>
@@ -1473,7 +1473,7 @@
               </tbody>
             </table>
             <div class="print_footnote_panel">
-              <div class="proj">
+              <div class="proj" style="text-align: center;">
                  <span class="proj_title">医生签名：
                     <span v-if="patientPrint!=undefined&&getDcotorName(patientPrint.doctor) == ''">{{getDcotorNameOne(patientPrint.doctor)}}</span>
                     <span v-else>
@@ -1481,7 +1481,7 @@
                     </span>
                  </span>
               </div>
-              <div class="proj">
+              <div class="proj" style="text-align: right;">
                 <span class="proj_title">日期：</span>
                 <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span> 
                 <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span> 
@@ -2670,6 +2670,7 @@ export default {
 .print_footnote_panel .proj {
   display: inline-block;
   width: 49%;
+  text-align: center;
 }
 .print_footnote_panel .proj .proj_title {
   font-weight: 500;

src/xt_pages/user/coursePrint.vue

@@ -8,9 +8,11 @@
     </div>
     <div class="app-container">
       <div id="print_content">
-        <div class="print_page_main_content">
-          <div class="order-yy-name" style="text-align: center;">{{orgname}}</div>
-          <div class="order_title" style="padding-top:12px;text-align: center;"> 病程记录</div>
+        <div class="print_page_main_content" v-for="(item,index) in this.record" :key="index" style="page-break-after: always;">
+          <div class="order-yy-name" style="text-align: center;font-size: 25px;font-weight: 600;">{{orgname}}</div>
+          <div class="order_title" style="padding-top:12px;text-align: center;font-size: 25px;font-weight: 600;"> 
+            血液净化治疗患者病程记录
+          </div>
           <div class="row" style="border-bottom:1px solid #000; display: flex;padding-bottom: 10px;padding-top: 12px;" 
             v-if="org_id !=10206 && org_id !=0">
             <div  style="flex:1;text-align: center;">
@@ -46,14 +48,43 @@
 
             </div>
           </div>
-          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;" v-for="(item,index) in this.record" :key="index">
+          <div class="row" style="border-bottom:1px solid #000; display: flex;padding-bottom: 10px;padding-top: 12px;" 
+           v-else>
+            <div  style="flex:1;text-align: center;">
+              姓名：
+              <div  style="text-align: left;display:inline-block;">{{patient.name }}</div>
+            </div>
+
+            <div style="flex:1;text-align: center;">
+              性别：
+              <div  style="text-align: left;display:inline-block;">
+                {{ patient.gender ==1 ? '男': '女' }}
+              </div>
+            </div>
+
+            <div style="flex:1;text-align: center;" >
+              年龄：
+              <div  style="text-align: left;display:inline-block;">
+                {{patient.age}}
+              </div>
+            </div>
+
+
+            <div style="flex:1;text-align: left;" >
+              日期：
+              <div style="text-align: left;display:inline-block;" >
+                <!-- {{getTime(record[0].record_time,'{y}-{m}-{d} {h}:{i}')}} -->
+                {{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}
+              </div>
+            </div>
+          </div>
+          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;">
             <div class="inline_block" style="display: inline-block;" v-if="org_id !=10206 && org_id !=0">
               <div>{{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
             </div>
             <div class="inline_block" style="margin-left: 30px;display: inline-block;">
               <div>{{item.title}}</div>
             </div>
-
             <div class="inline_block" style="width:100%; word-wrap: break-word; word-break: break-all;">
               <div v-html="item.content" class="printP" >
 
@@ -70,7 +101,6 @@
               </span>
             </div>
           </div>
-
         
         </div>
       </div>
@@ -79,7 +109,6 @@
 
 </template>
 
-
 <script>
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -132,7 +161,7 @@
          
           this.adminUserList = resp.data.adminUser
           this.operators = resp.data.operators
-           console.log("GetCoursePrintData",this.operators)
+           console.log("GetCoursePrintData",resp)
            if (this.operators.length > 0) {
             var operatorsLen = this.operators.length
             for (var index = 0; index < operatorsLen; index++) {