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

src/api/dialysis_record.js

   })
 }
 
+export function getInitPrintData(params) {
+  return request({
+    url: '/api/getinitprintdata',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                             透析液温度(°C)
                           </td>
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
-                          <td width="50">电导度<br />(ms/cm)</td>
+                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
+                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
                           <td width="50">超滤量<br />(ml)</td>
                           <td
                             v-if="
                                 : ""
                             }}
                           </td>
-                          <td>
+                          <td v-if="org_id != 10121 && org_id != 9675&& org_id != 0">
                             {{
                               monitor_record.conductivity
                                 ? monitor_record.conductivity
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
+                          {{
+                            monitor_record.blood_oxygen_saturation
+                              ? monitor_record.blood_oxygen_saturation
+                              : ""
+                          }}
+                        </td>
                           <td>
                             <span v-if="monitor_record.operate_time">{{
                               monitor_record.ultrafiltration_volume

src/xt_pages/dialysis/components/consumables.vue

         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
     </div>
+    <div class="cell clearfix" style="justify-content: space-between;">
+      <div style="display:flex;">
+        <label class="title"> <span class="name">出库状态</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id == goodType ? 'active' : ''"
+              @click="selectGoodType(item.id)"
+              v-for="item in goodList"
+              :key="item.id"
+            >
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
     <div>
       <el-table
         :data="list"
           page:1,
           limit:10,
           keywords:"",
+          good_type:0,
         },
         schedulType: 0,
         schedulArr: [
         ],
         selected_date: "",
         partitionArr: [],
+        goodList:[
+          { id: 0, name: '全部' },
+          { id: 1, name: '已出库' },
+          { id: 2, name: '未出库' },
+        ],
         partitionType: 0,
+        goodType:0,
         tableData: [{
           date: '2016-05-03',
           name: '王小虎',
         good_types: [],
         arrKey:[],
         arrList:[],
+        total:0,
 
       }
     },
         this.GetDialysisgoods()
 
       },
+      selectGoodType(goodType){
+        this.goodType = goodType
+        this.query.good_type = goodType
+        this.GetDialysisgoods()
+      },
       getAllZone: function() {
         GetAllZone().then(response => {
           if (response.data.state == 0) {

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

                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo">{{ patient.name }}</el-button>
-            <!-- <el-button style="position: absolute;left: 20%;top: 2%" @click="handlePatientInfoOne">上机打印单 </el-button> -->
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"
         </el-dialog>
 
 
-        <el-dialog
-                :title="patient.name"
-                :visible.sync="startVisibility"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                :show-close="false"
-                width="30%"
-        >
-         <el-button
-            size="small"
-            icon="el-icon-printer"
-            type="primary"
-            @click="printAction"
-            style="float:right"
-            >打印</el-button
-          >
-       <div id="print_content">
-        <div class="print_main_content">
-          <div class="table_panel">
-              <div class="signPrint" style="font-size:16px;">
-                <div style="margin-left:50px;">姓名:
-                  <span>{{ patient.name }} </span>
-                  （{{patient.dialysis_no }}，{{patient.age}}岁）
-                </div>
-                <div class="printCell">
-                  <span>
-                    床号：{{schedual.device_number.number}}
-                    <span style="width:auto;" v-if="schedual.schedule_type == 1">上午</span>
-                    <span style="width:auto;" v-if="schedual.schedule_type == 2">下午</span>
-                    <span style="width:auto;" v-if="schedual.schedule_type == 3">晚上</span>
-                  </span>
-                  <span> </span>
-                </div>
-                <div class="printCell">
-                  <span>干体重：{{getDryWeight()}}Kg</span>
-                  <span>抗凝剂：
-                     {{dialysisPrescription.anticoagulant}}
-                  </span>
-                </div>
-                <div class="printCell">
-                  <span>净重值：Kg</span>
-                  <span>首剂：{{dialysisPrescription.anticoagulant}}</span>
-                </div>
-                <div class="printCell">
-                  <span>体重增加：Kg</span>
-                  <span>维持：</span>
-                </div>
-                <div class="printCell">
-                  <span>处方脱水量：{{dialysisPrescription.target_ultrafiltration}}</span>
-                  <span>总量：</span>
-                </div>
-              </div>
-         
-          </div>
-        </div>
-      </div>
-
-            <span slot="footer" class="dialog-footer">
-        <el-button @click="cancleMsgOne()">取 消</el-button>
-        <el-button type="primary" @click="cancleMsgOne()">确 定</el-button>
-      </span>
-    </el-dialog>
 
         <multi-select-box
                 :propsForm="InnerDialogProps"
   import { calculateAnticoagulantZL, uParseTime } from '@/utils/tools'
   import store from '@/store'
   import MsgTip from './MsgTip'
-  import print from 'print-js'
   import request from '@/utils/request'
   import multiSelectBox from './MultiSelectBox'
 
         const res = new Map()
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 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: 180px;} @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: 170px;} @page {margin-top:10px;}}'
-        printJS({
-          printable: 'print_content',
-          type: 'html',
-          documentTitle: '  ',
-          style: style1,
-          scanStyles: false
-        }) 
-      },
+   
 
     },
 

src/xt_pages/dialysis/details/index.vue

           @click="next"
           >下一位</el-button
         >
+        <el-button
+          size="small"
+          type="primary"
+          @click="printOrderOne"
+          icon="el-icon-printer"
+          >打印上机单</el-button
+        >
         <el-button
           size="small"
           type="primary"
         </el-tab-pane>
       </el-tabs>
 
+     
 
+        <el-dialog
+                :visible.sync="startVisibility"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                :show-close="false"
+                width="30%"
+        >
+         <el-button
+            size="small"
+            icon="el-icon-printer"
+            type="primary"
+            @click="printAction"
+            style="float:right"
+            >打印</el-button
+          >
+       <div id="print_content">
+        <div class="print_main_content">
+          <div class="table_panel">
+             <div v-for="(main_collection,index) in printList" :key="index">
+              <div class="signPrint" style="font-size:16px;">
+                <div style="margin-left:50px;">姓名:
+                  <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>
+                  （{{ main_collection.patient.dialysis_no }}，{{ main_collection.patient.age }}岁）
+                </div>
+                <div class="printCell">
+                  <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>
+                  <span> </span>
+                </div>
+                <div class="printCell">
+                   <span>干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
+                    <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
+                 
+                </div>
+                <div class="printCell">
+                  <span>净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
+                  首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}} mg
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                </div>
+                <div class="printCell">
+                  <span>体重增加：{{ (main_collection.assessmentbefor.weight_before - main_collection.lastafterweight.weight_after).toFixed(2) }}Kg</span>
+                 维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    mg/h
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                   iu/h
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    iu/h
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    iu/h
+                   </span>
+                </div>
+                <div class="printCell">
+                  <span>处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
+                 总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                    mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                   mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    mg
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    iu
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                     iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                   iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    iu
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                   iu
+                   </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="startVisibility = false">取 消</el-button>
+        <el-button type="primary" @click="startVisibility = false">确 定</el-button>
+      </span>
+    </el-dialog>
 
 
     </div>
   getDialysisScheduleDetail,
   getLongAdvice,
   getDialysisRecordInitData,
