Przeglądaj źródła

龙岗二院bug修改

XMLWAN 4 lat temu
rodzic
commit
bbce521cbf

+ 5 - 5
src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue Wyświetl plik

@@ -57,7 +57,7 @@
57 57
                   </td>
58 58
                   <td style="text-align:center;">
59 59
                     住院号:<span style="display:inline-block;margin-left:10px;">
60
-                       {{record.patient.admission_number?record.patient.admission_number:"/"}}
60
+                       {{record.receive_assessment.admission_number?record.receive_assessment.admission_number:"/"}}
61 61
                     </span>
62 62
                   </td>
63 63
                   <td style="text-align:center;">
@@ -148,7 +148,7 @@
148 148
                   </td>
149 149
                   <td style="text-align:left;" colspan="2">
150 150
                     <span style="display:inline-block;margin-left:15px;"
151
-                      >电导率:{{record.assessment_before_dislysis.conductivity?record.assessment_before_dislysis:"0"}}mmol/L</span
151
+                      >电导率:{{record.prescription.conductivity?record.prescription.conductivity:"0"}}(mS/cm)</span
152 152
                     >
153 153
                   </td>
154 154
                   <td style="text-align:left;" colspan="2">
@@ -337,9 +337,9 @@
337 337
                   </td>
338 338
                 </tr>
339 339
                 <tr>
340
-                  <td style="text-align:left;" colspan="4">
341
-                    透前评估:
340
+                  <td style="text-align:left;" colspan="4"> 
342 341
                     <span style="display:inline-block;margin-left:15px;">
342
+                      &nbsp;&nbsp; 透前评估:
343 343
                       入科方式:
344 344
                       <label-box
345 345
                         :isChecked="
@@ -415,7 +415,7 @@
415 415
                 </tr>
416 416
                 <tr>
417 417
                   <td colspan="2" style="text-align:left;">
418
-                    食欲:
418
+                    <span style="display:inline-block;margin-left:15px;">食欲:</span>
419 419
                        <check-box text="正常" :checked="isCheckBoxChecked(record.receive_assessment, 'appetite', 1)"></check-box>
420 420
                        <check-box text="下降" :checked="isCheckBoxChecked(record.receive_assessment, 'appetite', 2)"></check-box>
421 421
                        <check-box text="恶心" :checked="isCheckBoxChecked(record.receive_assessment, 'appetite', 3)"></check-box>

+ 3 - 5
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Wyświetl plik

@@ -175,8 +175,8 @@
175 175
           </el-col>
176 176
 
177 177
 
178
-          <el-col :span="8" v-if="isShows('电导')">
179
-            <el-form-item label="电导度(mS/m): ">
178
+          <el-col :span="8" v-if="isShows('电导')">
179
+            <el-form-item label="电导率(mS/cm): ">
180 180
               <el-input type="number" v-model="dialysisPrescription.conductivity"></el-input>
181 181
             </el-form-item>
182 182
           </el-col>
@@ -909,7 +909,7 @@
909 909
           return true
910 910
         }
911 911
       },
