소스 검색

Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

csx 4 년 전
부모
커밋
db62bf4624

+ 1 - 1
src/pages/main/dialog/AssessmentDialog.vue 파일 보기

@@ -273,7 +273,7 @@
273 273
           <h2 class="name">透析机型号</h2>
274 274
           <div class="content">
275 275
             <input
276
-              type="number"
276
+              type="text"
277 277
               @click="newClick($event)"
278 278
               @focus="inputFocus"
279 279
               v-model="formValue.machine_type"

+ 1 - 0
src/pages/main/dialog/DoubleDialog.vue 파일 보기

@@ -177,6 +177,7 @@ export default {
177 177
         vascular_access_desc: "",
178 178
         pipeline_connection_desc: "",
179 179
         collator: "",
180
+
180 181
         creater: 0,
181 182
         modifier: 0,
182 183
         created_time: 0,

+ 12 - 16
src/pages/main/dialog/PrescriptionDialog.vue 파일 보기

@@ -83,16 +83,15 @@
83 83
             </div>
84 84
           </div>
85 85
 
86
-          <div class="item" v-if="anticoagulant.shouji != -1&&isShow('首剂')">
86
+          <div class="item" v-if="dialysisPrescription.anticoagulant != 5&&isShow('首剂')">
87 87
             <label
88 88
               class="name"
89 89
               for="zl"
90 90
               v-if="dialysisPrescription.anticoagulant == 0 ||dialysisPrescription.anticoagulant == -2"
91 91
             >首剂(mg)</label>
92
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">首剂(mg)</label>
92
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">首剂(iu)</label>
93 93
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">首剂(iu)</label>
94 94
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">首剂(mg)</label>
95
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">首剂(mg)</label>
96 95
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">首剂(mg)</label>
97 96
             <div class="content">
98 97
               <input
@@ -122,11 +121,11 @@
122 121
               for="zl"
123 122
               v-if="dialysisPrescription.anticoagulant == 0 ||dialysisPrescription.anticoagulant == -2"
124 123
             >维持(mg/h)</label>
125
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">维持(mg/h)</label>
124
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">维持(iu)</label>
126 125
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">维持(iu)</label>
127
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">维持(mg/h)</label>
128
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">维持(ml/h)</label>
129
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">维持(mg/h)</label>
126
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">维持(mg)</label>
127
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">维持(ml)</label>
128
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">维持(mg)</label>
130 129
             <div class="content">
131 130
               <input
132 131
                 v-if="dialysisPrescription.anticoagulant != 1"
@@ -150,16 +149,15 @@
150 149
               />
151 150
             </div>
152 151
           </div>
153
-          <div class="item" v-if="anticoagulant.zongliang != -1 && isShow('总量')">
152
+          <div class="item" v-if="dialysisPrescription.anticoagulant != 5&& isShow('总量')">
154 153
             <label
155 154
               class="name"
156 155
               for="zl"
157 156
               v-if="dialysisPrescription.anticoagulant == 0 ||dialysisPrescription.anticoagulant == -2"
158 157
             >总量(mg)</label>
159
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">总量(mg)</label>
158
+            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 2">总量(iu)</label>
160 159
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 3">总量(iu)</label>
161 160
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 4">总量(mg)</label>
162
-            <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 5">总量(mg)</label>
163 161
             <label class="name" for="zl" v-if="dialysisPrescription.anticoagulant == 1">总量(mg)</label>
164 162
 
165 163
             <div class="content">
@@ -186,7 +184,7 @@
186 184
             </div>
187 185
           </div>
188 186
 
189
-          <div class="item" v-if="anticoagulant.gaimingcheng != -1 && isShow('钙名称')">
187
+          <div class="item" v-if="dialysisPrescription.anticoagulant == 5&& isShow('钙名称')">
190 188
             <label class="name" for="g">钙名称</label>
191 189
             <div class="content">
192 190
               <input
@@ -194,20 +192,18 @@
194 192
                 id="g"
195 193
                 class="inputBox"
196 194
                 v-model="dialysisPrescription.anticoagulant_gaimingcheng"
197
-                :disabled="anticoagulant.gaimingcheng==1?false:true"
198 195
               />
199 196
             </div>
200 197
           </div>
201 198
 
202
-          <div class="item" v-if="anticoagulant.gaijiliang != -1 && isShow('钙剂量')">
203
-            <label class="name" for="gjl">钙剂量({{anticoagulant.gaimingcheng_unit}})</label>
199
+          <div class="item" v-if="dialysisPrescription.anticoagulant == 5&& isShow('钙剂量')">
200
+            <label class="name" for="gjl">钙剂量(ml)</label>
204 201
             <div class="content">
205 202
               <input
206 203
                 type="text"
207 204
                 id="gjl"
208 205
                 class="inputBox"
209 206
                 v-model="dialysisPrescription.anticoagulant_gaijiliang"
210
-                :disabled="anticoagulant.gaijiliang==1?false:true"
211 207
               />
212 208
             </div>
213 209
           </div>
@@ -1289,7 +1285,7 @@
1289 1285
               this.zhiShow = true
1290 1286
               this.totalShow = true
1291 1287
               this.huShow  = true
1292
-             
1288
+
1293 1289
             }
