新分支

src/xt_pages/device/airDisinfectTwo.vue

@@ -54,7 +54,13 @@
                 </el-table-column>
                 <el-table-column prop="date" label="责任人" align="center" min-width="50">
                     <template slot-scope="scope">
-                      {{getName(scope.row.first_creator)}}
+                     <span v-if="setAdminUserES(scope.row.first_creator?scope.row.first_creator:scope.row.first_creator) == ''">
+                        {{getName(scope.row.first_creator)}}
+                     </span>
+                    <span v-else>
+                        <img style="height:30px;" :src="setAdminUserES(scope.row.first_creator?scope.row.first_creator:scope.row.first_creator)" alt="" srcset="">
+                    </span>     
+                    
                     </template>
                 </el-table-column>
 
@@ -70,7 +76,13 @@
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
                     <template slot-scope="scope">
-                        {{getName(scope.row.first_creator)}}
+                        <!-- {{getName(scope.row.first_creator)}} -->
+                        <span v-if="setAdminUserES(scope.row.sencond_creator?scope.row.sencond_creator:scope.row.sencond_creator) == ''">
+                        {{getName(scope.row.sencond_creator)}}
+                     </span>
+                    <span v-else>
+                        <img style="height:30px;" :src="setAdminUserES(scope.row.sencond_creator?scope.row.sencond_creator:scope.row.sencond_creator)" alt="" srcset="">
+                    </span>     
                    </template>
                 </el-table-column>
 
@@ -86,7 +98,13 @@
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
                     <template slot-scope="scope">
-                        {{getName(scope.row.sencond_creator)}}
+                        <!-- {{getName(scope.row.sencond_creator)}} -->
+                    <span v-if="setAdminUserES(scope.row.third_creator?scope.row.third_creator:scope.row.third_creator) == ''">
+                        {{getName(scope.row.third_creator)}}
+                     </span>
+                    <span v-else>
+                        <img style="height:30px;" :src="setAdminUserES(scope.row.third_creator?scope.row.third_creator:scope.row.third_creator)" alt="" srcset="">
+                    </span>     
                     </template>
                 </el-table-column>
 
@@ -97,7 +115,13 @@
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{getName(scope.row.third_creator)}}
+                        <!-- {{getName(scope.row.third_creator)}} -->
+                        <span v-if="setAdminUserES(scope.row.last_creator?scope.row.last_creator:scope.row.last_creator) == ''">
+                            {{getName(scope.row.third_creator)}}
+                        </span>
+                        <span v-else>
+                            <img style="height:30px;" :src="setAdminUserES(scope.row.last_creator?scope.row.last_creator:scope.row.last_creator)" alt="" srcset="">
+                        </span>     
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="操作" align="center" min-width="150">
@@ -146,10 +170,26 @@
                   </div>
                   <div class="form_title"><span >透析室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.first_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
+                      <el-select v-model="form.first_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.first_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.first_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.first_disinfection_time " ></el-input>
@@ -207,10 +247,26 @@
 
                   <div class="form_title"><span >治疗室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_water"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.sencond_disinfection_time " ></el-input>
@@ -268,10 +324,26 @@
 
                   <div class="form_title"><span >水处理、库房</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.third_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_water"></el-input> -->
+                      <el-select v-model="form.third_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.third_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.third_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.third_disinfection_time " ></el-input>
@@ -404,10 +476,26 @@
                   </div>
                   <div class="form_title"><span >透析室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.first_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
+                      <el-select v-model="form.first_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.first_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.first_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.first_disinfection_time " ></el-input>
@@ -463,10 +551,26 @@
                   </el-form-item>
                   <div class="form_title"><span >治疗室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_water"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.sencond_disinfection_time " ></el-input>
@@ -522,10 +626,26 @@
                   </el-form-item>
                   <div class="form_title"><span >水处理、库房</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.third_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_water"></el-input> -->
+                      <el-select v-model="form.third_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.third_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.third_disinfection_time " ></el-input>
@@ -770,6 +890,20 @@
          total:0,
          tableData: [],
          hiddenShow:false,
