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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id!=10402 && org_id!=10206 && org_id!=0 && org_id!=10206">
+                <tr v-if="org_id!=10402 && org_id!=10206  && org_id!=10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
                                   advice[0].advice_desc != undefined
                                 "
                               >
-                                <!-- ({{ advice[0].advice_desc
-                                }}{{ advice[0].drug_spec_unit }} ) -->
+                                ({{ advice[0].advice_desc
+                                }}{{ advice[0].drug_spec_unit }} )
                               </span>
 
                               <span v-if="advice[0].prescribing_number"
                   </td>
                 </tr>
 
-                <tr v-if="org_id == 0 || org_id == 10206">
+                <tr v-if="org_id == 10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>

src/xt_pages/dialysis/longSignPrint.vue

                         <div>姓名:{{item.patient.name}}</div>  
 
                         <div>
-                            <div>医嘱内容:{{ it.advice_name }} 
+                            <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
                             
                             规格:{{it.advice_desc}} {{ it.drug_spec_unit }}
                             
                             </div>  
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
+                            <div v-if="org_id == 0 || org_id==10223">
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>核对者:</span>
+                           </div> 
                              
                         </div>
                          
                        <span v-if="it.childAdvice.length >0">&nbsp;</span>  
                        <div v-for="its in it.childAdvice">
-                            <div>医嘱内容:{{ its.advice_name }} 
+                            <div>药名:{{ its.advice_name }} 
                             <span v-if="its.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{its.prescribing_number}}{{ its.prescribing_number_unit }}
                             </span> 
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
+                            <div v-if="org_id == 0 || org_id==10223">
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>核对者:</span>
+                           </div> 
                         </div>
-                        <div>打印时间:{{time}}</div> 
+                        <div v-if="org_id!=10223 && org_id!=0">打印时间:{{time}}</div> 
+                        <div v-if="org_id==10223 || org_id == 0">配药时间:</div> 
                     </div>  
                 </div>
             </div>

src/xt_pages/dialysis/signPrint.vue

                         <div>姓名:{{item.patient.name}}</div>  
 
                         <div>
-                            <div>医嘱内容:{{ it.advice_name }} 
+                            <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
                             
                             <div v-if="org_id ==0 || org_id ==10223">
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
                             </div> 
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
+                            <div v-if="org_id == 0 || org_id==10223">
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>核对者:</span>
+                           </div> 
                              
                         </div>
                          
                        <span v-if="it.childAdvice.length >0">&nbsp;</span>  
                        <div v-for="its in it.childAdvice">
-                            <div>医嘱内容:{{ its.advice_name }} 
+                            <div>药名:{{ its.advice_name }} 
                             <span v-if="its.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{its.prescribing_number}}{{ its.prescribing_number_unit }}
                             </span> 
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
+                            <div v-if="org_id == 0 || org_id==10223">
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>核对者:</span>
+                           </div> 
                         </div>
-                        <div>打印时间:{{time}}</div> 
+                        <div v-if="org_id!=10223 && org_id!=0">打印时间:{{time}}</div> 
+                        <div v-if="org_id==10223 || org_id == 0">配药时间:</div> 
                     </div>  
                 </div>
             </div>