修改静脉压单位

controllers/dialysis_api_controller.go

@@ -3945,13 +3945,14 @@ func (c *DialysisApiController) CreateMonitor() {
 	blood_pressure_type, _ := c.GetInt64("blood_pressure_type", 0)
 	blood_flow_volume, _ := c.GetFloat("blood_flow_volume", 0)
 	venous_pressure, _ := c.GetFloat("venous_pressure", 0)
-	venous_pressure_unit := c.GetString("venous_pressure_unit")
+	venous_pressure_type,_ := c.GetInt64("venous_pressure_type",1)
 	transmembrane_pressure, _ := c.GetFloat("transmembrane_pressure", 0)
-	transmembrane_pressure_unit := c.GetString("transmembrane_pressure_unit")
+	transmembrane_pressure_type,_:= c.GetInt64("transmembrane_pressure_type",1)
 	ultrafiltration_rate, _ := c.GetFloat("ultrafiltration_rate", 0)
 	ultrafiltration_volume, _ := c.GetFloat("ultrafiltration_volume", 0)
 	sodium_concentration, _ := c.GetFloat("sodium_concentration", 0)
 	arterial_pressure, _ := c.GetFloat("arterial_pressure", 0)
+	arterial_pressure_type, _ := c.GetInt64("arterial_pressure_type", 1)
 	dialysate_temperature, _ := c.GetFloat("dialysate_temperature", 0)
 	temperature, _ := c.GetFloat("temperature", 0)
 	replacement_rate, _ := c.GetFloat("replacement_rate", 0)
@@ -3996,13 +3997,14 @@ func (c *DialysisApiController) CreateMonitor() {
 		BloodPressureType:         blood_pressure_type,
 		BloodFlowVolume:           blood_flow_volume,
 		VenousPressure:            venous_pressure,
-		VenousPressureUnit:        venous_pressure_unit,
+		VenousPressureType:        venous_pressure_type,
 		TransmembranePressure:     transmembrane_pressure,
-		TransmembranePressureUnit: transmembrane_pressure_unit,
+		TransmembranePressureType: transmembrane_pressure_type,
 		UltrafiltrationRate:       ultrafiltration_rate,
 		UltrafiltrationVolume:     ultrafiltration_volume,
 		SodiumConcentration:       sodium_concentration,
 		ArterialPressure:          arterial_pressure,
+		ArterialPressureType:      arterial_pressure_type,
 		DialysateTemperature:      dialysate_temperature,
 		Temperature:               temperature,
 		ReplacementRate:           replacement_rate,

controllers/dialysis_record_api_controller.go

@@ -375,10 +375,13 @@ type EditMonitorParamObject struct {
 	BreathingRated           float64 `json:"breathing_rated"`
 	BloodFlowVolume          float64 `json:"blood_flow_volume"`
 	VenousPressure           float64 `json:"venous_pressure"`
+	VenousPressureType       int64 `json:"venous_pressure_type"`
 	TransmembranePressure    float64 `json:"transmembrane_pressure"`
+	TransmembranePressureType int64 `json:"transmembrane_pressure_type"`
 	UltrafiltrationVolume    float64 `json:"ultrafiltration_volume"`
 	UltrafiltrationRate      float64 `json:"ultrafiltration_rate"`
 	ArterialPressure         float64 `json:"arterial_pressure"`
+	ArterialPressureType     int64 `json:"arterial_pressure_type"`
 	SodiumConcentration      float64 `json:"sodium_concentration"`
 	DialysateTemperature     float64 `json:"dialysate_temperature"`
 	Temperature              float64 `json:"temperature"`
@@ -475,8 +478,11 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			DiastolicBloodPressure:   monitorParam.DiastolicBP,
 			BloodFlowVolume:          monitorParam.BloodFlowVolume,
 			VenousPressure:           monitorParam.VenousPressure,
+			VenousPressureType:       monitorParam.VenousPressureType,
 			ArterialPressure:         monitorParam.ArterialPressure,
+			ArterialPressureType:     monitorParam.ArterialPressureType,
 			TransmembranePressure:    monitorParam.TransmembranePressure,
+			TransmembranePressureType: monitorParam.TransmembranePressureType,
 			UltrafiltrationRate:      monitorParam.UltrafiltrationRate,
 			UltrafiltrationVolume:    monitorParam.UltrafiltrationVolume,
 			SodiumConcentration:      monitorParam.SodiumConcentration,
@@ -538,8 +544,11 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.DiastolicBloodPressure = monitorParam.DiastolicBP
 		monitor.BloodFlowVolume = monitorParam.BloodFlowVolume
 		monitor.VenousPressure = monitorParam.VenousPressure
+		monitor.VenousPressureType = monitorParam.VenousPressureType
 		monitor.ArterialPressure = monitorParam.ArterialPressure
+		monitor.ArterialPressureType = monitorParam.ArterialPressureType
 		monitor.TransmembranePressure = monitorParam.TransmembranePressure
+		monitor.TransmembranePressureType = monitorParam.TransmembranePressureType
 		monitor.UltrafiltrationRate = monitorParam.UltrafiltrationRate
 		monitor.UltrafiltrationVolume = monitorParam.UltrafiltrationVolume
 		monitor.SodiumConcentration = monitorParam.SodiumConcentration

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -67,10 +67,11 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	BPType, _ := this.GetInt("bp_type")
 	bloodFlowVolume, _ := this.GetFloat("blood_flow_volume")
 	venousPressure, _ := this.GetFloat("venous_pressure")
-	venousPressureUnit := this.GetString("venous_pressure_unit")
+	venousPressureType,_ := this.GetInt64("venous_pressure_type",1)
 	arterialPressure, _ := this.GetFloat("arterial_pressure")
-	transmembranePressure, _ := this.GetFloat("transmembrane_pressure")
-	transmembranePressureUnit := this.GetString("transmembrane_pressure_unit")
+	arterialPressureType, _ := this.GetInt64("arterial_pressure_type",1)
+	transmembranePressure, _ := this.GetFloat("transmembrane_pressure",0)
+	transmembranePressureType,_ := this.GetInt64("transmembrane_pressure_type",1)
 	ultrafiltrationRate, _ := this.GetFloat("ultrafiltration_rate")
 	ultrafiltrationVolume, _ := this.GetFloat("ultrafiltration_volume")
 	sodiumConcentration, _ := this.GetFloat("sodium_concentration")
@@ -114,10 +115,11 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		BloodPressureType:         int64(BPType),
 		BloodFlowVolume:           bloodFlowVolume,
 		VenousPressure:            venousPressure,
-		VenousPressureUnit:        venousPressureUnit,
+		VenousPressureType:        venousPressureType,
 		ArterialPressure:          arterialPressure,
+		ArterialPressureType:      arterialPressureType,
 		TransmembranePressure:     transmembranePressure,
-		TransmembranePressureUnit: transmembranePressureUnit,
+		TransmembranePressureType: transmembranePressureType,
 		UltrafiltrationRate:       ultrafiltrationRate,
 		UltrafiltrationVolume:     ultrafiltrationVolume,
 		SodiumConcentration:       sodiumConcentration,
@@ -209,10 +211,11 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	BPType, _ := this.GetInt("bp_type")
 	bloodFlowVolume, _ := this.GetFloat("blood_flow_volume")
 	venousPressure, _ := this.GetFloat("venous_pressure")
-	venousPressureUnit := this.GetString("venous_pressure_unit")
+	venousPressureType,_ := this.GetInt64("venous_pressure_type",1)
 	arterialPressure, _ := this.GetFloat("arterial_pressure")
+	arterialPressureType, _ := this.GetInt64("arterial_pressure",1)
 	transmembranePressure, _ := this.GetFloat("transmembrane_pressure")
-	transmembranePressureUnit := this.GetString("transmembrane_pressure_unit")
+	transmembranePressureType,_ := this.GetInt64("transmembrane_pressure_type",1)
 	ultrafiltrationRate, _ := this.GetFloat("ultrafiltration_rate")
 	ultrafiltrationVolume, _ := this.GetFloat("ultrafiltration_volume")
 	sodiumConcentration, _ := this.GetFloat("sodium_concentration")
@@ -264,10 +267,11 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.BloodPressureType = int64(BPType)
 	monitor.BloodFlowVolume = bloodFlowVolume
 	monitor.VenousPressure = venousPressure
-	monitor.VenousPressureUnit = venousPressureUnit
+	monitor.VenousPressureType = venousPressureType
 	monitor.ArterialPressure = arterialPressure
+	monitor.ArterialPressureType = arterialPressureType
 	monitor.TransmembranePressure = transmembranePressure
-	monitor.TransmembranePressureUnit = transmembranePressureUnit
+	monitor.TransmembranePressureType = transmembranePressureType
 	monitor.UltrafiltrationRate = ultrafiltrationRate
 	monitor.UltrafiltrationVolume = ultrafiltrationVolume
 	monitor.SodiumConcentration = sodiumConcentration

models/dialysis.go

@@ -634,10 +634,11 @@ type MonitoringRecord struct {
 	Pic                       string  `gorm:"column:pic" json:"pic"`
 	BloodFlowVolume           float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
 	VenousPressure            float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
-	VenousPressureUnit        string  `gorm:"column:venous_pressure_unit" json:"venous_pressure_unit"`
+	VenousPressureType        int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
 	ArterialPressure          float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
+	ArterialPressureType      int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
 	TransmembranePressure     float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
-	TransmembranePressureUnit string  `gorm:"column:transmembrane_pressure_unit" json:"transmembrane_pressure_unit"`
+	TransmembranePressureType int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
 	UltrafiltrationRate       float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
 	UltrafiltrationVolume     float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
 	SodiumConcentration       float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`

数据变更脚本.sql

@@ -84,8 +84,13 @@ INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_nam
 INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '13','4','dialysate_flow','透析液流量','1',NULL,NULL,'0');
 
 
-
-
+--2020-07-15 author 张保健 --
+--透中监测修改静脉压类型字段--
+ALTER TABLE `test_xt`.`xt_monitoring_record`     CHANGE `venous_pressure_unit` `venous_pressure_type` SMALLINT(2) DEFAULT '1' NOT NULL COMMENT '静脉压类型 1：mmHg 2：kpa';
+--透中监测增加动脉压类型字段--
+ALTER TABLE `test_xt`.`xt_monitoring_record`     ADD COLUMN `arterial_pressure_type` SMALLINT(2) DEFAULT '1' NULL COMMENT '动脉压类型：1：mmHg 2：kpa' AFTER `arterial_pressure`
+--透中监测修改跨膜压类型字段--
+ALTER TABLE `test_xt`.`xt_monitoring_record`     CHANGE `venous_pressure_unit` `venous_pressure_type` SMALLINT(2) DEFAULT '1' NOT NULL COMMENT '静脉压类型 1：mmHg 2：kpa';