Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -826,34 +826,33 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	}
 
 	assessmentAfterDislysis := models.AssessmentAfterDislysis{
-		UserOrgId:              adminUserInfo.Org.Id,
-		PatientId:              id,
-		AssessmentDate:         recordDate.Unix(),
-		Temperature:            temperature,
-		PulseFrequency:         pulse_frequency,
-		BreathingRate:          breathing_rate,
-		SystolicBloodPressure:  systolic_blood_pressure,
-		DiastolicBloodPressure: diastolic_blood_pressure,
-		ActualUltrafiltration:  actual_ultrafiltration,
-		ActualDisplacement:     actual_displacement,
-		ActualTreatmentHour:    actualtreatHour,
-		ActualTreatmentMinute:  actualtreatmin,
-		WeightAfter:            weightAfter,
-		AdditionalWeight:       additionalWeight,
-		WeightLoss:             weightReduce,
-		Cruor:                  cruor,
-		SymptomAfterDialysis:   symptomsAfterDialysi,
-		InternalFistula:        internalFistula,
-		Catheter:               catheter,
-		Complication:           complications,
-		DialysisIntakes:        dialysateVolume,
-		CreatedTime:            time.Now().Unix(),
-		Status:                 1,
-		Remark:                 remark,
-		BloodAccessPartId:      blood_access_part_id,
-		BloodAccessPartOperaId: blood_access_part_opera_id,
-		DialysisIntakesUnit:    dialysis_intakes_unit,
-
+		UserOrgId:                    adminUserInfo.Org.Id,
+		PatientId:                    id,
+		AssessmentDate:               recordDate.Unix(),
+		Temperature:                  temperature,
+		PulseFrequency:               pulse_frequency,
+		BreathingRate:                breathing_rate,
+		SystolicBloodPressure:        systolic_blood_pressure,
+		DiastolicBloodPressure:       diastolic_blood_pressure,
+		ActualUltrafiltration:        actual_ultrafiltration,
+		ActualDisplacement:           actual_displacement,
+		ActualTreatmentHour:          actualtreatHour,
+		ActualTreatmentMinute:        actualtreatmin,
+		WeightAfter:                  weightAfter,
+		AdditionalWeight:             additionalWeight,
+		WeightLoss:                   weightReduce,
+		Cruor:                        cruor,
+		SymptomAfterDialysis:         symptomsAfterDialysi,
+		InternalFistula:              internalFistula,
+		Catheter:                     catheter,
+		Complication:                 complications,
+		DialysisIntakes:              dialysateVolume,
+		CreatedTime:                  time.Now().Unix(),
+		Status:                       1,
+		Remark:                       remark,
+		BloodAccessPartId:            blood_access_part_id,
+		BloodAccessPartOperaId:       blood_access_part_opera_id,
+		DialysisIntakesUnit:          dialysis_intakes_unit,
 		PuncturePointOozingBlood:     puncturePointOozingBlood,
 		PuncturePointHaematoma:       puncturePointHaematoma,
 		InternalFistulaTremorAc:      internalFistulaTremorAc,

models/device_models.go

@@ -833,7 +833,7 @@ type XtAssessmentAfterDislysis struct {
 	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat" form:"is_eat"`
 	DialysisIntakesUnit             int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit" form:"dialysis_intakes_unit"`
 	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
-	CvcB                            float64 `gorm:"column:cvc_b" json:"cvc_b" form:"cvc_b"`
+	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 }
 

models/dialysis.go

@@ -546,7 +546,7 @@ type AssessmentAfterDislysis struct {
 	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat"`
 	DialysisIntakesUnit             int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit"`
 	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
-	CvcB                            float64 `gorm:"column:cvc_b" json:"cvc_b" form:"cvc_b"`
+	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -319,7 +319,7 @@ type AssessmentAfterDislysisVM struct {
 	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat"`
 	DialysisIntakesUnit             int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit"`
 	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
-	CvcB                            float64 `gorm:"column:cvc_b" json:"cvc_b" form:"cvc_b"`
+	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 }
 
@@ -385,7 +385,7 @@ type XtAssessmentAfterDislysisVM struct {
 	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat"`
 	DialysisIntakesUnit             int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit"`
 	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
-	CvcB                            float64 `gorm:"column:cvc_b" json:"cvc_b" form:"cvc_b"`
+	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 }