huangyw 2 년 전
부모
커밋
29febefbf2
2개의 변경된 파일43개의 추가작업 그리고 35개의 파일을 삭제
  1. 23 15
      src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue
  2. 20 20
      src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

+ 23 - 15
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue 파일 보기

@@ -226,7 +226,7 @@
226 226
               ></label-box>
227 227
             </td>
228 228
           </tr>
229
-          <tr class="list_table_1" style="line-height:40px;">
229
+          <tr class="list_table_1" style="line-height: 40px">
230 230
             <td
231 231
               width="250"
232 232
               style="border-right: none; padding-left: 10px"
@@ -821,9 +821,11 @@
821 821
             <td v-if="advice_index === 1">体重增加量:</td>
822 822
             <td v-if="advice_index === 1">
823 823
               {{
824
-                (
825
-                  predialysis.weight_before - assessmentafter.weight_after
826
-                ).toFixed(2)
824
+                (assessmentafter.weight_after == 0
825
+                  ? 0
826
+                  : (
827
+                      predialysis.weight_before - assessmentafter.weight_after
828
+                    ).toFixed(2))
827 829
               }}kg
828 830
             </td>
829 831
             <td v-if="advice_index === 2">干体重(DW):</td>
@@ -831,9 +833,11 @@
831 833
             <td v-if="advice_index === 3">较干体重增加量:</td>
832 834
             <td v-if="advice_index === 3">
833 835
               {{
834
-                (afterdialysis.weight_after - predialysis.dry_weight).toFixed(
835
-                  2
836
-                )
836
+                afterdialysis.weight_after == 0
837
+                  ? 0
838
+                  : (
839
+                      afterdialysis.weight_after - predialysis.dry_weight
840
+                    ).toFixed(2)
837 841
               }}kg
838 842
             </td>
839 843
             <td v-if="advice_index === 4">净脱水量:</td>
@@ -847,9 +851,11 @@
847 851
             <td v-if="advice_index === 6">本次透析体重下降量:</td>
848 852
             <td v-if="advice_index === 6">
849 853
               {{
850
-                (
851
-                  predialysis.weight_before - afterdialysis.weight_after
852
-                ).toFixed(2)
854
+                afterdialysis.weight_after == 0
855
+                  ? 0
856
+                  : (
857
+                      predialysis.weight_before - afterdialysis.weight_after
858
+                    ).toFixed(2)
853 859
               }}kg
854 860
             </td>
855 861
             <td v-if="advice_index > 6"></td>
@@ -886,9 +892,11 @@
886 892
               >
887 893
                 {{
888 894
                   getAdminUser(
889
-                    prescription == null? 0: prescription.creater ? prescription.prescription_doctor: ""
890
-                     
891
-                     
895
+                    prescription == null
896
+                      ? 0
897
+                      : prescription.creater
898
+                      ? prescription.prescription_doctor
899
+                      : ""
892 900
                   )
893 901
                 }}
894 902
               </span>
@@ -901,8 +909,8 @@
901 909
                       : prescription.creater
902 910
                       ? prescription.creater
903 911
                       : ''
904
-                  ) "
905
-               
912
+                  )
913
+                "
906 914
                 alt=""
907 915
                 srcset=""
908 916
                 v-else

+ 20 - 20
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue 파일 보기

@@ -767,33 +767,33 @@
767 767
             <td>
768 768
               <table class="print-table" border="1" style="text-align: center">
769 769
                 <tr>
770
-                  <td style="height: 20px" width="50">
770
+                  <td style="height: 20px" width="60">
771 771
                     <p style="height: 20px; line-height: 20px">时间</p>
772 772
                   </td>
773 773
                   <td
774 774
                     style="height: 20px"
775
-                    width="80"
775
+                    width="90"
776 776
                     v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
777 777
                   >
778 778
                     <p style="height: 20px; line-height: 20px">开嘱医生</p>
779 779
                   </td>
780
-                  <td style="height: 20px" width="360">
780
+                  <td style="height: 20px" width="344">
781 781
                     <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
782 782
                   </td>
783 783
                   <td
784 784
                     style="height: 20px"
785
-                    width="100"
785
+                    width="70"
786 786
                     v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
787 787
                   >
788 788
                     <p style="height: 20px; line-height: 20px">执行时间</p>
789 789
                   </td>
790
-                  <td style="height: 20px" width="85">
790
+                  <td style="height: 20px" width="90">
791 791
                     <p style="height: 20px; line-height: 20px">执行</p>
