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

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

         if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
-              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
+              this.dialysisPrescription.target_ultrafiltration = ((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(0))*1000
               if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
                  this.dialysisPrescription.target_ultrafiltration = 0
              }
          if(this.$store.getters.xt_user.template_info.org_id==10727 || this.$store.getters.xt_user.template_info.org_id==10731){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
-              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
+              this.dialysisPrescription.target_ultrafiltration = ((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(0))*1000
+              
               if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
                  this.dialysisPrescription.target_ultrafiltration = 0
              }

src/xt_pages/user/components/PatientSidebar_ord.vue

         fetchAllList().then(response => {
           if (response.data.state == 1) {
             if(this.org_id ==10191){
-               var patients = response.data.data.patients
+               var patients = response.data.data.patientsOne
               //  console.log("patients",patients)
                for(let i=0;i<patients.length;i++){
                  if(patients[i].lapseto ==1){
   
                }
             }else{
-              this.patientsList = response.data.data.patients
+              this.patientsList = response.data.data.patientsOne
               console.log("哈哈哈哈哈哈",this.patientsList)
             }
   

src/xt_pages/user/lapsoSummary.vue

              var record = response.data.data.record
              this.$message.success("保存成功!")
              this.dialogVisible = false
+             this.laspDialogVisible = false
              this.remark = ""
              this.lapse_reason = ""
              this.getlist()