Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 20220812

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

                        
                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="颈内静脉"></label-box>
                       &nbsp;
-                      （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : false" showValue="左"></label-box>
+                      <!-- （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : false" showValue="左"></label-box>
                       &nbsp;
                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="右"></label-box>）
                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="股静脉"></label-box>
                       &nbsp;
                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
+                      &nbsp; -->
+                    </div>
+                  </td>
+                  <td width="50">其它</td>
+                  <td width="150">
+                    <div class="under-line">
                       &nbsp;
+                      <span v-if="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') <= -1&&predialysis.blood_access_part_opera_name.indexOf('人造血管') <= -1&&predialysis.blood_access_part_opera_name.indexOf('直穿') <= -1&&predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') <= -1&&predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') <= -1">{{ predialysis.blood_access_part_opera_name }}</span>
                     </div>
                   </td>
+                  <td width="250"></td>
                 </tr>
                 </tbody>
               </table>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

               > 
               <label-box
                 :isChecked="
-                  prescription.mode_id == 3
-                    ? true
-                    : prescription.mode_id == 4
+                  prescription.mode_id == 4
                     ? true
                     : false
                 "
               ></label-box
               >&nbsp;
               <!-- <label-box :isChecked="prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>&nbsp; -->
-              <label-box
+              <!-- <label-box
                 :isChecked="prescription.mode_id == 5 ? true : false"
                 showValue="HF"
               ></label-box
-              >&nbsp;
+              >&nbsp; -->
+                  &nbsp;
+                  <span>其他：  <span v-if="prescription.mode_id==3">HD+HP</span>
+                                <span v-if="prescription.mode_id == 5">
+                                HF
+                                </span>
+                                <span v-if="prescription.mode_id == 6">
+                                SCUF
+                                </span>
+                                <span v-if="prescription.mode_id == 7">
+                                IUF
+                                </span>
+                                <span v-if="prescription.mode_id == 8">
+                                HFHD
+                                </span>
+                                <span v-if="prescription.mode_id == 9">
+                                HFHD+HP
+                                </span>
+                                <span v-if="prescription.mode_id == 10">
+                                PHF
+                                </span>
+                                <span v-if="prescription.mode_id == 11">
+                                HFR
+                                </span>
+                                <span v-if="prescription.mode_id == 12">
+                                HDF+HP
+                                </span>
+                                <span v-if="prescription.mode_id == 13">
+                                CRRT
+                                </span>
+                                <span v-if="prescription.mode_id == 14">
+                                腹水回输
+                                </span>
+                                <span v-if="prescription.mode_id == 15">
+                                HD前置换
+                                </span>
+                                <span v-if="prescription.mode_id == 16">
+                                HD后置换
+                                </span>
+                                <span v-if="prescription.mode_id == 17">
+                                HDF前置换
+                                </span>
+                                <span v-if="prescription.mode_id == 18">
+                                HDF后置换
+                                </span>
+                                <span v-if="prescription.mode_id == 19">
+                                IUF+HD
+                                </span>
+                                <span v-if="prescription.mode_id == 20">
+                                UF
+                                </span>
+                                <span v-if="prescription.mode_id == 21">
+                                HD+
+                                </span>
+                                <span v-if="prescription.mode_id == 22">
+                                血浆胆红素吸附+HDF
+                                </span>
+                                <span v-if="prescription.mode_id == 23">
+                                血浆胆红素吸附
+                                </span>
+                                <span v-if="prescription.mode_id == 24">
+                                  I-HDF
+                                </span>
+                                <span v-if="prescription.mode_id == 25">
+                                  HD高通
+                                </span>
+                                <span v-if="prescription.mode_id == 26">
+                                  CVVH
+                                </span>
+                                <span v-if="prescription.mode_id == 27">
+                                  CVVHD
+                                </span>
+                                <span v-if="prescription.mode_id == 28">
+                                  CVVHDF
+                                </span>
+                                <span v-if="prescription.mode_id == 29">
+                                  PE
+                                </span>
+                               <span v-if="prescription.mode_id == 30">
+                                血浆胆红素吸附+HP
+                                </span>
+                                <span v-if="prescription.mode_id == 31">
+                                HPD
+                                </span>
+                                <span v-if="prescription.mode_id == 32">
+                                HDP
+                                </span>
+                                </span>
+                
             </td>
             <td style="text-align: left" colspan="5">
               <span

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

               >
             </td>
           </tr>
