新分支

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

@@ -987,8 +987,16 @@ export default {
       }
     },
     'form.weight_after': function() {
-      if (this) {
+      console.log('体重减少',  this.form.weight_after)
+      this.form.weight_loss = ((this.predialysis_evaluation.weight_before - this.predialysis_evaluation.additional_weight) - (this.form.weight_after - this.form.additional_weight)).toFixed(1)
+    
+      if (this.form.weight_loss < 0) {
+        this.form.weight_loss = ''
+      }
+      if (this.form.weight_after == '') {
+        this.form.weight_loss = ''
       }
+      
     }
   },
   methods: {

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1630,7 +1630,8 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10580 || this.$store.getters.xt_user.org.id == 10585){
+      if(this.$store.getters.xt_user.org.id == 10580){
+        var date = new Date()
         var year = date.getFullYear()
           var month = date.getMonth() + 1
           var day = date.getDate()
@@ -1748,7 +1749,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -1567,7 +1567,9 @@
          console.log("params",ParamsQuery)
          this.$refs.assessmentBeforeDislysis.validate((valid) => {
           if (valid) {
-            ParamsQuery['patient'] = this.patient.id
+        // ParamsQuery['patient'] = parseInt(this.$route.query.patient_id) 
+        ParamsQuery['patient'] = this.patient.id
+        
         ParamsQuery['record_date'] = this.record_date
         ParamsQuery['mode'] = '1'