Accueil Explorateur Aide
S'inscrire Connexion
csx
/
Vue_New
Suivre 2
Voter 1
Bifurcation 1
Code Tickets 73 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

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

yq1 il y a 1 an
Parent
5ade17f67c 98dc0b541e
révision
5734bcdc37
3 fichiers modifiés avec 34 ajouts et 16 suppressions
Vue séparée Afficher les stats Diff
  1. 4 4
      src/xt_pages/dialysis/batch_print/batch_print_order_six.vue
  2. 14 5
      src/xt_pages/dialysis/longSignPrint.vue
  3. 16 7
      src/xt_pages/dialysis/signPrint.vue

+ 4 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Voir le fichier 

@@ -1800,7 +1800,7 @@
1800 1800 
                     </table>
1801 1801 
                   </td>
1802 1802 
                 </tr>
1803 
-                <tr v-if="org_id!=10402 && org_id!=10206 && org_id!=0 && org_id!=10206">
1803 
+                <tr v-if="org_id!=10402 && org_id!=10206  && org_id!=10206">
1804 1804 
                   <td style="padding: 0; position: relative" colspan="2">
1805 1805 
                     <table class="inside_table">
1806 1806 
                       <tbody>
 
@@ -1864,8 +1864,8 @@
1864 1864 
                                   advice[0].advice_desc != undefined
1865 1865 
                                 "
1866 1866 
                               >
1867 
-                                <!-- ({{ advice[0].advice_desc
1868 
-                                }}{{ advice[0].drug_spec_unit }} ) -->
1867 
+                                ({{ advice[0].advice_desc
1868 
+                                }}{{ advice[0].drug_spec_unit }} )
1869 1869 
                               </span>
1870 1870
1871 1871 
                               <span v-if="advice[0].prescribing_number"
 
@@ -2151,7 +2151,7 @@
2151 2151 
                   </td>
2152 2152 
                 </tr>
2153 2153
2154 
-                <tr v-if="org_id == 0 || org_id == 10206">
2154 
+                <tr v-if="org_id == 10206">
2155 2155 
                   <td style="padding: 0; position: relative" colspan="2">
2156 2156 
                     <table class="inside_table">
2157 2157 
                       <tbody>

+ 14 - 5
src/xt_pages/dialysis/longSignPrint.vue Voir le fichier 

@@ -17,7 +17,7 @@
17 17 
                         <div>姓名:{{item.patient.name}}</div>
18 18
19 19 
                         <div>
20 
-                            <div>医嘱内容:{{ it.advice_name }}
20 
+                            <div>药名:{{ it.advice_name }}
21 21 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
22 22 
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
23 23 
                             
@@ -32,15 +32,19 @@
32 32 
                             规格:{{it.advice_desc}} {{ it.drug_spec_unit }}
33 33
34 34 
                             </div>
35 
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>
35 
+                            <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>
36 36 
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>
37 37 
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>
38 
+                            <div v-if="org_id == 0 || org_id==10223">
39 
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
40 
+                                <span>核对者:</span>
41 
+                           </div>
38 42
39 43 
                         </div>
40 44
41 45 
                        <span v-if="it.childAdvice.length >0">&nbsp;</span>
42 46 
                        <div v-for="its in it.childAdvice">
43 
-                            <div>医嘱内容:{{ its.advice_name }}
47 
+                            <div>药名:{{ its.advice_name }}
44 48 
                             <span v-if="its.prescribing_number>0 && org_id !=0 && org_id!=10440">
45 49 
                                 {{its.prescribing_number}}{{ its.prescribing_number_unit }}
46 50 
                             </span> 
@@ -49,11 +53,16 @@
49 53 
                             规格:{{getSpecialName(its.drug_id)}}
50 54
51 55 
                             </div>
52 
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>
56 
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>
53 57 
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>
54 58 
                             <div>给药途径:{{its.delivery_way}}</div>
59 
+                            <div v-if="org_id == 0 || org_id==10223">
60 
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
61 
+                                <span>核对者:</span>
62 
+                           </div>
55 63 
                         </div>
56 
-                        <div>打印时间:{{time}}</div>
64 
+                        <div v-if="org_id!=10223 && org_id!=0">打印时间:{{time}}</div>
65 
+                        <div v-if="org_id==10223 || org_id == 0">配药时间:</div>
57 66 
                     </div>
58 67 
                 </div>
59 68 
             </div>

+ 16 - 7
src/xt_pages/dialysis/signPrint.vue Voir le fichier 

@@ -17,7 +17,7 @@
17 17 
                         <div>姓名:{{item.patient.name}}</div>
18 18
19 19 
                         <div>
20 
-                            <div>医嘱内容:{{ it.advice_name }}
20 
+                            <div>药名:{{ it.advice_name }}
21 21 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
22 22 
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
23 23 
                             
@@ -31,15 +31,19 @@
31 31 
                             <div v-if="org_id ==0 || org_id ==10223">
32 32 
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
33 33 
                             </div>
34 
-                            <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>
35 
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>
34 
+                            <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>
35 
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>
36 36 
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>
37 
+                            <div v-if="org_id == 0 || org_id==10223">
38 
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
39 
+                                <span>核对者:</span>
40 
+                           </div>
37 41
38 42 
                         </div>
39 43
40 44 
                        <span v-if="it.childAdvice.length >0">&nbsp;</span>
41 45 
                        <div v-for="its in it.childAdvice">
42 
-                            <div>医嘱内容:{{ its.advice_name }}
46 
+                            <div>药名:{{ its.advice_name }}
43 47 
                             <span v-if="its.prescribing_number>0 && org_id !=0 && org_id!=10440">
44 48 
                                 {{its.prescribing_number}}{{ its.prescribing_number_unit }}
45 49 
                             </span> 
@@ -48,11 +52,16 @@
48 52 
                             规格:{{getSpecialName(its.drug_id)}}
49 53
50 54 
                             </div>
51 
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>
52 
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>
55 
+                            <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>
56 
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>
53 57 
                             <div>给药途径:{{its.delivery_way}}</div>
58 
+                            <div v-if="org_id == 0 || org_id==10223">
59 
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
60 
+                                <span>核对者:</span>
61 
+                           </div>
54 62 
                         </div>
55 
-                        <div>打印时间:{{time}}</div>
63 
+                        <div v-if="org_id!=10223 && org_id!=0">打印时间:{{time}}</div>
64 
+                        <div v-if="org_id==10223 || org_id == 0">配药时间:</div>
56 65 
                     </div>
57 66 
                 </div>
58 67 
             </div>