Página inicial Explorar Ajuda
Registrar Entrar
csx
/
Vue_New
Observar 2
Favorito 1
Fork 1
Código Issues 73 Pull Requests 0 Versões 0 Wiki Atividade
Ver código fonte

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

XMLWAN 3 anos atrás
pai
b63a4d9112 8dded33fc4
commit
7f265cff1a
4 arquivos alterados com 44 adições e 21 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 8 8
      src/xt_pages/dialysis/details/DialysisPrescription.vue
  2. 7 7
      src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue
  3. 28 5
      src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue
  4. 1 1
      src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

+ 8 - 8
src/xt_pages/dialysis/details/DialysisPrescription.vue Ver arquivo 

@@ -15,8 +15,8 @@
15 15 
           <span class="content">{{
16 16 
             replacement_total != "0" ? replacement_total : ""
17 17 
           }}</span>
18 
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
19 
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
18 
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
19 
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 40" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
20 20
21 21 
         </li>
22 22 
 
@@ -57,8 +57,8 @@
57 57 
           <label>总量: </label>
58 58 
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
59 59 
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
60 
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 ">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
61 
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
60 
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
61 
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
62 62 
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
63 63 
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
64 64 
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
 
@@ -135,8 +135,8 @@
135 135 
           <label>首剂 : </label>
136 136 
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
137 137 
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
138 
-          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 " >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
139 
-          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
138 
+          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
139 
+          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
140 140 
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
141 141 
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
142 142 
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
 
@@ -225,8 +225,8 @@
225 225 
           <label>维持 : </label>
226 226 
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
227 227 
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
228 
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
229 
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
228 
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
229 
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
230 230 
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
231 231 
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
232 232 
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>

+ 7 - 7
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Ver arquivo 

@@ -199,14 +199,14 @@
199 199
200 200 
           <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
201 201
202 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
202 
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
203 203 
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
204 204 
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
205 205 
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
206 206 
                         v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
207 207 
             </el-form-item>
208 208
209 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'首剂(mg) : '">
209 
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157' :label="'首剂(mg) : '">
210 210 
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
211 211 
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
212 212 
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
 
@@ -216,13 +216,13 @@
216 216
217 217
218 218 
           <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
219 
-            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987">
219 
+            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157">
220 220 
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
221 221 
                         v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
222 222 
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
223 223 
                         v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
224 224 
             </el-form-item>
225 
-            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987">
225 
+            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157">
226 226 
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
227 227 
                         v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
228 228 
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
 
@@ -231,13 +231,13 @@
231 231 
           </el-col>
232 232
233 233 
           <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
234 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
234 
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
235 235 
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
236 236 
                         v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
237 237 
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
238 238 
                         v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
239 239 
             </el-form-item>
240 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'总量(mg) : '">
240 
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157' :label="'总量(mg) : '">
241 241 
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
242 242 
                         v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
243 243 
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
 
@@ -258,7 +258,7 @@
258 258 
               ></el-input>
259 259 
             </el-form-item>
260 260 
           </el-col>
261 
-          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29"
261 
+          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40"
262 262 
                   v-show="zhiShow">
263 263 
             <el-form-item label="置换量(L)：">
264 264 
               <el-input

+ 28 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue Ver arquivo 

@@ -506,7 +506,7 @@
506 506 
                     &nbsp;{{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "" }}
507 507 
                   </div>
508 508 
                 </td>
509 
-                <td width="10">L)</td>
509 
+                <td width="10">ml)</td>
510 510 
                 <td width="50"><label-box :isChecked="prescription.mode_id != 5 && prescription.mode_id != 1 && prescription.mode_id != 2 ? true : false" showValue="其他"></label-box></td>
511 511 
                 <td width="50">
512 512 
                   <div class="under-line">&nbsp;
 
@@ -597,12 +597,12 @@
597 597 
                 <td width="80">透析液配方:</td>
598 598 
                 <td width="10">钙</td>