-          <tr>
+          <!-- <tr>
             <td style="text-align: left" colspan="12">
               <span style="display: inline-block; margin-left: 15px">
                 透后评估: 透析过程:
                 }}
               </span>
             </td>
-          </tr>
+          </tr> -->
           <tr>
             <td style="text-align: left" colspan="2">
               <span style="display: inline-block; margin-left: 15px"
               >
             </td>
           </tr>
+          <tr>
+            <td style="text-align: left" colspan="6">
+              <span style="display: inline-block; margin-left: 15px"
+                >透析小结:{{ dialysis_summary ? dialysis_summary : "" }}
+              </span>
+            </td>
+          </tr>
           <!-- <tr>
             <td style="text-align:left;" colspan="3">
               <span style="display:inline-block;margin-left:15px;">医生签名:</span>

src/xt_pages/workforce/printOne.vue

 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <bread-crumb :crumbs="crumbs" style="flex:1;"></bread-crumb>
+      <el-row style="float: right;margin-right: 20px;">
+        <el-col :span="24">
+          <el-button
+            size="small"
+            type="success"
+            @click="hiddenBtn"
+            >{{hiddenText}}</el-button
+          >
+        </el-col>
+      </el-row>
       <el-row style="float: right">
         <el-col :span="24">
           <el-button
       td_4_width: '20%',
 
       month: 1,
