Browse Source

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 4 months ago
parent
commit
a3ebed1dd4

+ 2 - 0
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

3365
                 ParamsQuery['mode'] = '1'
3365
                 ParamsQuery['mode'] = '1'
3366
                 ParamsQuery['patient_id'] = this.patient.id
3366
                 ParamsQuery['patient_id'] = this.patient.id
3367
                 console.log('第一', ParamsQuery)
3367
                 console.log('第一', ParamsQuery)
3368
+             
3369
+
3368
                 postPrescription(ParamsQuery).then(response => {
3370
                 postPrescription(ParamsQuery).then(response => {
3369
                   if (response.data.state == 0) {
3371
                   if (response.data.state == 0) {
3370
                     this.$message.error(response.data.msg)
3372
                     this.$message.error(response.data.msg)

+ 6 - 6
src/xt_pages/dialysis/details/index.vue View File

549
                   <span style="display: block;width: 45%;">处方脱水量:{{main_collection.prescription.prescription_water}}
549
                   <span style="display: block;width: 45%;">处方脱水量:{{main_collection.prescription.prescription_water}}
550
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
550
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
551
                      <span v-else>L</span>
551
                      <span v-else>L</span>
552
-                  </span> 
552
+                  </span>
553
                   <span style="display: block;width: 50%;">
553
                   <span style="display: block;width: 50%;">
554
                     血流量:{{ main_collection.prescription.blood_flow_volume }} ml/min
554
                     血流量:{{ main_collection.prescription.blood_flow_volume }} ml/min
555
                   </span>
555
                   </span>
572
                   <div style="">透析器:
572
                   <div style="">透析器:
573
                    <span>{{main_collection.prescription.dialysis_dialyszers }}&nbsp;&nbsp; {{main_collection.prescription.dialysis_irrigation}}&nbsp;&nbsp; {{main_collection.prescription.dialysis_strainer}}</span>
573
                    <span>{{main_collection.prescription.dialysis_dialyszers }}&nbsp;&nbsp; {{main_collection.prescription.dialysis_irrigation}}&nbsp;&nbsp; {{main_collection.prescription.dialysis_strainer}}</span>
574
                   </div>
574
                   </div>
575
-                 
575
+
576
                 </div>
576
                 </div>
577
               </div>
577
               </div>
578
             </div>
578
             </div>
2577
           newArr.sort(this.compare('created_time'))
2577
           newArr.sort(this.compare('created_time'))
2578
         }
2578
         }
2579
 
2579
 
2580
-        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702){
2580
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702 || this.org_id==10721){
2581
           if(newArr!=null && newArr.length>0){
2581
           if(newArr!=null && newArr.length>0){
2582
             for(let i=0;i<newArr.length;i++){
2582
             for(let i=0;i<newArr.length;i++){
2583
               newArr[i].sort =0
2583
               newArr[i].sort =0
2756
           newArr.sort(this.compare('created_time'))
2756
           newArr.sort(this.compare('created_time'))
2757
         }
2757
         }
2758
 
2758
 
2759
-        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702){
2759
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702 || this.org_id == 10721){
2760
           if(newArr!=null && newArr.length>0){
2760
           if(newArr!=null && newArr.length>0){
2761
             for(let i=0;i<newArr.length;i++){
2761
             for(let i=0;i<newArr.length;i++){
2762
               newArr[i].sort =0
2762
               newArr[i].sort =0
3290
         }else{
3290
         }else{
3291
           this.time_value
3291
           this.time_value
3292
         }
3292
         }
3293
-        
3293
+
3294
       }
3294
       }
3295
     },
3295
     },
3296
     timestamp(start_time) {
3296
     timestamp(start_time) {
3299
     }
3299
     }
3300
 
3300
 
3301
   },
3301
   },
3302
- 
3302
+
3303
   watch:{
3303
   watch:{
3304
     time_value:{
3304
     time_value:{
3305
       handler(newValue,oldValue){
3305
       handler(newValue,oldValue){