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

controllers/dialysis_record_api_controller.go

@@ -533,6 +533,7 @@ type EditMonitorParamObject struct {
 	UreaMonitoring              float64 `gorm:"column:urea_monitoring" json:"urea_monitoring" form:"urea_monitoring"`
 	BloodThickness              float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
+	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -652,6 +653,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			UreaMonitoring:              monitorParam.UreaMonitoring,
 			BloodThickness:              monitorParam.BloodThickness,
 			BloodMonitor:                monitorParam.BloodMonitor,
+			HeparinAmount:               monitorParam.HeparinAmount,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
@@ -734,6 +736,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.UreaMonitoring = monitorParam.UreaMonitoring
 		monitor.BloodThickness = monitorParam.BloodThickness
 		monitor.BloodMonitor = monitorParam.BloodMonitor
+		monitor.HeparinAmount = monitorParam.HeparinAmount
 		updateErr := service.UpdateMonitor(monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
 		redis := service.RedisClient()

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -95,6 +95,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	blood_sugar, _ := this.GetFloat("blood_sugar")
 	monitor_anticoagulant, _ := this.GetInt64("monitor_anticoagulant")
 	monitor_anticoagulant_value := this.GetString("monitor_anticoagulant_value")
+	heparin_amount, _ := this.GetFloat("heparin_amount")
 	blood_pressure_monitoring_site, _ := this.GetInt64("blood_pressure_monitoring_site")
 	complication, _ := this.GetInt64("complication")
 	accumulated_blood_volume, _ := this.GetFloat("accumulated_blood_volume")
@@ -165,6 +166,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		UreaMonitoring:              urea_monitoring,
 		BloodThickness:              blood_thickness,
 		BloodMonitor:                blood_monitor,
+		HeparinAmount:               heparin_amount,
 	}
 
 	err := service.CreateMonitor(&record)

models/dialysis.go

@@ -743,6 +743,7 @@ type MonitoringRecord struct {
 	UreaMonitoring              float64 `gorm:"column:urea_monitoring" json:"urea_monitoring" form:"urea_monitoring"`
 	BloodThickness              float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
+	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
 }
 
 func (MonitoringRecord) TableName() string {