-  getDialysisSchedules
+  getDialysisSchedules,
+  getInitPrintData
 } from '@/api/dialysis_record'
 import { parseTime } from '@/utils'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-
+import print from 'print-js'
 export default {
   name: 'index',
   components: {
       stockType:[],
       preparestock:[],
       his_doctor_advices:[],
+      startVisibility:false,
+      printList:[],
+      anticoagulants_confit:null,
     }
   },
   created() {
       data: {type:3,page:0,size:0},
     };
     this.websocketSend(this.initData)
-
     this.getInitData()
+    this.getInitPrintData()
+    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
   },
   beforeMount() {
     if (this.websocket) {
           }
 
           var solution = resp.data.solution // 透析方案
-          // console.log("透析方案22223333333333",solution)
+         
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
 
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-          //  console.log("透器评估",predialysis_evaluation)
+        
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {
               predialysis_evaluation.blood_access_part_id = 0
           var system_prescribe = resp.data.system_prescribe
 
           var lastAssessment =  resp.data.lastAssessment
-          // console.log("最后一次血管通路",lastAssessment)
+         
           this.$refs.nav.setLastRecord(
             lastPredialysisEvaluation,
             lastMonitorRecord,
           this.device_numbers = resp.data.device_numbers
 
           var his_doctor_advices = resp.data.his_advices
-          console.log("his_doctor_advices 2323232233232332323323232",this.his_doctor_advices)
+        
           this.his_doctor_advices = his_doctor_advices
           this.his_is_open = resp.data.is_open_config.is_open
 
           this.is_advice_open = resp.data.is_advice_open.is_advice_open
-          console.log("is_advice_open 2323232233232332323323232",this.is_advice_open)
+          
           var stockType =  resp.data.stockType
           this.stockType = stockType
 
           }else{
             this.preparestock = []
           }
-          console.log("prepare222222",prepare)
-
+    
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }
             return cur
           }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
