2 Commits 820bb40c97 ... d515ad61bf

Author SHA1 Message Date
  28169 d515ad61bf Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch 2 days ago
  28169 61880463ca hah阿凡达 2 days ago

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

2662
         if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
2662
         if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
2663
           if(this.predialysis!=undefined){
2663
           if(this.predialysis!=undefined){
2664
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2664
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2665
-              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
2665
+              this.dialysisPrescription.target_ultrafiltration = ((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(0))*1000
2666
               if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
2666
               if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
2667
                  this.dialysisPrescription.target_ultrafiltration = 0
2667
                  this.dialysisPrescription.target_ultrafiltration = 0
2668
              }
2668
              }
3279
          if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
3279
          if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
3280
           if(this.predialysis!=undefined){
3280
           if(this.predialysis!=undefined){
3281
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
3281
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
3282
-              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
3282
+              this.dialysisPrescription.target_ultrafiltration = ((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(0))*1000
3283
+              
3283
               if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
3284
               if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
3284
                  this.dialysisPrescription.target_ultrafiltration = 0
3285
                  this.dialysisPrescription.target_ultrafiltration = 0
3285
              }
3286
              }

+ 2 - 2
src/xt_pages/user/components/PatientSidebar_ord.vue View File

433
         fetchAllList().then(response => {
433
         fetchAllList().then(response => {
434
           if (response.data.state == 1) {
434
           if (response.data.state == 1) {
435
             if(this.org_id ==10191){
435
             if(this.org_id ==10191){
436
-               var patients = response.data.data.patients
436
+               var patients = response.data.data.patientsOne
437
               //  console.log("patients",patients)
437
               //  console.log("patients",patients)
438
                for(let i=0;i<patients.length;i++){
438
                for(let i=0;i<patients.length;i++){
439
                  if(patients[i].lapseto ==1){
439
                  if(patients[i].lapseto ==1){
442
   
442
   
443
                }
443
                }
444
             }else{
444
             }else{
445
-              this.patientsList = response.data.data.patients
445
+              this.patientsList = response.data.data.patientsOne
446
               console.log("哈哈哈哈哈哈",this.patientsList)
446
               console.log("哈哈哈哈哈哈",this.patientsList)
447
             }
447
             }
448
   
448
   

+ 1 - 0
src/xt_pages/user/lapsoSummary.vue View File

809
              var record = response.data.data.record
809
              var record = response.data.data.record
810
              this.$message.success("保存成功!")
810
              this.$message.success("保存成功!")
811
              this.dialogVisible = false
811
              this.dialogVisible = false
812
+             this.laspDialogVisible = false
812
              this.remark = ""
813
              this.remark = ""
813
              this.lapse_reason = ""
814
              this.lapse_reason = ""
814
              this.getlist()
815
              this.getlist()