1294 1290
           }
1295 1291
         }

+ 35 - 10
src/pages/main/template/DialysisPrintOrderSix.vue 파일 보기

@@ -352,29 +352,54 @@
352 352
                       {{prescription.anticoagulant_name?prescription.anticoagulant_name:'/'}}
353 353
                     </div>
354 354
                   </div>
355
-                  <div class="inline_block" style="margin-left:20px;">
355
+                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant != 5">
356 356
                     首剂:
357 357
                     <div class="under_line" style="width: 50px;text-align: center;">
358 358
                       {{prescription.anticoagulant_shouji?prescription.anticoagulant_shouji:'/'}}
359 359
                     </div>
360
-                    lu
360
+                    <span v-if="prescription.anticoagulant == 4">mg</span>
361
+                    <span v-if="prescription.anticoagulant == 3">iu</span>
362
+                    <span v-if="prescription.anticoagulant == 2">iu</span>
363
+                    <span v-if="prescription.anticoagulant == 1">mg</span>
361 364
                   </div>
365
+
362 366
                   <div class="inline_block" style="margin-left:20px;">
363 367
                   维持:
364
-                    <div v-if="prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
365
-                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:'/'}}
368
+                    <div v-if="prescription.anticoagulant == 1"  class="under_line" style="width: 50px;text-align: center;">
369
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"/"}}
366 370
                     </div>
367
-                    <div v-if="prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
368
-                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:0}}
371
+                    <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
372
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
369 373
                     </div>
370
-                    lu
374
+                    <span v-if="prescription.anticoagulant == 5">ml</span>
375
+                    <span v-if="prescription.anticoagulant == 4">mg</span>
376
+                    <span v-if="prescription.anticoagulant == 3">iu</span>
377
+                    <span v-if="prescription.anticoagulant == 2">iu</span>
378
+                    <span v-if="prescription.anticoagulant == 1">mg</span>
371 379
                   </div>
372
-                  <div class="inline_block" style="margin-left:20px;">
380
+
381
+                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
382
+                    钙名称:
383
+                    <div class="under_line" style="width: 150px;text-align: center;">
384
+                      {{prescription.anticoagulant_gaimingcheng?prescription.anticoagulant_gaimingcheng:'/'}}
385
+                    </div>
386
+                  </div>
387
+                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
388
+                    钙剂量:
389
+                    <div class="under_line" style="width: 50px;text-align: center;">
390
+                      {{prescription.anticoagulant_gaijiliang?prescription.anticoagulant_gaijiliang:'/'}}
391
+                    </div>
392
+                    ml
393
+                  </div>
394
+                  <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant != 5">
373 395
                   总量:
374 396
                     <div class="under_line" style="width: 50px;text-align: center;">
375 397
                       {{prescription.anticoagulant_zongliang?prescription.anticoagulant_zongliang:'/'}}
376 398
                     </div>
377
-                    lu
399
+                    <span v-if="prescription.anticoagulant == 4">mg</span>
400
+                    <span v-if="prescription.anticoagulant == 3">iu</span>
401
+                    <span v-if="prescription.anticoagulant == 2">iu</span>
402
+                    <span v-if="prescription.anticoagulant == 1">mg</span>
378 403
                   </div>
379 404
                   <div class="inline_block" style="margin-left:20px;">
380 405
                   透析机号:
@@ -664,7 +689,7 @@
664 689
                     {{afterdialysis.catheter?afterdialysis.catheter:'/'}}
665 690
                   </div>
666 691
                 </div>
667
-                
692
+
668 693
               </div>
669 694
 
670 695
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">

+ 1 - 1
src/pages/main/template/DialysisPrintOrderTwo.vue 파일 보기

