新分支

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -1227,17 +1227,45 @@
              
               
               this.list[i].anticoagulant_one=""
-              this.list[i].anticoagulant_one = (this.getAnticoagualnt(this.list[i].dialysis_solution.anticoagulant)) + "(" + (this.list[i].dialysis_solution.anticoagulant_shouji) +")" + "("+(this.list[i].dialysis_solution.anticoagulant_weichi) +")"+"("+(this.list[i].dialysis_solution.anticoagulant_zongliang)+")"
+              if(this.list[i].dialysis_prescription.anticoagulant == ''){
+                this.list[i].anticoagulant_one = (this.getAnticoagualnt(this.list[i].dialysis_solution.anticoagulant)) + "(" + (this.list[i].dialysis_solution.anticoagulant_shouji) +")" + "("+(this.list[i].dialysis_solution.anticoagulant_weichi) +")"+"("+(this.list[i].dialysis_solution.anticoagulant_zongliang)+")"
+              }
+
+              if(this.list[i].dialysis_prescription.anticoagulant != ''){
+                this.list[i].anticoagulant_one = (this.getAnticoagualnt(this.list[i].dialysis_prescription.anticoagulant)) + "(" + (this.list[i].dialysis_prescription.anticoagulant_shouji) +")" + "("+(this.list[i].dialysis_prescription.anticoagulant_weichi) +")"+"("+(this.list[i].dialysis_prescription.anticoagulant_zongliang)+")"
+              }
+             
              
               this.list[i].dialysis_time = this.list[i].dialysis_solution.dialysis_duration_hour?this.list[i].dialysis_solution.dialysis_duration_hour:"" + "时"+ this.list[i].dialysis_solution.dialysis_duration_minute?this.list[i].dialysis_solution.dialysis_duration_minute:"" + "分"
               if(this.list[i].dialysis_time == 0){
                this.list[i].dialysis_time = ""
               }
               this.list[i].device_type = this.list[i].assessment_befor_dislysis.machine_type
+
               this.list[i].dialyzer_perfusion_apparatus = this.list[i].dialysis_solution.dialyzer_perfusion_apparatus
-              this.list[i].dialysis_dialyszers = this.list[i].dialysis_solution.dialysis_dialyszers
-              this.list[i].dialysis_irrigation = this.list[i].dialysis_solution.dialysis_irrigation
-              this.list[i].displace_liqui_part = this.getDisplaceLiquiPart(this.list[i].dialysis_solution.displace_liqui_part)
+              if(this.list[i].dialysis_prescription.dialysis_dialyszers == ""){
+                this.list[i].dialysis_dialyszers = this.list[i].dialysis_solution.dialysis_dialyszers
+              }
+              if(this.list[i].dialysis_prescription.dialysis_dialyszers != ""){
+                this.list[i].dialysis_dialyszers = this.list[i].dialysis_prescription.dialysis_dialyszers
+              }
+
+              if(this.list[i].dialysis_prescription.dialysis_irrigation == ""){
+                this.list[i].dialysis_irrigation = this.list[i].dialysis_solution.dialysis_irrigation
+              }
+              if(this.list[i].dialysis_prescription.dialysis_irrigation != ""){
+                this.list[i].dialysis_irrigation = this.list[i].dialysis_prescription.dialysis_irrigation
+              }
+             
+              if(this.list[i].dialysis_prescription.displace_liqui_part==""){
+                this.list[i].displace_liqui_part = this.getDisplaceLiquiPart(this.list[i].dialysis_solution.displace_liqui_part)
+              }
+
+              if(this.list[i].dialysis_prescription.displace_liqui_part!=""){
+                this.list[i].displace_liqui_part = this.getDisplaceLiquiPart(this.list[i].dialysis_prescription.displace_liqui_part)
+              }
+            
+           
               this.list[i].displace_liqui_value = this.list[i].dialysis_solution.displace_liqui_value? this.list[i].dialysis_solution.displace_liqui_value:""
               this.list[i].kalium = this.list[i].dialysis_solution.kalium?this.list[i].dialysis_solution.kalium:""
               this.list[i].sodium = this.list[i].dialysis_solution.sodium?this.list[i].dialysis_solution.sodium:""