huangyw пре 2 година
родитељ
комит
39f8a398b2

Разлика између датотеке није приказан због своје велике величине
+ 2452 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue


+ 17 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue Прегледај датотеку

651
                     <p style="height: 20px; line-height: 20px">血流量</p>
651
                     <p style="height: 20px; line-height: 20px">血流量</p>
652
                     <p style="height: 20px; line-height: 20px">(ml·min)⁻¹</p>
652
                     <p style="height: 20px; line-height: 20px">(ml·min)⁻¹</p>
653
                   </th>
653
                   </th>
654
-                  <th style="width: 70px; font-weight: normal">
654
+                  <th style="width: 70px; font-weight: normal" v-if="org_id!=10430&&org_id!=9675">
655
                     <p style="height: 20px; line-height: 20px">脱水量</p>
655
                     <p style="height: 20px; line-height: 20px">脱水量</p>
656
                     <p style="height: 20px; line-height: 20px">ml</p>
656
                     <p style="height: 20px; line-height: 20px">ml</p>
657
                   </th>
657
                   </th>
658
+                  <th style="width: 70px; font-weight: normal" v-if="org_id==10430||org_id==9675">
659
+                    <p style="height: 20px; line-height: 20px">血温</p>
660
+                    <p style="height: 20px; line-height: 20px">ml</p>
661
+                  </th>
658
 
662
 
659
                   <th style="width: 80px; font-weight: normal">
663
                   <th style="width: 80px; font-weight: normal">
660
                     <p style="height: 20px; line-height: 20px">T</p>
664
                     <p style="height: 20px; line-height: 20px">T</p>
721
                       }}
725
                       }}
722
                     </span>
726
                     </span>
723
                   </td>
727
                   </td>
724
-                  <td style="min-width: 45px">
728
+                  <td style="min-width: 45px" v-if="org_id!=10430&&org_id!=9675">
725
                     <span v-if="getTime(monitor.operate_time) != ''&&monindex == 0 && (org_id == 10441||org_id == 9675)">
729
                     <span v-if="getTime(monitor.operate_time) != ''&&monindex == 0 && (org_id == 10441||org_id == 9675)">
726
                       {{'/'}}
730
                       {{'/'}}
727
                     </span>
731
                     </span>
731
                     <span v-else>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
735
                     <span v-else>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
732
                   </td>
736
                   </td>
733
 
737
 
738
+                  <td style="min-width: 45px" v-if="org_id==10430||org_id==9675">
739
+                    {{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}
740
+                  </td>
741
+
734
                   <td>
742
                   <td>
735
                     <span v-if="getTime(monitor.operate_time) != ''">
743
                     <span v-if="getTime(monitor.operate_time) != ''">
736
                       {{ monitor.temperature ? monitor.temperature : "" }}
744
                       {{ monitor.temperature ? monitor.temperature : "" }}
1011
                     }}
1019
                     }}
1012
                   </td>
1020
                   </td>
1013
                 </tr>
1021
                 </tr>
1022
+                <tr style="height: 50px; text-align: left" v-if="org_id==10430||org_id==9675">
1023
+                  <td style="padding-left: 5px; border-bottom: none;border-top: none;">
1024
+                    透析护理记录:{{
1025
+                      summary.nursing_record ? summary.nursing_record : ""
1026
+                    }}
1027
+                  </td>
1028
+                </tr>
1014
                 <tr style="height: 40px">
1029
                 <tr style="height: 40px">
1015
                   <td
1030
                   <td
1016
                     rowspan="11"
1031
                     rowspan="11"

+ 2 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue Прегледај датотеку

35
             <td style="text-align: center" colspan="2">
35
             <td style="text-align: center" colspan="2">
36
               透析次数:
36
               透析次数:
37
               <span style="display: inline-block; margin-left: 10px">
37
               <span style="display: inline-block; margin-left: 10px">
38
-               <span v-if="dialysisOrder && dialysisOrder.dialysis_date<=1672416000">{{patientInfo.total_dialysis + patientInfo.user_sys_before_count}}</span>  
39
-               <span v-if="dialysisOrder && dialysisOrder.dialysis_date>=1672502400">{{patientInfo.total_dialysis}}</span>  
38
+               {{patientInfo.total_dialysis ?patientInfo.total_dialysis:''}} 
40
               </span>
39
               </span>
41
             </td>
40
             </td>
42
             <!-- <td style="text-align:center;" colspan="1">
41
             <!-- <td style="text-align:center;" colspan="1">
1149
             <td style="text-align: center" colspan="2">
1148
             <td style="text-align: center" colspan="2">
1150
               透析次数:
1149
               透析次数:
1151
               <span style="display: inline-block; margin-left: 10px">
1150
               <span style="display: inline-block; margin-left: 10px">
1152
-                <span v-if=""></span> {{patientInfo.total_dialysis + patientInfo.user_sys_before_count}}
1151
+               {{patientInfo.total_dialysis ?patientInfo.total_dialysis:''}}
1153
               </span> 
1152
               </span> 
1154
             </td>
1153
             </td>
1155
             <!-- <td style="text-align:center;">
1154
             <!-- <td style="text-align:center;">