-          console.log(this.doctor_advices)
-
-
           var device_map = {}
           for (let index = 0; index < this.devices.length; index++) {
             const device = this.devices[index]
         '/dialysis/print?xtdate=' + xtdate + '&xtno=' + this.patient.dialysis_no
       )
     },
+    printOrderOne(){
+      this.startVisibility = true
+    },
     // 日期
     handleScheduleDateChange: function(index) {
       this.treatStateVal = 0
     },
     requestDialysisSchedules: function() {
       var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
-      console.log("ymd233223232",ymd)
-      console.log("prescription",this.prescription)
       getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           //   }
           // }
 
-          // console.log("hh2332223323232",schedules)
+         
           this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           const patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
           if (this.activeName == 'first') {
           })
           this.tableData = newArr
           this.getData()
-          // console.log(66666666666,this.tableData)
+         
         } else {
           this.$message.error(resp.msg)
         }
           for (let j = 0; j < patientArr[i].schedules.length; j++) {
             if (patientArr[i].schedules.length > 0 && patientArr[i].schedules[j].dialysis_order == null) {
               // 删除元素后改变i的值
-              console.log('透析区', patientArr[i].schedules[j])
+              
               patientArr[i].schedules.splice(j--, 1)
             }
           }
         }
         let arr1 = []
-        console.log('patientArr', patientArr)
+     
         // let patientArr =
         if (this.patientStateVal == 0) {
           arr1 = patientArr
               }
             }
           }
-          console.log('执行1', arr)
+         
           arr1 = arr
         } else if (this.patientStateVal == 2) {
           let arr = []
               }
             }
           }
-          console.log('执行2', arr)
+         
           arr1 = arr
         } else if (this.patientStateVal == 3) {
           let arr = []
               }
             }
           }
-          console.log('执行1', arr)
+
           arr1 = arr
         } else if (this.patientStateVal == 4) {
           let arr = []
               }
             }
           }
-          console.log('执行2', arr)
+      
           arr1 = arr
         }
 
           arr = JSON.parse(JSON.stringify(arr1))
           for (let i = 0; i < arr.length; i++) {
             for (let j = 0; j < arr[i].schedules.length; j++) {
-              console.log(77777777777,arr[i].schedules)
+             
               if(arr[i].schedules[j].doctor_advice.length == 0){
                 arr[i].schedules.splice(j--, 1)
               }
       }
     },
     websocketMess() {
-      console.log('执行',this.websocket)
+     
       this.websocket.onmessage = e => {
         let res = JSON.parse(e.data);
         // let res = re.data;
                   calledArr.push(item)
               }
           })
-          console.log('waitingCalledArr待叫号',waitingCalledArr)
-          console.log('waitingCalledArr以较好',calledArr)
+    
           this.waitingCalled = waitingCalledArr
           this.called = calledArr
         }else if(res.channel == 'allQueueList'){
       let org_id =  parseInt(sessionStorage.getItem("org_id"));
       let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
       axios.get('/api/index/callpatient?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id).then(res => {
-        console.log(res)
+       
         // let patientArr = res.data.queue_list.data
         // this.patientArr = patientArr
         // this.$emit('child-event',this.patientArr)
       }else {
         schedule_type = 2
       }
-      console.log('patient_id',this.$route.query.date)
+     
       let org_id =  parseInt(sessionStorage.getItem("org_id"));
       let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
       axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
-        console.log(res)
         if(res.data.data.patientInfo == null){
           this.$message.error('已经是最后一位了');
           return
     },
     getDates(time){
       return moment(time * 1000).format('HH:mm:ss')
+    },
+    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: 180px;} @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: 170px;} @page {margin-top:10px;}}'
+        printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style1,
+          scanStyles: false
+        }) 
+      },
+    getInitPrintData(){
+       var params = {
+         patient_id:this.$route.query.patient_id,
+         record_date:this.$route.query.date,
+       }
+      getInitPrintData(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("list2332322332",list)
+          this.printList = list
+        }
+      })
     }
   }
 }

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

         </div>
       </div>
 