@@ -66,7 +66,7 @@
66 66
                   透析机编号:
67 67
                   <div class="under_line" style="width: 40px;text-align: left">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}</div>
68 68
                   型号
69
-                  <div class="under_line" style="width: 70px;text-align: left">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
69
+                  <div class="under_line" style="width: 70px;text-align: left">{{predialysis?predialysis.machine_type:''}}</div>
70 70
                 </div>
71 71
 
72 72
 

+ 14 - 14
src/pages/main/today/dialysisPrescription.vue 파일 보기

@@ -26,11 +26,11 @@
26 26
           <!--v-if="this.$store.getters.user.template_info.template_id == 6"-->
27 27
           <!--&gt;{{target_ultrafiltration != '0'?"ml":''}}</span>-->
28 28
         </li>
29
-        <li v-if="isShow('首剂')">
30
-          <label>首剂 :</label>
31
-          <span class="content">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>
32
-          <span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>
33
-        </li>
29
+        <!--<li v-if="isShow('首剂')">-->
30
+          <!--<label>首剂 :</label>-->
31
+          <!--<span class="content">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>-->
32
+          <!--<span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>-->
33
+        <!--</li>-->
34 34
         <li v-if="isShow('钙')">
35 35
           <label>钙:</label>
36 36
           <span class="content">{{calcium != '0'?calcium:""}}</span>
@@ -93,31 +93,31 @@
93 93
           <label>首剂 : </label>
94 94
           <span class="content">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>
95 95
           <!--<span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>-->
96
-          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_shouji != '0'?"mg":""}}</span>
96
+          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_shouji != '0'?"iu":""}}</span>
97 97
           <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_shouji != '0'?"iu":""}}</span>
98 98
           <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_shouji != '0'?"mg":""}}</span>
99 99
           <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_shouji != '0'?"mg":""}}</span>
100 100
           <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_shouji != '0'?"mg":""}}</span>
101 101
 
102 102
         </li>
103
-        <li v-if="isShow('维持')&&this.prescription.anticoagulant != 5">
103
+        <li v-if="isShow('维持')">
104 104
           <label>维持 : </label>
105 105
           <span class="content">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
106
-          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
106
+          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_weichi != '0'?"iu":""}}</span>
107 107
           <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_weichi != '0'?"iu":""}}</span>
108
-          <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
109
-          <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
110
-          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
108
+          <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_weichi != '0'?"mg":""}}</span>
109
+          <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_weichi != '0'?"mg":""}}</span>
110
+          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_weichi != '0'?"ml":""}}</span>
111 111
         </li>
112 112
 
113 113
         <li v-if="isShow('总量')&&this.prescription.anticoagulant != 5">
114 114
           <label>总量: </label>
115 115
           <span class="content">{{anticoagulant_zongliang != '0'?anticoagulant_zongliang:""}}</span>
116
-          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
116
+          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
117 117
           <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
118 118
           <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
119 119
           <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
120
-          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
120
+          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_zongliang != '0'?"ml":""}}</span>
121 121
         </li>
122 122
 
123 123
 
@@ -130,7 +130,7 @@
130 130
         <li v-if="isShow('钙剂量')&&this.prescription.anticoagulant == 5">
131 131
           <label>钙剂量: </label>
132 132
           <span class="content">{{this.prescription.anticoagulant_gaijiliang}}</span>
133
-          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{'ml/h'}}</span>
133
+          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{'ml'}}</span>
134 134
         </li>
135 135
 
136 136
 

+ 3 - 3
src/pages/monitoring/index.vue 파일 보기

@@ -79,7 +79,7 @@
79 79
               <th width="9%">透析号</th>
80 80
               <th width="10%">排班时间</th>
81 81
               <th width="10%">透析模式</th>
82
-              <th width="9%">脱水量</th>
82
+              <th width="9%">目标超滤量</th>
83 83
               <th width="10%">体重(透前/透后)</th>
84 84
               <th width="28%">监控预警(血压/心率)</th>
85 85
             </tr>
@@ -121,8 +121,8 @@
121 121
               <td width="10%">{{ item.treatment_mode.name }}</td>
122 122
               <td width="9%">
123 123
                 {{
124
-                  item.prescription.dewater_amount
125
-                    ? item.prescription.dewater_amount
124
+                  item.prescription.target_ultrafiltration
125
+                    ? item.prescription.target_ultrafiltration
126 126
                     : ""
127 127
                 }}
128 128
               </td>