792 792
                   </td>
793
-                  <td style="height: 20px" width="85">
793
+                  <td style="height: 20px" width="90">
794 794
                     <p style="height: 20px; line-height: 20px">核对</p>
795 795
                   </td>
796
-                  <td style="height: 20px" width="145">
796
+                  <td style="height: 20px" width="144">
797 797
                     <p style="height: 20px; line-height: 20px">上次透后体重</p>
798 798
                   </td>
799 799
                   <td style="height: 20px" width="60">
@@ -817,12 +817,12 @@
817 817
             <td>
818 818
               <table class="print-table" border="1">
819 819
                 <tr>
820
-                  <td width="50">
820
+                  <td width="60">
821 821
                     {{ getTime(advice.start_time, "{h}:{i}") }}
822 822
                   </td>
823 823
                   <td
824 824
                     style="line-height: 30px"
825
-                    width="80"
825
+                    width="90"
826 826
                     v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
827 827
                   >
828 828
                     <span v-if="setAdminUserES(advice.advice_doctor) == ''">
@@ -835,7 +835,7 @@
835 835
                       srcset=""
836 836
                     />
837 837
                   </td>
838
-                  <td style="text-align: left; padding-left: 5px" width="360">
838
+                  <td style="text-align: left; padding-left: 5px" width="340">
839 839
                     <span v-if="advice.parent_id > 0">---></span>
840 840
                     <span>{{ advice.advice_name }}</span>
841 841
                     <span v-if="advice && advice.advice_desc"
@@ -860,15 +860,15 @@
860 860
                     <span>{{ advice.remark }}</span>
861 861
                   </td>
862 862
                   <td
863
-                    style="line-height: 30px"
864
-                    width="100"
863
+                    style="line-height: 10px"
864
+                    width="70"
865 865
                     v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
866 866
                   >
867 867
                     <span v-if="advice.execution_time">{{
868 868
                       getTime(advice.execution_time, "{h}:{i}")
869 869
                     }}</span>
870 870
                   </td>
871
-                  <td style="line-height: 30px" width="85">
871
+                  <td style="line-height: 10px" width="90">
872 872
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
873 873
                       getAdminUser(advice.execution_staff)
874 874
                     }}</span>
@@ -879,7 +879,7 @@
879 879
                       srcset=""
880 880
                     />
881 881
                   </td>
882
-                  <td style="line-height: 30px" width="85">
882
+                  <td style="line-height: 30px" width="90">
883 883
                     <span v-if="setAdminUserES(advice.checker) == ''">{{
884 884
                       getAdminUser(advice.checker)
885 885
                     }}</span>
@@ -907,12 +907,12 @@
907 907
                     {{
908 908
                       patientInfo.total_dialysis +
909 909
                         patientInfo.user_sys_before_count >
910
-                      0
910
+                        0 && assessmentafter.weight_after != 0
911 911
                         ? (
912 912
                             predialysis.weight_before -
913 913
                             assessmentafter.weight_after
914 914
                           ).toFixed(2)
915
-                        : "/"
915
+                        : 0
916 916
                     }}kg
917 917
                   </td>
918 918
                   <td v-if="advice_index === 2" width="145">干体重(DW):</td>
@@ -930,11 +930,11 @@
930 930
                     {{
931 931
                       patientInfo.total_dialysis +
932 932
                         patientInfo.user_sys_before_count >
933
-                      0
933
+                        0 && afterdialysis.weight_after != 0
934 934
                         ? (
935 935
                             afterdialysis.weight_after - predialysis.dry_weight
936 936
                           ).toFixed(2)
937
-                        : "/"
937
+                        : 0
938 938
                     }}kg
939 939
                   </td>
940 940
                   <td v-if="advice_index === 4" width="145">净脱水量:</td>
@@ -964,12 +964,12 @@
964 964
                     {{
965 965
                       patientInfo.total_dialysis +
966 966
                         patientInfo.user_sys_before_count >
967
-                      0
967
+                        0 && afterdialysis.weight_after != 0
968 968
                         ? (
969 969
                             predialysis.weight_before -
970 970
                             afterdialysis.weight_after
971 971
                           ).toFixed(2)
972
-                        : "/"
972
+                        : 0
973 973
                     }}kg
974 974
                   </td>
975 975
                   <td v-if="advice_index > 6" width="145"></td>