912
-      setLastRecord: function(schedual, lastAssessmentAfterDislysis, lastPredialysisEvaluation, lastDialysisPrescribe, lastDryWeightDislysis,system_prescribe) {
912
+      setLastRecord: function(schedual, lastAssessmentAfterDislysis, lastPredialysisEvaluation, lastDialysisPrescribe, lastDryWeightDislysis, system_prescribe) {
913 913
         this.treatment_mode = this.$store.getters.treatment_mode
914 914
         this.perfusion_apparatus = getDataConfig('hemodialysis', 'perfusion_apparatus')
915 915
         this.replacement_ways = getDataConfig('hemodialysis', 'replacement_ways')
@@ -938,7 +938,6 @@
938 938
         } else if (lastDialysisPrescribe != null && typeof lastDialysisPrescribe.id !== 'undefined' && lastDialysisPrescribe.id > 0) {
939 939
           for (const key in lastDialysisPrescribe) {
940 940
             if (key != 'target_ultrafiltration') {
941
-
942 941
               this.dialysisPrescription[key] = lastDialysisPrescribe[key]
943 942
             }
944 943
           }
@@ -952,7 +951,6 @@
952 951
           this.dialysisPrescription.mode_id = schedual.mode_id
953 952
         }
954 953
 
955
-
956 954
         var thismode = parseInt(this.dialysisPrescription.anticoagulant)
957 955
         if (isNaN(thismode) || thismode <= 0) {
958 956
           return false

+ 10 - 22
src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue Wyświetl plik

@@ -32,7 +32,7 @@
32 32
           </td>
33 33
           <td style="text-align:center;">
34 34
             住院号:<span style="display:inline-block;margin-left:10px;">
35
-            {{patientInfo.admission_number?patientInfo.admission_number:"/"}}</span>
35
+            {{receiverTreatmentAccess.admission_number?receiverTreatmentAccess.admission_number:"/"}}</span>
36 36
           </td>
37 37
           <td style="text-align:center;">
38 38
             机器号:<span style="display:inline-block;margin-left:10px;"
@@ -105,7 +105,7 @@
105 105
              }}kg</span>
106 106
           </td>
107 107
           <td style="text-align:left;" colspan="2">
108
-            <span style="display:inline-block;margin-left:15px;">电导率:{{predialysis.conductivity?predialysis.conductivity:"0"}}mmol/L</span>
108
+            <span style="display:inline-block;margin-left:15px;">电导率:{{prescription.conductivity?prescription.conductivity:"0"}}(mS/cm)</span>
109 109
           </td>
110 110
           <td style="text-align:left;" colspan="2">
111 111
             <span style="display:inline-block;margin-left:15px;">钙:
@@ -233,9 +233,9 @@
233 233
           </td>
234 234
         </tr>
235 235
         <tr>
236
-          <td style="text-align:left;" colspan="4">
237
-            透前评估:
236
+          <td style="text-align:left;" colspan="4">   
238 237
             <span style="display:inline-block;margin-left:15px;">
238
+              透前评估:
239 239
               入科方式:
240 240
               <label-box
241 241
                 :isChecked="receiverTreatmentAccess.way == 1 ? true : false"
@@ -287,7 +287,7 @@
287 287
         </tr>
288 288
         <tr>
289 289
           <td colspan="2" style="text-align:left;" >
290
-            食欲:
290
+            <span style="display:inline-block;margin-left:15px;">食欲:</span>
291 291
             <label-box
292 292
               :isChecked="receiverTreatmentAccess.appetite == 1 ? true : false"
293 293
               showValue="正常"
@@ -318,7 +318,7 @@
318 318
             <span>体温:{{predialysis.temperature?predialysis.temperature:'/'}} ℃</span>
319 319
           </td>
320 320
           <td colspan="3" style="text-align:left;">
321
-            <span>体位:
321
+            <span style="display:inline-block;margin-left:15px;">体位:
322 322
               <label-box v-for="(item, index) in posture_arr" :key="index" :isChecked='receiverTreatmentAccess.posture==item.id?true:false' :showValue='item.name'></label-box>
323 323
                     <label-box :isChecked='receiverTreatmentAccess.posture==1?true:false'
324 324
                               showValue='自动体位'></label-box>