+       <div class="cell clearfix">
+        <label class="title"> <span class="name">执行状态</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id == excution_way ? 'active' : ''"
+              @click="selectExcutionWay(item.id)"
+              v-for="item in executionList"
+              :key="item.id"
+            >
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+      </div>
+
+
       <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"
       show:true,
       showOne:false,
       deliveryWay:[],
+      executionList:[
+        {id:0,name:"全部"},
+        {id:1,name:"已执行"},
+        {id:2,name:"未执行"},
+      ],
       delivery_way:0,
       patient_id:0,
       org_id:0,
+      excution_way:0,
     };
   },
   created() {
        this.requestSchedualDoctors(this.time)
     },
 
+    selectExcutionWay(val){
+       this.excution_way = val
+       this.requestSchedualDoctors(this.time)
+    },
+
 
     changeTime() {
       this.listQuery.schedul_time = this.time;
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
 
-        getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id}).then(rs => {
+        getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                         <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
 
-                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
-                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
+                        <td
+                          width="50"
+                          v-if="
+                            org_id != 10121 && org_id != 9675 && org_id != 0
+                          "
+                        >
+                          电导度<br />(ms/cm)
+                        </td>
+                        <td
+                          width="50"
+                          v-if="
+                            org_id == 10121 || org_id == 9675 || org_id == 0
+                          "
+                        >
+                          SpO₂<br />(%)
+                        </td>
                         <td width="50">超滤量<br />(ml)</td>
                         <td
                           v-if="
                           {{ monitor.temperature ? monitor.temperature : "" }}
                         </td>
 
-
-                        <td v-if="org_id != 9538 && org_id != 10121 && org_id != 9675&& org_id != 0">
+                        <td
+                          v-if="
+                            org_id != 9538 &&
+                            org_id != 10121 &&
+                            org_id != 9675 &&
+                            org_id != 0
+                          "
+                        >
                           {{ monitor.conductivity ? monitor.conductivity : "" }}
                         </td>
                         <td v-if="org_id == 9538">
                               : ""
                           }}
                         </td>
-                        <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
+                        <td
+                          v-if="
+                            org_id == 10121 || org_id == 9675 || org_id == 0
+                          "
+                        >
                           {{
                             monitor.blood_oxygen_saturation
                               ? monitor.blood_oxygen_saturation
                           v-if="
                             (dialysisOrder &&
                               monitor.operate_time > dialysisOrder.end_time) ||
-
                             (dialysisOrder &&
                               monitor.operate_time < dialysisOrder.start_time)
                           "
             </tbody>
           </table>
         </div>
-        
 
         <template v-if="this.totollength > 13">
           <div style="display: inline-block; width: 100%; text-align: center">

src/xt_pages/workforce/remind_print_setting.vue

         <div class="print_main_content">
           <div class="table_panel">
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
-              <div class="signPrint" v-if="org_id != 10188 && org_id!=10217  && org_id!=10340">
+              <div class="signPrint" v-if="org_id != 10188 && org_id!=10217  && org_id!=10340 && org_id!=9671 && org_id!=9675">
                 <div>
                  <span v-if="printObj.zone == 1">分区/</span>
                  <span v-if="printObj.number == 1">床位号:</span>
                    <span>{{getAnticoagulant(main_collection.dialysissolution.mode_id)}}</span>
                   </span>
                 </div>
-               <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
-                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
+               <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
                 <div v-if="printObj.anticoagulant_zongliang == 1">
                   用量:
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
                 </div>
-                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
-                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
-                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
                 <div>用法:静脉注射</div>
                 <div>打印时间:{{currentDate}}</div>
               </div>
                 </div>
                 <div class="printCell">
                   <span>净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
-                  <span>首剂：{{main_collection.dialysissolution.anticoagulant_shouji}}</span>
+                 首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}} mg
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                 
                 </div>
                 <div class="printCell">
                   <span>体重增加：{{ (main_collection.assessmentbefor.weight_before - main_collection.lastafterweight.weight_after).toFixed(2) }}Kg</span>
-                  <span>维持：{{main_collection.dialysissolution.anticoagulant_weichi}}</span>
+                  维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    mg/h
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                   iu/h
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    iu/h
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    iu/h
+                   </span>
+              
                 </div>
                 <div class="printCell">
-                  <span>处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}</span>
-                  <span>总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}</span>
+                  <span>处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
+                  总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                    mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                   mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    mg
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    iu
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                     iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                   iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    iu
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                   iu
+                   </span>
+          
                 </div>
               </div>
            </div>