599 599 
                 <td width="10">(</td>
600 
-                <td width="220">
600 
+                <td width="240">
601 601 
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.25') > -1 ? true : false" showValue="1.25"></label-box>
602 602 
                   &nbsp;
603 603 
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.5') > -1 ? true : false" showValue="1.5"></label-box>
604 604 
                   &nbsp;
605 
-                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.75') > -1 ? true : false" showValue="1.75mmol/L"></label-box>
605 
+                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.75') > -1 ? true : false" showValue="1.75（mmol/L）"></label-box>
606 606 
                   &nbsp;
607 607 
                 </td>
608 608 
                 <td width="10">)</td>
 
@@ -781,11 +781,13 @@
781 781 
           <td width="40" style="line-height:20px">机温<br />℃</td>
782 782 
           <td width="60" style="line-height:20px">血流量<br />ml/min</td>
783 783 
           <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
784 
+          <td width="60" style="line-height:20px">超滤量<br />ml</td>
784 785 
           <!-- <td width="60">钠浓度<br/>mmol/L</td>
785 786 
         <td width="80">透析液温度<br/>℃</td>
786 787 
         <td width="60">置换率<br/>ml/min</td> -->
787 788
788 789 
           <td width="" style="line-height:20px">病情变化及处理</td>
790 
+          <td width="60" style="line-height:20px">护士签名</td>
789 791 
         </tr>
790 792
791 793 
         <tr v-for="monitor in monitors" :key="monitor.id">
 
@@ -837,12 +839,23 @@
837 839 
           <td>
838 840 
             &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
839 841 
           </td>
842 
+          <td>
843 
+            &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
844 
+          </td>
840 845 
           <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
841 846 
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
842 847 
         <td>&nbsp;{{monitor.replacement_rate}}</td> -->
843 848 
           <td>
844 849 
             &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
845 850 
           </td>
851 
+          <td>
852 
+            <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
853 
+              {{ getAdminUser(monitor.monitoring_nurse) }}
854 
+            </span>
855 
+            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
856 
+              <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
857 
+            </span>
858 
+          </td>
846 859 
         </tr>
847 860 
         </tbody>
848 861 
       </table>
 
@@ -897,8 +910,13 @@
897 910 
             <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
898 911 
           </td>
899 912 
           <td>
900 
-            <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
901 
-            <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
913 
+            <span v-if="advice.start_time">
914 
+                <span v-if="advice.checker > 0">
915 
+                    <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
916 
+                    <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
917 
+                </span>
918 
+                <span v-else>未核对</span>
919 
+            </span>
902 920 
           </td>
903 921 
           <td>
904 922 
             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
 
@@ -1028,6 +1046,11 @@
1028 1046 
                         <label-box showValue="有" :isChecked="afterdialysis.is_eat == 1 ? true : false"></label-box>
1029 1047 
                         <label-box showValue="无" :isChecked="afterdialysis.is_eat == 2 ? true : false"></label-box>
1030 1048 
                     </td>
1049 
+                    <td width="90">实际置换总量</td>
1050 
+                    <td width="50">
1051 
+                        <div class="under-line">&nbsp;{{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}</div>
1052 
+                    </td>
1053 
+                    <td width="20">ml</td>
1031 1054 
                     <td></td>
1032 1055 
                 </tr>
1033 1056 
                 </tbody>

+ 1 - 1
src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue Ver arquivo 

@@ -11,7 +11,7 @@
11 11 
             <div>
12 12 
                 <span style="position: absolute;left:590px;top:40px;">{{ printDate.slice(0,4) }}</span>
13 13 
                 <span style="position: absolute;left:630px;top:40px;">{{ printDate.slice(5,7) }}</span>
14 
-                <span style="position: absolute;left:660px;top:40px;">{{ printDate.slice(8,11) }}</span>
14 
+                <span style="position: absolute;left:690px;top:40px;">{{ printDate.slice(8,11) }}</span>
15 15 
             </div>
16 16 
         </div>
17 17 
         <div style="display:flex;justify-content: space-between;">