@@ -1004,8 +1004,6 @@ export default {
1004 1004
           var afterdialysis = response.data.data.AssessmentAfterDislysis
1005 1005
           // eslint-disable-next-line no-undef
1006 1006
           console.log('透后评估', afterdialysis)
1007
-          this.weight_after = afterdialysis.weight_after
1008
-          this.weightloss_after = afterdialysis.weight_after
1009 1007
           this.temperature = afterdialysis.temperature
1010 1008
           this.actual_ultrafiltration = afterdialysis.actual_ultrafiltration
1011 1009
           this.actual_treatment_hour = afterdialysis.actual_treatment_hour
@@ -1192,7 +1190,7 @@ export default {
1192 1190
           this.schedule = schedule
1193 1191
           var receiverTreatmentAccess =
1194 1192
             response.data.data.receiverTreatmentAccess
1195
-          // console.log('接诊评估', receiverTreatmentAccess)
1193
+          console.log('接诊评估', receiverTreatmentAccess)
1196 1194
           this.receiverTreatmentAccess = receiverTreatmentAccess
1197 1195
           var dialysisway = response.data.data.dialysisway
1198 1196
           console.log('透析处方', dialysisway)
@@ -1229,22 +1227,12 @@ export default {
1229 1227
           this.sodium = dialysisway.sodium
1230 1228
           this.calcium = dialysisway.calcium
1231 1229
           this.anticoagulant_weichi = dialysisway.anticoagulant_weichi
1232
-          var afterWeightLast = response.data.data.assessmentAfterDislysis
1233
-          // console.log('上次透后体重', afterWeightLast.weight_after)
1234
-          this.afterWeightLast = afterWeightLast.weight_after
1230
+          // var afterWeightLast = response.data.data.assessmentAfterDislysis
1231
+          // this.afterWeightLast = afterWeightLast.weight_after
1235 1232
           // eslint-disable-next-line no-undef
1236 1233
           // console.log('透前体重', this.weight_before)
1237 1234
           // console.log('干体中', this.dry_weight)
1238 1235
           // console.log('什么体重', predialysis.additional_weight)
1239
-          var dryWeight_add =
1240
-            this.weight_before -
1241
-            this.dry_weight -
1242
-            predialysis.additional_weight
1243
-          if (this.afterWeightLast === 0) {
1244
-            this.dryWeight_add = 0
1245
-          } else {
1246
-            this.dryWeight_add = dryWeight_add
1247
-          }
1248 1236
           // console.log('较干体中增加量', this.dryWeight_add)
1249 1237
           // this.afterWeightLast = afterWeightLast.weight_after
1250 1238
           this.prescription.mode = this.modeName(this.prescription.mode_id)
@@ -1295,7 +1283,7 @@ export default {
1295 1283
           this.advices = response.data.data.advices
1296 1284
           // console.log('医嘱', this.advices)
1297 1285
           var monitor = response.data.data.monitor
1298
-         // console.log('透析监测', monitor)
1286
+          // console.log('透析监测', monitor)
1299 1287
           this.monitor = monitor
1300 1288
           // console.log('monitor', monitor)
1301 1289
           this.monitors = response.data.data.monitors

+ 21 - 23
src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue Wyświetl plik

@@ -303,8 +303,8 @@
303 303
          <td>核对</td>
304 304
          <td>上次透后体重</td>
305 305
          <td> {{
306
-               afterWeightLast
307
-                ? parseFloat(afterWeightLast).toFixed(1): "未称重"
306
+               afterWeightLastTwo.weight_after
307
+                ? parseFloat(afterWeightLastTwo.weight_after).toFixed(1): "未称重"
308 308
               }}kg</td>
309 309
         </tr>
310 310
         <tr  v-for="(advice, advice_index) in tableAdvice"
@@ -352,9 +352,9 @@
352 352
          <td v-if="advice_index==4">净脱水量</td>
353 353
          <td v-if="advice_index==4">{{actual_ultrafiltration}}L</td>
354 354
          <td v-if="advice_index==5">透后体重</td>
355
-         <td v-if="advice_index==5">{{weight_after}}kg</td>
355
+         <td v-if="advice_index==5">{{afterdialysis.weight_after}}kg</td>
356 356
          <td v-if="advice_index==6">本次透析体重下降量</td>
357
-         <td v-if="advice_index==6">{{(weight_before-weightloss_after).toFixed(1)}}kg</td>
357
+         <td v-if="advice_index==6">{{(weight_before-afterdialysis.weightloss_after).toFixed(1)}}kg</td>
358 358
         </tr>
359 359
         <tr>
360 360
           <td colspan="6" style="text-align:left;min-height:20px">
@@ -515,14 +515,14 @@
515 515
         nurse: '',
516 516
         doctorAdvice: [],
517 517
         total: '',
518
-        weight_before: '',
519
-        dry_weight: '',
520
-        weight_after: '',
521
-        weightloss_after: '',
522
-        actual_ultrafiltration: '',
523
-        temperature: '',
524
-        systolic_blood_pressure: '',
525
-        diastolic_blood_pressure: '',
518
+        weight_before: 0,
519
+        dry_weight: 0,
520
+        weight_after: 0,
521
+        weightloss_after: 0,
522
+        actual_ultrafiltration: 0,
523
+        temperature: '/',
524
+        systolic_blood_pressure: 0,
525
+        diastolic_blood_pressure: 0,
526 526
         mission: '',
527 527
         dialysis_summary: '',
528 528
         orderForm: {
@@ -553,8 +553,9 @@
553 553
         PunctureNurse: {
554 554
           user_name: '',
555 555
           url: ''
556
-        }
557
-
556
+        },
557
+        // eslint-disable-next-line no-dupe-keys
558
+        afterWeightLastTwo: {}
558 559
       }
559 560
   },
560 561
   methods: {
@@ -670,7 +671,6 @@
670 671
       },
671 672
       getDialysisRecord() {
672 673
         this.loading = true
673
-
674 674
         getDialysisRecord(this.queryParams).then(response => {
675 675
           if (response.data.state === 1) {
676 676
             this.adminUser = response.data.data.users
@@ -732,8 +732,8 @@
732 732
             var afterdialysis = response.data.data.AssessmentAfterDislysis
733 733
             // eslint-disable-next-line no-undef
734 734
             // console.log('透后评估', afterdialysis)
735
-            this.weight_after = afterdialysis.weight_after
736
-            this.weightloss_after = afterdialysis.weight_after
735
+            // this.weight_after = afterdialysis.weight_after
736
+            // this.weightloss_after = afterdialysis.weight_after
737 737
             this.temperature = afterdialysis.temperature
738 738
             this.actual_ultrafiltration = afterdialysis.actual_ultrafiltration
739 739
             this.actual_treatment_hour = afterdialysis.actual_treatment_hour
@@ -789,7 +789,6 @@
789 789
               tableAdvice.push(obj3)
790 790
               tableAdvice.push(obj4)
791 791
               this.tableAdvice = tableAdvice
792
-             
793 792
             }
794 793
             if (tableAdvice.length === 3) {
795 794
               var obj = { 'advice_name': '', start_time: '' }
@@ -803,7 +802,6 @@
803 802
               tableAdvice.push(obj3)
804 803
 
805 804
               this.tableAdvice = tableAdvice
806
-              
807 805
             }
808 806
             if (tableAdvice.length === 4) {
809 807
               var obj = { 'advice_name': '', start_time: '' }
@@ -814,7 +812,6 @@
814 812
               tableAdvice.push(obj1)
815 813
               tableAdvice.push(obj2)
816 814
               this.tableAdvice = tableAdvice
817
-             
818 815
             }
819 816
             if (tableAdvice.length === 5) {
820 817
               var obj = { 'advice_name': '', start_time: '' }
@@ -944,15 +941,16 @@
944 941
             this.calcium = dialysisway.calcium
945 942
             this.anticoagulant_weichi = dialysisway.anticoagulant_weichi
946 943
             var afterWeightLast = response.data.data.assessmentAfterDislysis
944
+            this.afterWeightLastTwo = afterWeightLast
945
+            // this.afterWeightLast = afterWeightLast.weight_after
947 946
             // console.log('上次透后体重', afterWeightLast.weight_after)
948
-            this.afterWeightLast = afterWeightLast.weight_after
949 947
             // eslint-disable-next-line no-undef
950 948
             console.log('透前体重', this.weight_before)
951 949
             console.log('干体中', this.dry_weight)
952 950
             console.log('衣物重', predialysis.additional_weight)
953 951
 
954
-            var dryWeight_add = this.weight_before - this.afterWeightLast
955
-            if (this.afterWeightLast === 0) {
952
+            var dryWeight_add = this.weight_before - this.afterWeightLastTwo.weight_after
953
+            if (this.afterWeightLastTwo.weight_after === 0) {
956 954
               this.dryWeight_add = 0
957 955
             } else {
958 956
               this.dryWeight_add = dryWeight_add.toFixed(2)