+         disInfectionWaterList:[
+         { id: 1, name: "0.22%季铵盐" },
+         { id: 2, name: "500mg/l含氯消毒剂" },
+         { id: 3, name: "1000mg/l含氯消毒剂" },
+         { id: 4, name: "1500mg/l含氯消毒剂" },
+         { id: 5, name: "消毒湿巾" }   
+         ],
+         DisinfectionMode: [
+            { id: 1, name: "化学消毒" },
+            { id: 2, name: "热消毒" },
+            { id: 3, name: "化学消毒+热消毒" }
+         ],
+         operators: [],
+         operatorMaps:{},
         }
       },
       created(){
@@ -799,7 +933,18 @@
                var list = response.data.data.list
                console.log("list222222",list)
                this.docList = list
+               this.operators = response.data.data.operators
+            if (this.operators.length > 0) {
+                var operatorsLen = this.operators.length
+                for (var index = 0; index < operatorsLen; index++) {
+                this.$set(
+                    this.operatorMaps,
+                    this.operators[index].id,
+                    this.operators[index]
+                )
+                }
             }
+           }
           })  
         },
         saveNewAirDisinfect(formName){
@@ -1037,6 +1182,18 @@
               });
             }, 1);
          },
+         setAdminUserES(id) {
+            if (id === 0) {
+            return ''
+            }
+            if (id in this.operatorMaps) {
+            
+            return this.operatorMaps[id].url
+            
+            } else {
+            return ''
+            }
+        },
       }
     }
   </script>

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -2397,7 +2397,7 @@
                             v-if="!record.check"
                           ></div>
                         </div> -->
-                        <div class="inline_block" style="flex: 1">
+                        <!-- <div class="inline_block" style="flex: 1">
                           下机护士：
                           <div
                             class="under_line"
@@ -2436,12 +2436,12 @@
                               style="height: 40px"
                             />
                           </div>
-                        </div>
-                          <!-- <div class="inline_block" style="flex: 1">
+                        </div> -->
+                          <div class="inline_block" style="flex: 1">
                           患者签名：
                           <div
                             class="under_line"
-                            style="width: 80px; text-align: center"
+                            style="width: 70px; text-align: center"
                           >
                            
                             <img
@@ -2453,7 +2453,7 @@
                               style="height: 40px"
                             />
                           </div>
-                        </div> -->
+                        </div>
                         <div class="inline_block" style="flex: 1">
                           治疗医生：
                           <div

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyThree.vue

@@ -204,43 +204,37 @@
                       colspan="2"
                     >
                       治疗方式:
-                      <label-box
-                        :isChecked="record&&record.prescription.mode_id == 1 ? true : false"
-                        showValue="HD"
+                     
+                      <check-box
+                        text="HD" 
+                        :checked="record&&record.prescription.mode_id == 1"
                       >
