1月3

src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue

@@ -296,6 +296,9 @@
                         </div>
                       </div>
 
+                      
+                    </div>
+                    <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                       <div
                         class="inline_block"
                         style="flex: 1"
@@ -312,7 +315,6 @@
                           }}
                         </div>
                       </div>
-
                     </div>
                     <!-- 穿刺 -->
                     <div class="row"
@@ -1442,7 +1444,6 @@
                             执行人签名
                           </td>
                          
-                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
                         <template v-if="record.advices">
@@ -1558,29 +1559,6 @@
                               />
                             </td>
                            
-                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206">
-                              <span
-                                v-if="
-                                  setAdminUserES(
-                                    advice[0],
-                                    'checker'
-                                  ) == ''
-                                "
-                                >{{
-                                  getAdminUser(advice[0], "checker")
-                                }}</span
-                              >
-                              <img
-                                class="es-img"
-                                :src="
-                                  setAdminUserES(advice[0], 'checker')
-                                "
-                                alt=""
-                                srcset=""
-                                v-else
-                                style="height: 40px"
-                              />
-                            </td>
                           </tr>
                         </template>
                       </tbody>
@@ -1887,29 +1865,33 @@
                           }}
                         </div>
                       </div>
+                      
                       <div class="inline_block" style="flex: 1">
-                        导管：
+                        KTV(在线)：
                         <div
-                          style="width: 70%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                          class="under_line"
+                          style="min-width: 100px; text-align: center"
                         >
                           {{
                             record.assessment_after_dislysis &&
-                            record.assessment_after_dislysis.catheter
-                              ? record.assessment_after_dislysis.catheter
+                            record.assessment_after_dislysis.ktv
+                              ? record.assessment_after_dislysis.ktv
                               : "/"
                           }}
                         </div>
                       </div>
+                    </div>
+
+                    <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                       <div class="inline_block" style="flex: 1">
-                        KTV(在线)：
+                        导管：
                         <div
-                          class="under_line"
-                          style="min-width: 100px; text-align: center"
+                          style="width: 70%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
                         >
                           {{
                             record.assessment_after_dislysis &&
-                            record.assessment_after_dislysis.ktv
-                              ? record.assessment_after_dislysis.ktv
+                            record.assessment_after_dislysis.catheter
+                              ? record.assessment_after_dislysis.catheter
                               : "/"
                           }}
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -255,7 +255,6 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-
                     <div class="inline_block" style="flex: 1;">
                       内瘘：
                       <div
@@ -274,7 +273,7 @@
                       </div>
                     </div>
 
-                    <div
+                    <!-- <div
                       class="inline_block"
                       style=" flex: 1"
                     >
@@ -284,78 +283,18 @@
                       >
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
-                    </div>
-                     <!-- <div
-                      class="inline_block"
-                      style=" flex: 0.9"
+                    </div> -->
+                  </div>
+                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" >
 
-                    >
-                      穿刺方式：
-                      <div
-                        class="under_line"
-                        style="width: 60px; text-align: center"
-                        v-if="predialysis.puncture_way == ''"
-                      >
-                         /
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 60px; text-align: center"
-                        v-if="predialysis.puncture_way.indexOf('绳梯') > -1"
-                      >
-                        绳梯
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 60px; text-align: center"
-                        v-if="predialysis.puncture_way.indexOf('扣眼') > -1"
-                      >
-                        扣眼
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 60px; text-align: center"
-                        v-if="predialysis.puncture_way.indexOf('区域') > -1"
-                      >
-                        区域
-                      </div>
-                    </div>
-                     <div
-                      class="inline_block"
-                      style=" flex: 1"
-                    >
-                      穿刺针：
+                    <div class="inline_block" style="flex:1;" >
+                      导管：
                       <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
+                        style="width: 90%;text-align: left;display: inline-block;border-bottom: 1px solid #999;"
                       >
-                      <span>
-                        {{
-                          predialysis.puncture_needle
-                            ? predialysis.puncture_needle
-                            : "/"
-                        }}
-                      </span>
-
+                        {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
                     </div>
-                    <div
-                      class="inline_block"
-                      style=" flex: 1"
-                    >
-                      穿刺方向：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                      <span>
-                        {{
-
-                        }}
-                      </span>
-
-                      </div>
-                    </div> -->
                   </div>
 
                   <div
@@ -1870,13 +1809,6 @@
                   <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
                   <td style="font-size: 16px" width="10%">执行人签名</td>
 
-                  <td
-                    style="font-size: 16px"
-                    width="10%"
-                    v-if="org_id == 10223 || org_id == 9538"
-                  >
-                    核对护士
-                  </td>
                 </tr>
                 <!-- <template v-for="group in doctor_advices" > -->
                 <tr
@@ -1967,18 +1899,6 @@
                     />
                   </td>
 
-                  <td height="32px" v-if="org_id == 10223 || org_id ==9538">
-                    <span v-if="setAdminUserES(advice.checker) == ''">{{
-                      getAdminUser(advice.checker)
-                    }}</span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice.checker)"
-                      alt=""
-                      srcset=""
-                      v-else
-                    />
-                  </td>
                 </tr>
               </template>
 
@@ -2154,12 +2074,7 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex:1;">
-                      导管：
-                      <div style="width: 80%;text-align: left;display: inline-block;border-bottom: 1px solid #999; ">
-                        {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
-                      </div>
-                    </div>
+                    
                     <div class="inline_block" style="flex:1;">
                       KTV(在线)：
                       <div class="under_line" style="min-width: 50px;text-align: center">
@@ -2167,7 +2082,16 @@
                       </div>
                     </div>
                   </div>
-
+                  <div class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div class="inline_block" style="flex:1;">
+                      导管：
+                      <div style="width: 80%;text-align: left;display: inline-block;border-bottom: 1px solid #999; ">
+                        {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
+                      </div>
+                    </div>
+                  </div>
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -2663,13 +2587,6 @@
               <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
               <td style="font-size: 16px" width="10%">执行人签名</td>
               <td style="font-size: 16px" width="10%">时间</td>
-              <td
-                style="font-size: 16px"
-                width="10%"
-                v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
-              >
-                核对护士
-              </td>
             </tr>
 
 
@@ -2749,18 +2666,6 @@
                   getTime(advice.execution_time, "{h}:{i}")
                 }}</span>
               </td>
-              <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
-                <span v-if="setAdminUserES(advice.checker) == ''">{{
-                  getAdminUser(advice.checker)
-                }}</span>
-                <img
-                  style="height: 30px"
-                  :src="setAdminUserES(advice.checker)"
-                  alt=""
-                  srcset=""
-                  v-else
-                />
-              </td>
             </tr>