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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -918,11 +918,11 @@
           >
           </DialysisPrintOrderFive>
                                   
-          <DialysisPrintOrderSixty
+          <DialysisPrintOrderSix
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 6"
           >
-          </DialysisPrintOrderSixty>
+          </DialysisPrintOrderSix>
 
           <DialysisPrintOrderSeven
             v-bind:childResponse="childResponse"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2408,8 +2408,9 @@
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
-                      <span v-if="org_id!=10414">治疗护士：</span> 
                       <span v-if="org_id==10414">责任护士：</span> 
+                      <span v-else>治疗护士：</span> 
+                      
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"