-                      </label-box>
-                      <label-box
-                        :isChecked="record&&record.prescription.mode_id == 2 ? true : false"
-                        showValue="HDF"
-                      ></label-box>
-                      (<label-box
-                        :isChecked="
-                          record&&record.prescription.mode_id == 2 &&
-                          record&&record.prescription.displace_liqui_part == 1
-                            ? true
-                            : false
-                        "
-                        showValue="前稀释"
-                      ></label-box>
-                      <label-box
-                        :isChecked="
-                          record&&record.prescription.mode_id == 2 &&
-                          record&&record.prescription.displace_liqui_part == 2
-                            ? true
-                            : false
-                        "
-                        showValue="后稀释"
-                      ></label-box>
+                     
+                      </check-box>
+
+                      <check-box
+                       :checked="record&&record.prescription.mode_id == 2"
+                        text="HDF"
+                      ></check-box>
+
+                      (<check-box
+                      :checked="record&&record.prescription.mode_id == 2 &&  record&&record.prescription.displace_liqui_part == 1"
+                        text="前稀释"
+                      ></check-box>
+                      <check-box
+                      :checked="record&&record.prescription.mode_id == 2 &&  record&&record.prescription.displace_liqui_part == 2"
+                        text="后稀释"
+                      ></check-box>
                       ， 置换量：&nbsp;{{
                         record&&record.prescription.displace_liqui_value
                           ? record&&record.prescription.displace_liqui_value
                           : "/"
                       }}L&nbsp; )
 
-                      <label-box
-                        :isChecked="record&&record.prescription.mode_id > 2 ? true : false"
-                        showValue="其他:"
-                      ></label-box>
+                      <check-box
+                       :checked="record&&record.prescription.mode_id > 2" 
+                        text="其他"
+                      ></check-box>
                       &nbsp;
                       <span v-if="record&&record.prescription.mode_id > 2">
                         {{ record&&record.prescription.mode }}
@@ -264,27 +258,22 @@
 
                     <td colspan="12" style="padding-left: 10px">
                       治疗抗凝:
-                      <label-box
-                        v-if="record&&record.prescription.anticoagulant == 3"
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 3 ? true : false
-                        "
-                        showValue="低分子肝素:"
-                      ></label-box>
-                      <label-box
+                      <check-box
+                       :checked="record&&record.prescription.anticoagulant == 3" 
+                        text="低分子肝素"
+                      ></check-box>
+                     
+                      <check-box
                         v-if="record&&record.prescription.anticoagulant == 6"
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 6 ? true : false
-                        "
-                        showValue="低分子肝素钙:"
-                      ></label-box>
-                      <label-box
+                        :checked="record&&record.prescription.anticoagulant == 6" 
+                        text="低分子肝素钙:"
+                      ></check-box>
+                  
+                      <check-box
                         v-if="record&&record.prescription.anticoagulant == 7"
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 7 ? true : false
-                        "
-                        showValue="低分子肝素钠:"
-                      ></label-box>
+                        :checked="record&&record.prescription.anticoagulant == 7" 
+                        text="低分子肝素钠:"
+                      ></check-box>
 
                       &nbsp;&nbsp;{{
                         record&&record.prescription.anticoagulant_zongliang &&
@@ -294,13 +283,13 @@
                           ? record&&record.prescription.anticoagulant_zongliang
                           : ""
                       }}iu；&nbsp;&nbsp;
-                      <label-box
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 2 ? true : false
-                        "
-                        showValue="普通肝素:"
-                      ></label-box
-                      >首剂 &nbsp;&nbsp;<span
+                    
+                      <check-box
+                        v-if="record&&record.prescription.anticoagulant == 2"
+                        :checked="record&&record.prescription.anticoagulant == 2" 
+                        text="普通肝素:"
+                      ></check-box>
+                      首剂 &nbsp;&nbsp;<span
                         ><span style="width: 35px; display: inline-block">
                           {{
                             record&&record.prescription.anticoagulant_shouji &&
@@ -309,8 +298,7 @@
                               ? record&&record.prescription.anticoagulant_shouji
                               : ""
                           }}
-                        </span></span
-                      >
+                        </span></span>
                       &nbsp;mg&nbsp;&nbsp;&nbsp; 追加&nbsp;&nbsp;<span>{{
                         record&&record.prescription.anticoagulant_weichi &&
                         record&&record.prescription.anticoagulant == 2
@@ -324,26 +312,23 @@
                           : ""
                       }}</span
                       >&nbsp;&nbsp;mg；
-                      <label-box
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 1 ? true : false
-                        "
-                        showValue="无肝素"
-                      ></label-box
-                      >&nbsp;&nbsp;
-                      <label-box
-                        :isChecked="
-                          record&&record.prescription.anticoagulant != 1 &&
-                          record&&record.prescription.anticoagulant != 2 &&
-                          record&&record.prescription.anticoagulant != 3 &&
-                          record&&record.prescription.anticoagulant != 6 &&
-                          record&&record.prescription.anticoagulant != 7 &&
-                          record&&record.prescription.anticoagulant != 0
-                            ? true
-                            : false
-                        "
-                        showValue="其他"
-                      ></label-box>
+                    
+                      <check-box
+                        v-if="record&&record.prescription.anticoagulant == 1"
+                        :checked="record&&record.prescription.anticoagulant == 1" 
+                        text="无肝素"
+                      ></check-box>&nbsp;&nbsp;
+                      <check-box
+                        v-if="record&&record.prescription.anticoagulant == 1"
+                        :checked=" record&&record.prescription.anticoagulant != 1 && 
+                        record&&record.prescription.anticoagulant != 2 &&
+                        record&&record.prescription.anticoagulant != 3 &&
+                        record&&record.prescription.anticoagulant != 6&&
+                        record&&record.prescription.anticoagulant != 7 &&
+                        record&&record.prescription.anticoagulant != 0" 
+                        text="其他"
+                      ></check-box>&nbsp;&nbsp;
+                     
                       <span style="padding-left: 10px">
                         <span
                           style="
@@ -488,96 +473,60 @@
                       <div style="display: flex; justify-content: flex-start">
                         <div style="width: 100%">
                           血管通路: &nbsp;
-                          <label-box
-                            :isChecked="
-                              record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '自体内瘘'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="自体内瘘"
-                          ></label-box>
+                        
+
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('自体内瘘') > -1" 
+                            text="自体内瘘"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '人造血管'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="人造血管"
-                          ></label-box>
-                          &nbsp; &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '直穿'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="直穿"
-                          ></label-box>
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('人造血管') > -1" 
+                            text="人造血管"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '颈内静脉'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="颈内静脉"
-                          ></label-box>
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('直穿') > -1" 
+                            text="直穿"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '股静脉'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="股静脉"
-                          ></label-box>
+
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('颈内静脉') > -1" 
+                            text="颈内静脉"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '锁骨下'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="锁骨下"
-                          ></label-box>
+                       
+
+                          
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('股静脉') > -1" 
+                            text="股静脉"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '锁骨下'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '股静脉'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '颈内静脉'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '人造血管'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '自体内瘘'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id != ''
-                                ? true
-                                : false
-                            "
-                            showValue="其他"
-                          ></label-box>
-                          <span style="padding-left: 20px">
+
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('锁骨下') > -1" 
+                            text="锁骨下"
+                          ></check-box>
+                          &nbsp;
+
+
+                          
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('锁骨下') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('股静脉') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('颈内静脉') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('人造血管') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('自体内瘘') == -1
+                            " 
+                             
+                             text="其他"
+                          ></check-box>
+                          &nbsp;
+                         
+                    
+                          <span style="padding-left:10px">
                             <span
                               style="
                                 display: inline-block;
@@ -828,177 +777,173 @@
             </tr>
             <tr style="transform: translateY(4px)">
                 <td colspan="11">
-                <table  class="inside_table" border="1" style="text-align: center">
-                    <tr>
-                    <td style="height: 20px" width="60">
-                        <p style="height: 20px; line-height: 20px">时间</p>
+                  <table  class="inside_table" border="1" style="text-align: center">
+                      <tr>
+                      <td style="height: 20px" width="60">
+                          <p style="height: 20px; line-height: 20px">时间</p>
+                      </td>
+                    
+                      <td style="height: 20px" width="344">
+                          <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
+                      </td>
+                  
+                  
+                      <td style="height: 20px" width="90">
+                          <p style="height: 20px; line-height: 20px">执行</p>
+                      </td>
+                      <td style="height: 20px" width="90">
+                          <p style="height: 20px; line-height: 20px">核对</p>
+                      </td>
+                      <td style="height: 20px" width="144">
+                          <p style="height: 20px; line-height: 20px">上次透后体重</p>
+                      </td>
+                      <td style="height: 20px" width="60">
+                          {{
+                          record.patient.total_dialysis +
+                              record.patient.user_sys_before_count >
+                          0
+                              ? record.assessment_after_dislysis.weight_after
+                              : "/"
+                          }}kg
+                      </td>
+                      </tr>
+                      <tr v-for="(advice, advice_index) in record.advices" :key="advice_index" style="transform: translateY(3px)">
+            
+                    <td width="60">
+                      {{ getTime(advice[0].start_time, "{h}:{i}") }}
                     </td>
-                   
-                    <td style="height: 20px" width="344">
-                        <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
+                  
+                    <td style="text-align: left; padding-left: 5px" width="340">
+                      <span v-if="advice[0].parent_id > 0">---></span>
+                      <span>{{ advice[0].advice_name }}</span>
+                      <span v-if="advice && advice[0].advice_desc"
+                        >({{ advice[0].advice_desc
+                        }}{{ advice[0].drug_spec_unit }})</span
+                      >
+                      <span v-if="advice[0].prescribing_number"
+                        >&nbsp;&nbsp; {{ advice[0].prescribing_number
+                        }}{{ advice[0].prescribing_number_unit }}</span
+                      >
+                      <span v-if="advice[0].single_dose != 0"
+                        >{{ advice[0].single_dose
+                        }}{{ advice[0].single_dose_unit }}</span
+                      >
+
+                      <span v-if="advice[0].parent_id == 0">{{
+                        advice[0].delivery_way
+                      }}</span>
+                      <span v-if="advice[0].parent_id == 0">{{
+                        advice[0].execution_frequency
+                      }}</span>
+                      <span>{{ advice[0].remark }}</span>
                     </td>
-                 
                 
-                    <td style="height: 20px" width="90">
-                        <p style="height: 20px; line-height: 20px">执行</p>
+                  
+                    <td style="line-height: 10px" width="90">
+                      <span v-if="setAdminUserES(advice[0].execution_staff) == ''">{{
+                        getAdminUser(advice[0].execution_staff)
+                      }}</span>
+                      <img
+                        style="height: 30px"
+                        :src="setAdminUserES(advice[0].execution_staff)"
+                        alt=""
+                        srcset=""
+                      />
                     </td>
-                    <td style="height: 20px" width="90">
-                        <p style="height: 20px; line-height: 20px">核对</p>
+                    <td style="line-height: 30px" width="90">
+                      <span v-if="setAdminUserES(advice[0].checker) == ''">{{
+                        getAdminUser(advice[0].checker)
+                      }}</span>
+                      <img
+                        style="height: 30px"
+                        :src="setAdminUserES(advice[0].checker)"
+                        alt=""
+                        srcset=""
+                        v-else
+                      />
                     </td>
-                    <td style="height: 20px" width="144">
-                        <p style="height: 20px; line-height: 20px">上次透后体重</p>
+
+                    <td v-if="advice_index === 0" width="145">透前体重:</td>
+                    <td v-if="advice_index === 0" width="60">
+                      {{record.patient.total_dialysis +record.patient.user_sys_before_count>0? record.assessment_before_dislysis.weight_before: "/"}}kg
                     </td>
-                    <td style="height: 20px" width="60">
-                        {{
+                    <td v-if="advice_index === 1" width="145">体重增加量:</td>
+                    <td v-if="advice_index === 1" width="60">
+                      {{
+                        record.assessment_after_dislysis.weight_after == 0 ||
+                        record.assessment_before_dislysis.weight_before == 0
+                          ? 0
+                          : (
+                              record.assessment_before_dislysis.weight_before -
+                              record.assessment_after_dislysis.weight_after
+                            ).toFixed(2)
+                      }}kg
+                    </td>
+                    <td v-if="advice_index === 2" width="145">干体重(DW):</td>
+                    <td v-if="advice_index === 2" width="60">
+                      {{
                         record.patient.total_dialysis +
-                            record.patient.user_sys_before_count >
+                          record.patient.user_sys_before_count >
                         0
-                            ? record.assessment_after_dislysis.weight_after
-                            : "/"
-                        }}kg
+                          ? record.assessment_before_dislysis.dry_weight
+                          : "/"
+                      }}kg
                     </td>
-                    </tr>
-                    
-                </table>
+                    <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
+                    <td v-if="advice_index === 3" width="60">
+                      {{
+                        record.patient.total_dialysis +
+                          record.patient.user_sys_before_count >
+                          0 && record.assessment_after_dislysis.weight_after != 0
+                          ? (
+                              record.assessment_after_dislysis.weight_after - record.assessment_before_dislysis.dry_weight
+                            ).toFixed(2)
+                          : 0
+                      }}kg
+                    </td>
+                    <td v-if="advice_index === 4" width="145">机器显示脱水量:</td>
+                    <td v-if="advice_index === 4" width="60">
+                      {{
+                        record.patient.total_dialysis +
+                          record.patient.user_sys_before_count >
+                        0
+                          ? record.assessment_after_dislysis.actual_ultrafiltration
+                          : "/"
+                      }}ml
+                    </td>
+                    <td v-if="advice_index === 5" width="145">透后体重:</td>
+                    <td v-if="advice_index === 5" width="60">
+                      {{
+                        record.patient.total_dialysis +
+                          record.patient.user_sys_before_count >
+                        0
+                          ? record.assessment_after_dislysis.weight_after
+                          : "/"
+                      }}kg
+                    </td>
+                    <td v-if="advice_index === 6" width="145">
+                      本次透析体重下降量:
+                    </td>
+                    <td v-if="advice_index === 6" width="60">
+                      {{
+                        record.assessment_after_dislysis.weight_after == 0 ||
+                        record.assessment_before_dislysis.weight_before == 0
+                          ? 0
+                          : (
+                              record.assessment_before_dislysis.weight_before -
+                              record.assessment_after_dislysis.weight_after
+                            ).toFixed(2)
+                      }}kg
+                    </td>
+                    <td v-if="advice_index > 6" width="145"></td>
+                    <td v-if="advice_index > 6" width="60"></td>
+                
+                  </tr>
+                  </table>
                 </td>
             </tr>
          
-          <tr v-for="(advice, advice_index) in record.advices" :key="advice_index" style="transform: translateY(3px)">
-            <td colspan="11">
-              <table class="inside_table" border="1">
-                <tr>
-                  <td width="60">
-                    {{ getTime(advice[0].start_time, "{h}:{i}") }}
-                  </td>
-                
-                  <td style="text-align: left; padding-left: 5px" width="340">
-                    <span v-if="advice[0].parent_id > 0">---></span>
-                    <span>{{ advice[0].advice_name }}</span>
-                    <span v-if="advice && advice[0].advice_desc"
-                      >({{ advice[0].advice_desc
-                      }}{{ advice[0].drug_spec_unit }})</span
-                    >
-                    <span v-if="advice[0].prescribing_number"
-                      >&nbsp;&nbsp; {{ advice[0].prescribing_number
-                      }}{{ advice[0].prescribing_number_unit }}</span
-                    >
-                    <span v-if="advice[0].single_dose != 0"
-                      >{{ advice[0].single_dose
-                      }}{{ advice[0].single_dose_unit }}</span
-                    >
-
-                    <span v-if="advice[0].parent_id == 0">{{
-                      advice[0].delivery_way
-                    }}</span>
-                    <span v-if="advice[0].parent_id == 0">{{
-                      advice[0].execution_frequency
-                    }}</span>
-                    <span>{{ advice[0].remark }}</span>
-                  </td>
-              
-                
-                  <td style="line-height: 10px" width="90">
-                    <span v-if="setAdminUserES(advice[0].execution_staff) == ''">{{
-                      getAdminUser(advice[0].execution_staff)
-                    }}</span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice[0].execution_staff)"
-                      alt=""
-                      srcset=""
-                    />
-                  </td>
-                  <td style="line-height: 30px" width="90">
-                    <span v-if="setAdminUserES(advice[0].checker) == ''">{{
-                      getAdminUser(advice[0].checker)
-                    }}</span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice[0].checker)"
-                      alt=""
-                      srcset=""
-                      v-else
-                    />
-                  </td>
-
-                  <td v-if="advice_index === 0" width="145">透前体重:</td>
-                  <td v-if="advice_index === 0" width="60">
-                    {{record.patient.total_dialysis +record.patient.user_sys_before_count>0? record.assessment_before_dislysis.weight_before: "/"}}kg
-                  </td>
-                  <td v-if="advice_index === 1" width="145">体重增加量:</td>
-                  <td v-if="advice_index === 1" width="60">
-                    {{
-                      record.assessment_after_dislysis.weight_after == 0 ||
-                      record.assessment_before_dislysis.weight_before == 0
-                        ? 0
-                        : (
-                            record.assessment_before_dislysis.weight_before -
-                            record.assessment_after_dislysis.weight_after
-                          ).toFixed(2)
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 2" width="145">干体重(DW):</td>
-                  <td v-if="advice_index === 2" width="60">
-                    {{
-                      record.patient.total_dialysis +
-                        record.patient.user_sys_before_count >
-                      0
-                        ? record.assessment_before_dislysis.dry_weight
-                        : "/"
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
-                  <td v-if="advice_index === 3" width="60">
-                    {{
-                      record.patient.total_dialysis +
-                        record.patient.user_sys_before_count >
-                        0 && record.assessment_after_dislysis.weight_after != 0
-                        ? (
-                            record.assessment_after_dislysis.weight_after - record.assessment_before_dislysis.dry_weight
-                          ).toFixed(2)
-                        : 0
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 4" width="145">机器显示脱水量:</td>
-                  <td v-if="advice_index === 4" width="60">
-                    {{
-                      record.patient.total_dialysis +
-                        record.patient.user_sys_before_count >
-                      0
-                        ? record.assessment_after_dislysis.actual_ultrafiltration
-                        : "/"
-                    }}ml
-                  </td>
-                  <td v-if="advice_index === 5" width="145">透后体重:</td>
-                  <td v-if="advice_index === 5" width="60">
-                    {{
-                      record.patient.total_dialysis +
-                        record.patient.user_sys_before_count >
-                      0
-                        ? record.assessment_after_dislysis.weight_after
-                        : "/"
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 6" width="145">
-                    本次透析体重下降量:
-                  </td>
-                  <td v-if="advice_index === 6" width="60">
-                    {{
-                      record.assessment_after_dislysis.weight_after == 0 ||
-                      record.assessment_before_dislysis.weight_before == 0
-                        ? 0
-                        : (
-                            record.assessment_before_dislysis.weight_before -
-                            record.assessment_after_dislysis.weight_after
-                          ).toFixed(2)
-                    }}kg
-                  </td>
-                  <td v-if="advice_index > 6" width="145"></td>
-                  <td v-if="advice_index > 6" width="60"></td>
-                </tr>
-              </table>
-            </td>
-          </tr>
+      
         <tr style="transform: translateY(1px)">
             <td colspan="11">  
             <table class="inside_table" border="1">
@@ -1131,7 +1076,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
 export default {
-  name: "BatchPrintOrderSix",
+  name: "BatchPrintOrderFiftyThree",
   components: {
     CheckBox,
     BreadCrumb,
@@ -1453,7 +1398,6 @@ export default {
         scanStyles: false,
       });
     },
-
     complicationsOther: function (record) {
       if (record == null || typeof record === "undefined") {
         return "";

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -260,6 +260,7 @@
         },
         zoneIdList:[],
         partion_str:"",
+     
       }
     },
     created() {
@@ -662,7 +663,7 @@
           }
         }
 
-        if(this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 0){
+        if(this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 10469){
           //  console.log("----------------------",this.selected_date)
             console.log("星期",this.getweekday(this.selected_date))
             var newArrList = []
@@ -704,7 +705,7 @@
             }
           }
         }
-        if(this.$store.getters.xt_user.org_id != 9671 && this.$store.getters.xt_user.org_id != 0){
+        if(this.$store.getters.xt_user.org_id != 9671 && this.$store.getters.xt_user.org_id != 0 && this.$store.getters.xt_user.org_id != 10469){
          
           if(newArr!=null && newArr.length > 0){
             for(let i=0;i<newArr.length;i++){

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

@@ -807,7 +807,7 @@
     methods: {
       handleSpanTempArrOne() {
           this.tempArrOne = [];
-          console.log("hhahhahahahahah",this.doctor_advices)
+         
           for (let i = 0; i < this.doctor_advices.length; i++) {
             if (i === 0) {
               this.tempArrOne.push(1);

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

@@ -9,6 +9,15 @@
                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo">{{ patient.name }}</el-button>
+            <!-- <span style="position: absolute;left: 22%;top: 3%">
+              上次透后体重：{{last_record.weight_after?last_record.weight_after:""}} --kg
+            </span> -->
+            <!-- <span style="position: absolute;left: 35%;top: 3%">
+              干体重：--kg
+            </span>
+            <span style="position: absolute;left: 48%;top: 3%">
+              衣物重：--kg
+            </span> -->
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"
@@ -1441,6 +1450,9 @@
       admins: {
         type: Array
       },
+      last_record: {
+        type: Object
+      },
     },
     computed: {
       dialysis_date: function() {
@@ -2597,13 +2609,13 @@ mu
         if(moment().weekday() == 6){
            total_day ="周六"
         }
-        if(moment().weekday() == 7){
+        if(moment().weekday() == 0){
            total_day ="周日"
         }
-        console.log("---------",this.targetAdvices)
+        console.log("日期---------",moment().weekday())
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
             for (let i = 0; i < this.targetAdvices.length; i++) {
-              if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
+              if(this.targetAdvices[i].week_day!=""&&this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
                 this.targetAdvices[i].isCheck = 1
               }
             }

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

@@ -470,7 +470,8 @@
                 template_id == 54 ||
                 template_id == 56 ||
                 org_id ==10432 || 
-                org_id ==10445
+                org_id ==10445 || 
+                org_id ==10410
               
                )
             "
@@ -498,7 +499,8 @@
               template_id != 54 &&
               template_id != 56 &&
               org_id !=10432 && 
-              org_id !=10445
+              org_id !=10445 &&
+              org_id !=10410
             "
           >
             <template slot-scope="scope">
@@ -1296,7 +1298,8 @@
               template_id != 56 &&
               template_id != 53 &&
               org_id!=10432 &&
-              org_id!=10445
+              org_id!=10445 &&
+              org_id!=10410
             "
           >
             <el-form-item label="置换率(L/h)：" :prop="isName('置换率')"
@@ -1320,7 +1323,8 @@
                 template_id == 56 ||
                 template_id == 48 ||
                 org_id==10432 ||
-                org_id!=10445)
+                org_id!=10445 ||
+                org_id!=10410)
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,8 +20,8 @@
           <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 )" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445)" width="92px" > 置换量(L) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -2595,7 +2595,7 @@
                                 />
                               </div>
                             </div>
-                            <div class="inline_block" style="flex: 1">
+                            <!-- <div class="inline_block" style="flex: 1">
                               下机护士：
                               <div
                                 class="under_line"
@@ -2633,8 +2633,8 @@
                                   v-else
                                 />
                               </div>
-                            </div>
-                            <!-- <div class="inline_block" style="flex: 1">
+                            </div> -->
+                            <div class="inline_block" style="flex: 1">
                               患者签名：
                               <div
                                 class="under_line"
@@ -2648,7 +2648,7 @@
                                   srcset=""
                                 />
                               </div>
-                            </div> -->
+                            </div>
                             <div class="inline_block" style="flex: 1">
                               治疗医生：
                               <div

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -688,9 +688,12 @@
                 <tr>
                   <td style="width: 60px" rowspan="2">时间</td>
                   <td colspan="4">透析参数</td>
-                  <td :colspan="org_id == 10441 || org_id == 9675 ? 4 : 5">
+                  <td :colspan="org_id == 10441 || org_id == 9675  ? 4 : 5">
                     生命体征
                   </td>
+                  <td v-if="org_id == 10430 || org_id == 0">
+                    KT/V
+                  </td>
                   <td colspan="1">治疗中病情变化</td>
                 </tr>
                 <tr class="short_tr">
@@ -716,6 +719,8 @@
                     <p style="height: 20px; line-height: 20px">℃</p>
                   </th>
 
+               
+
                   <th style="width: 80px; font-weight: normal">
                     <p style="height: 20px; line-height: 20px">T</p>
                     <p style="height: 20px; line-height: 20px">℃</p>
@@ -743,6 +748,11 @@
                     <p style="height: 20px; line-height: 20px">SpO₂</p>
                     <p style="height: 20px; line-height: 20px">%</p>
                   </th>
+                  <th style="width:50px; font-weight: normal" v-if="org_id == 10430 || org_id == 0">
+                    <p style="height: 20px; line-height: 20px">
+                      KT/V
+                    </p>
+                  </th>
                   <th style="width: 333px; font-weight: normal">
                     <p style="height: 20px; line-height: 20px">
                       记&nbsp;&nbsp;&nbsp;&nbsp;录
@@ -795,12 +805,14 @@
                     {{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}
                   </td>
 
+
                   <td>
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{ monitor.temperature ? monitor.temperature : "" }}
                     </span>
                   </td>
 
+                
                   <td>
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{
@@ -836,6 +848,9 @@
                       }}
                     </span>
                   </td>
+                  <td v-if="org_id == 10430 || org_id == 0">
+                    {{ monitor.ktv?monitor.ktv:"" }}
+                  </td>
                   <td>
                     <span
                       v-if="
@@ -851,7 +866,7 @@
               </table>
             </td>
           </tr>
-          <tr style="transform: translateY(4px)" v-if="org_id!=10346 && org_id!=0">
+          <tr style="transform: translateY(4px)" v-if="org_id!=10346">
             <td>
               <table class="print-table" border="1" style="text-align: center">
                 <tr>
@@ -899,8 +914,9 @@
               </table>
             </td>
           </tr>
-          <div v-if="org_id!=10346 && org_id!=0">
+
           <tr
+            v-if="org_id!=10346"
             v-for="(advice, advice_index) in advices"
             :key="advice_index"
             style="transform: translateY(3px)"
@@ -919,14 +935,14 @@
                     <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                       {{ getAdminUser(advice.advice_doctor) }}
                     </span>
-                    <img
+                  <img
                       style="height: 30px"
                       :src="setAdminUserES(advice.advice_doctor)"
                       alt=""
                       srcset=""
                     />
                   </td>
-                  <td style="text-align: left; padding-left: 5px" width="340">
+                  <td style="text-align: left; padding-left: 5px" width="344">
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
@@ -1082,7 +1098,7 @@
               </table>
             </td>
           </tr>
-          </div>
+         
 
           <tr style="transform: translateY(1px)">
             <td>
@@ -1287,7 +1303,6 @@
               </table>
             </td>
           </tr>
-          <div>
           <tr
             v-for="(advice, advice_index) in advices"
             :key="advice_index"
@@ -1313,7 +1328,7 @@
                       srcset=""
                     />
                   </td>
-                  <td style="text-align: left; padding-left: 5px" width="340">
+                  <td style="text-align: left; padding-left: 5px" width="344">
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
@@ -1469,7 +1484,6 @@
               </table>
             </td>
           </tr>
-          </div>
 
         
         </tbody>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -154,8 +154,12 @@
           </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
         </div>
-        <div class="doctorBox" v-else>
-          <p>药师：</p>
+        <div class="doctorBoxtwo" v-if="org_id == 10188">
+          <p >审核、调配：</p>
+          <p style="margin-right: 43px">药师：</p>
+        </div>
+        <div class="doctorBox" v-if="org_id == 10188">
+          <p >核对、发药：</p>
           <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
         </div>
         <div class="actionBar" v-if="org_id != 10188">
@@ -179,10 +183,7 @@
           <!--            <p>药费：466.2元</p>-->
         </div>
         <div class="actionBar" v-else>
-          <p style="visibility: hidden">审核：</p>
-          <p style="visibility: hidden">配对：</p>
-          <p style="visibility: hidden">核对：</p>
-          <p style="visibility: hidden">发药：</p>
+
           <p>
             药费：{{
               getTotalOne(item.id).toFixed(2)
@@ -528,6 +529,12 @@ export default {
   line-height: 24px;
   border-bottom: 2px solid #000;
 }
+.doctorBoxtwo {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+}
 .actionBar {
   display: flex;
   justify-content: space-between;

src/xt_pages/user/courseOfDisease.vue

@@ -72,9 +72,9 @@
             <el-col :span="15">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
-                <!--v-html="current_select_record.content"-->
+                
                 <div class="content">
-                  <span v-if="current_select_record" >{{current_select_record.content }}</span>
+                  <span v-if="current_select_record" v-html="current_select_record.content"></span>
                   <span v-else></span>
                 </div>
                 <!-- <el-form>