huangyw пре 2 година
родитељ
комит
29febefbf2

+ 23 - 15
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue Прегледај датотеку

226
               ></label-box>
226
               ></label-box>
227
             </td>
227
             </td>
228
           </tr>
228
           </tr>
229
-          <tr class="list_table_1" style="line-height:40px;">
229
+          <tr class="list_table_1" style="line-height: 40px">
230
             <td
230
             <td
231
               width="250"
231
               width="250"
232
               style="border-right: none; padding-left: 10px"
232
               style="border-right: none; padding-left: 10px"
821
             <td v-if="advice_index === 1">体重增加量:</td>
821
             <td v-if="advice_index === 1">体重增加量:</td>
822
             <td v-if="advice_index === 1">
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
               }}kg
829
               }}kg
828
             </td>
830
             </td>
829
             <td v-if="advice_index === 2">干体重(DW):</td>
831
             <td v-if="advice_index === 2">干体重(DW):</td>
831
             <td v-if="advice_index === 3">较干体重增加量:</td>
833
             <td v-if="advice_index === 3">较干体重增加量:</td>
832
             <td v-if="advice_index === 3">
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
               }}kg
841
               }}kg
838
             </td>
842
             </td>
839
             <td v-if="advice_index === 4">净脱水量:</td>
843
             <td v-if="advice_index === 4">净脱水量:</td>
847
             <td v-if="advice_index === 6">本次透析体重下降量:</td>
851
             <td v-if="advice_index === 6">本次透析体重下降量:</td>
848
             <td v-if="advice_index === 6">
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
               }}kg
859
               }}kg
854
             </td>
860
             </td>
855
             <td v-if="advice_index > 6"></td>
861
             <td v-if="advice_index > 6"></td>
886
               >
892
               >
887
                 {{
893
                 {{
888
                   getAdminUser(
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
               </span>
902
               </span>
901
                       : prescription.creater
909
                       : prescription.creater
902
                       ? prescription.creater
910
                       ? prescription.creater
903
                       : ''
911
                       : ''
904
-                  ) "
905
-               
912
+                  )
913
+                "
906
                 alt=""
914
                 alt=""
907
                 srcset=""
915
                 srcset=""
908
                 v-else
916
                 v-else

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

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