+      hiddenFlag: false,
+      hiddenText: '隐藏备注',
       begin_day: 1,
 
       schedules: [
     this.getlist()
   },
   methods: {
+    hiddenBtn() {
+      if (this.hiddenFlag) {
+        this.hiddenFlag = false
+        this.hiddenText = '隐藏备注'
+      } else {
+        this.hiddenFlag = true
+        this.hiddenText = '显示备注'
+      }
+    },
     getAllZone() {
       GetAllZone().then((response) => {
         if (response.data.state == 0) {
       if (arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
           arr[i].name = this.nameSplit(arr[i].name)
-          str += arr[i].name + '(' + '上次床位:' + arr[i].order.DeviceNumber.zone.name + '-' + arr[i].order.DeviceNumber.number + '  ' + '血管通路:' + this.getBloodAccess(arr[i].order.blood_access_id) + '  ' + '上机备注:' + arr[i].order.order_remark + ')<br/>'
+          if (this.hiddenFlag) {
+            str += arr[i].name + '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp '
+          } else {
+            str += arr[i].name + '(' + '上次床位:' + arr[i].order.DeviceNumber.zone.name + '-' + arr[i].order.DeviceNumber.number + '  ' + '血管通路:' + this.getBloodAccess(arr[i].order.blood_access_id) + '  ' + '上机备注:' + arr[i].order.order_remark + ')<br/>'
+          }
         }
       }
       console.log(str, 'strstrstr')

src/xt_pages/workforce/remind_print_setting_one.vue

              
 
               <div class="signPrint" style="font-size:16px;">
-                <div>姓名:
+                <div style="font-size:24px;font-weight: 400;">姓名:
                   <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
                   <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
                   <span v-if="type ==1 && printObj.name == 1">（{{ main_collection.patient.dialysis_no }}，
                     {{getNewAge(main_collection.id_card_no) }}岁）</span> 
                   
                 </div>
-                <div class="printCell">身份证:
-                    <span v-if="type ==1">{{main_collection.patient.id_card_no}} </span>
-                    <span v-if="type ==2">{{main_collection.id_card_no}} </span>
-                </div>
-                <div class="printCell">电话号码:
-                    <span v-if="type ==1">{{main_collection.patient.phone}} </span>
-                    <span v-if="type ==2">{{main_collection.phone}} </span>
-                </div>
                 <div class="printCell">
                   透析模式:
                     <span>{{getModeId(main_collection.mode_id)}}</span>
                   
                 </div>
-                <div class="printCell">
-                  <span>
-                    分区/床号
-                    <span  style="width:auto;">{{main_collection.zone.name}}/</span>
-                    {{ main_collection.number.number }}
-                    <!-- <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span> -->
-                  </span>
-                 
-                </div>
-                <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
-                    <span>上次脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>
-                </div>
                 <div class="printCell">
                   <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
                 </div>
-             
                 <div class="printCell">
                  首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
                    </span>
           
                 </div>
-           
+                <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
+                    <span>上次脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>
+                </div>
+                <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
+                    <span>上次透析时长：{{ main_collection.lastafterweight.actual_treatment_hour }}小时{{ main_collection.lastafterweight.actual_treatment_minute }}分钟</span>
+                </div>
+                <div class="printCell">身份证:
+                    <span v-if="type ==1">{{main_collection.patient.id_card_no}} </span>
+                    <span v-if="type ==2">{{main_collection.id_card_no}} </span>
+                </div>
+                <div class="printCell">电话号码:
+                    <span v-if="type ==1">{{main_collection.patient.phone}} </span>
+                    <span v-if="type ==2">{{main_collection.phone}} </span>
+                </div>
                 <div class="printCell">
                    透析器:
                     <span v-if="type ==1">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
                     <span v-if="type ==1">{{getBloodAccess(main_collection.dialysis_order.blood_access_id)}} </span>
                     <span v-if="type ==2">{{getBloodAccess(main_collection.dialysis_order.blood_access_id)}} </span>
                 </div>
+                
+                <div class="printCell">
+                  <span>
+                    分区/床号
+                    <span  style="width:auto;">{{main_collection.zone.name}}/</span>
+                    {{ main_collection.number.number }}
+                    <!-- <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span> -->
+                  </span>
+                 
+                </div>
               
               </div>
            </div>
         printObj: {},
         type: 1,
         printDate: '',
-        loading:false,
+        loading: false
       }
     },
     components: {
           week_time: this.week_time,
           zone: this.zone
         }
-      
+  
         this.loading = true
         getScheduleList(params).then(response => {
           if (response.data.state == 1) {
         }
       },
       printAction: function() {
-        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 200px;} @page {margin-top:10px;}}'
-        const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 200px;} @page {margin-top:10px;}}'
-        const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;}.signPrint{width:40%;float: left;margin-left: 5%; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; margin-bottom: 20px;padding: 20px 10px;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 200px;} @page {margin-top:10px;}}'
+        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
+        const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
+        const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;}.signPrint{width:40%;float: left;margin-left: 5%; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; margin-bottom: 20px;padding: 20px 10px;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
         if (this.org_id == 9671 || this.org_id == 10340) {
           printJS({
             printable: 'print_content',
         // }
         var now_time = parseInt(this.week_type) * 86400 + this.start_time
 
-       let weekOfDay = parseInt(moment().format('E'))
-        let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
-        console.log("卡 is h2323233232",this.toStamp(next_monday))
-        let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
-        console.log("下周日",this.toStamp(next_sunday))
-
-      
+        const weekOfDay = parseInt(moment().format('E'))
+        const next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD')
+        console.log('卡 is h2323233232', this.toStamp(next_monday))
+        const next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
+        console.log('下周日', this.toStamp(next_sunday))
 
         const params = {
           start_time: this.toStamp(next_monday),
         return name
       },
       toStamp(date) {
-        const myDate = new Date(date).getTime()/1000 - 28800
+        const myDate = new Date(date).getTime() / 1000 - 28800
         // const stmapEg = Date.parse(myDate) / 1000
-       return myDate
-      },
+        return myDate
+      }
 
     }
   }
 .printCell{
   span{
     display: inline-block;
-    width: 180px;
+    width: 220px;
   }
 }
 </style>