2024/6/17

controllers/base_api_controller.go

@@ -94,7 +94,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17876 //4
+		adminUserInfo.CurrentAppId = 12039 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -340,7 +340,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17876 //4
+		adminUserInfo.CurrentAppId = 12039 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -2568,13 +2568,13 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 {
 					dewater_amount = dewater_amount * 1000
 				}
 

controllers/dialysis_record_api_controller.go

@@ -540,52 +540,80 @@ type EditMonitorParamObject struct {
 	MonitoringDate int64 `json:"monitoring_date"`
 	OperateTime    int64 `json:"operate_time"`
 	// MonitoringTime        string  `json:"monitoring_time"`
-	SystolicBP                  float64 `json:"systolic_bp"`
-	DiastolicBP                 float64 `json:"diastolic_bp"`
-	PulseFrequency              float64 `json:"pulse_frequency"`
-	BreathingRated              string  `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"`
-	ReplacementRate             float64 `json:"replacement_rate"`
-	DisplacementQuantity        float64 `json:"displacement_quantity"`
-	KTV                         float64 `json:"ktv"`
-	Symptom                     string  `json:"symptom"`
-	Dispose                     string  `json:"dispose"`
-	Result                      string  `json:"result"`
-	Conductivity                float64 `json:"conductivity"`
-	DisplacementFlowQuantity    float64 `json:"displacement_flow_quantity"`
-	BloodOxygenSaturation       string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Heparin                     float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
-	DialysateFlow               float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	Urr                         string  `gorm:"column:urr" json:"urr" form:"urr"`
-	BloodSugar                  float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
-	MonitorAnticoagulant        int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
-	MonitorAnticoagulantValue   string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
-	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
-	Complication                int64   `gorm:"column:complication" json:"complication" form:"complication"`
-	AccumulatedBloodVolume      float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
-	BloodTemperature            float64 `gorm:"column:blood_temperature" json:"blood_temperature" form:"blood_temperature"`
-	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"`
-	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
-	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
-	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
-	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
-	IsPressure                  string  `gorm:"column:is_pressure" json:"is_pressure" form:"is_pressure"`
-	UltrafiltrationRateOne      string  `gorm:"column:ultrafiltration_rate_one" json:"ultrafiltration_rate_one" form:"ultrafiltration_rate_one"`
-	HeparinOne                  string  `gorm:"column:heparin_one" json:"heparin_one" form:"heparin_one"`
+	SystolicBP                       float64 `json:"systolic_bp"`
+	DiastolicBP                      float64 `json:"diastolic_bp"`
+	PulseFrequency                   float64 `json:"pulse_frequency"`
+	BreathingRated                   string  `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"`
+	ReplacementRate                  float64 `json:"replacement_rate"`
+	DisplacementQuantity             float64 `json:"displacement_quantity"`
+	KTV                              float64 `json:"ktv"`
+	Symptom                          string  `json:"symptom"`
+	Dispose                          string  `json:"dispose"`
+	Result                           string  `json:"result"`
+	Conductivity                     float64 `json:"conductivity"`
+	DisplacementFlowQuantity         float64 `json:"displacement_flow_quantity"`
+	BloodOxygenSaturation            string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Heparin                          float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow                    float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Urr                              string  `gorm:"column:urr" json:"urr" form:"urr"`
+	BloodSugar                       float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
+	MonitorAnticoagulant             int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
+	MonitorAnticoagulantValue        string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	BloodPressureMonitoringSite      int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
+	Complication                     int64   `gorm:"column:complication" json:"complication" form:"complication"`
+	AccumulatedBloodVolume           float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
+	BloodTemperature                 float64 `gorm:"column:blood_temperature" json:"blood_temperature" form:"blood_temperature"`
+	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"`
+	Dehydration                      float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
+	FilterPressure                   string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
+	ReplacementSpeed                 float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
+	Dicarbonate                      float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
+	IsPressure                       string  `gorm:"column:is_pressure" json:"is_pressure" form:"is_pressure"`
+	UltrafiltrationRateOne           string  `gorm:"column:ultrafiltration_rate_one" json:"ultrafiltration_rate_one" form:"ultrafiltration_rate_one"`
+	HeparinOne                       string  `gorm:"column:heparin_one" json:"heparin_one" form:"heparin_one"`
+	MonitorSystolicBloodPressureOne  string  `gorm:"column:monitor_systolic_blood_pressure_one" json:"monitor_systolic_blood_pressure_one" form:"monitor_systolic_blood_pressure_one"`
+	MonitorDiastolicBloodPressureOne string  `gorm:"column:monitor_diastolic_blood_pressure_one" json:"monitor_diastolic_blood_pressure_one" form:"monitor_diastolic_blood_pressure_one"`
+	MonitorPulseFrequencyOne         string  `gorm:"column:monitor_pulse_frequency_one" json:"monitor_pulse_frequency_one" form:"monitor_pulse_frequency_one"`
+	BloodFlowVolumeOne               string  `gorm:"column:blood_flow_volume_one" json:"blood_flow_volume_one" form:"blood_flow_volume_one"`
+	VenousPressureOne                string  `gorm:"column:venous_pressure_one" json:"venous_pressure_one" form:"venous_pressure_one"`
+	ArterialPressureOne              string  `gorm:"column:arterial_pressure_one" json:"arterial_pressure_one" form:"arterial_pressure_one"`
+	TransmembranePressureOne         string  `gorm:"column:transmembrane_pressure_one" json:"transmembrane_pressure_one" form:"transmembrane_pressure_one"`
+	UltrafiltrationVolumeOne         string  `gorm:"column:ultrafiltration_volume_one" json:"ultrafiltration_volume_one" form:"ultrafiltration_volume_one"`
+	SodiumConcentrationOne           string  `gorm:"column:sodium_concentration_one" json:"sodium_concentration_one" form:"sodium_concentration_one"`
+	DialysateTemperatureOne          string  `gorm:"column:dialysate_temperature_one" json:"dialysate_temperature_one" form:"dialysate_temperature_one"`
+	ReplacementRateOne               string  `gorm:"column:replacement_rate_one" json:"replacement_rate_one" form:"replacement_rate_one"`
+	DisplacementQuantityOne          string  `gorm:"column:displacement_quantity_one" json:"displacement_quantity_one" form:"displacement_quantity_one"`
+	KtvOne                           string  `gorm:"column:ktv_one" json:"ktv_one" form:"ktv_one"`
+	UrrOne                           string  `gorm:"column:urr_one" json:"urr_one" form:"urr_one"`
+	ConductivityOne                  string  `gorm:"column:conductivity_one" json:"conductivity_one" form:"conductivity_one"`
+	DisplacementFlowQuantityOne      string  `gorm:"column:displacement_flow_quantity_one" json:"displacement_flow_quantity_one" form:"displacement_flow_quantity_one"`
+	BloodOxygenSaturationOne         string  `gorm:"column:blood_oxygen_saturation_one" json:"blood_oxygen_saturation_one" form:"blood_oxygen_saturation_one"`
+	DialysateFlowOne                 string  `gorm:"column:dialysate_flow_one" json:"dialysate_flow_one" form:"dialysate_flow_one"`
+	BloodSugarOne                    string  `gorm:"column:blood_sugar_one" json:"blood_sugar_one" form:"blood_sugar_one"`
+	MonitorTemperatureOne            string  `gorm:"column:monitor_temperature_one" json:"monitor_temperature_one" form:"monitor_temperature_one"`
+	PulseFrequencyOne                string  `gorm:"column:pulse_frequency_one" json:"pulse_frequency_one" form:"pulse_frequency_one"`
+	BloodTemperatureOne              string  `gorm:"column:blood_temperature_one" json:"blood_temperature_one" form:"blood_temperature_one"`
+	UreaMonitoringOne                string  `gorm:"column:urea_monitoring_one" json:"urea_monitoring_one" form:"urea_monitoring_one"`
+	BloodThicknessOne                string  `gorm:"column:blood_thickness_one" json:"blood_thickness_one" form:"blood_thickness_one"`
+	BloodMonitorOne                  string  `gorm:"column:blood_monitor_one" json:"blood_monitor_one" form:"blood_monitor_one"`
+	ReplacementSpeedOne              string  `gorm:"column:replacement_speed_one" json:"replacement_speed_one" form:"replacement_speed_one"`
+	DicarbonateOne                   string  `gorm:"column:dicarbonate_one" json:"dicarbonate_one" form:"dicarbonate_one"`
+	AccumulatedBloodVolumeOne        string  `gorm:"column:accumulated_blood_volume_one" json:"accumulated_blood_volume_one" form:"accumulated_blood_volume_one"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -686,57 +714,85 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			MonitoringDate:  monitorParam.MonitoringDate,
 			OperateTime:     monitorParam.OperateTime,
 			// MonitoringTime:         monitorParam.MonitoringTime,
-			PulseFrequency:              monitorParam.PulseFrequency,
-			BreathingRate:               monitorParam.BreathingRated,
-			SystolicBloodPressure:       monitorParam.SystolicBP,
-			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,
-			DialysateTemperature:        monitorParam.DialysateTemperature,
-			Temperature:                 monitorParam.Temperature,
-			ReplacementRate:             monitorParam.ReplacementRate,
-			DisplacementQuantity:        monitorParam.DisplacementQuantity,
-			Ktv:                         monitorParam.KTV,
-			Symptom:                     monitorParam.Symptom,
-			Dispose:                     monitorParam.Dispose,
-			Result:                      monitorParam.Result,
-			MonitoringNurse:             adminUserInfo.AdminUser.Id,
-			Conductivity:                monitorParam.Conductivity,
-			DisplacementFlowQuantity:    monitorParam.DisplacementFlowQuantity,
-			Status:                      1,
-			CreatedTime:                 time.Now().Unix(),
-			UpdatedTime:                 time.Now().Unix(),
-			BloodOxygenSaturation:       monitorParam.BloodOxygenSaturation,
-			Creator:                     adminUserInfo.AdminUser.Id,
-			Heparin:                     monitorParam.Heparin,
-			DialysateFlow:               monitorParam.DialysateFlow,
-			Urr:                         monitorParam.Urr,
-			BloodSugar:                  monitorParam.BloodSugar,
-			MonitorAnticoagulant:        monitorParam.MonitorAnticoagulant,
-			MonitorAnticoagulantValue:   monitorParam.MonitorAnticoagulantValue,
-			BloodPressureMonitoringSite: monitorParam.BloodPressureMonitoringSite,
-			Complication:                monitorParam.Complication,
-			AccumulatedBloodVolume:      monitorParam.AccumulatedBloodVolume,
-			BloodTemperature:            monitorParam.BloodTemperature,
-			UreaMonitoring:              monitorParam.UreaMonitoring,
-			BloodThickness:              monitorParam.BloodThickness,
-			BloodMonitor:                monitorParam.BloodMonitor,
-			HeparinAmount:               monitorParam.HeparinAmount,
-			Dehydration:                 monitorParam.Dehydration,
-			FilterPressure:              monitorParam.FilterPressure,
-			ReplacementSpeed:            monitorParam.ReplacementSpeed,
-			Dicarbonate:                 monitorParam.Dicarbonate,
-			IsPressure:                  monitorParam.IsPressure,
-			UltrafiltrationRateOne:      monitorParam.UltrafiltrationRateOne,
-			HeparinOne:                  monitorParam.HeparinOne,
+			PulseFrequency:                   monitorParam.PulseFrequency,
+			BreathingRate:                    monitorParam.BreathingRated,
+			SystolicBloodPressure:            monitorParam.SystolicBP,
+			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,
+			DialysateTemperature:             monitorParam.DialysateTemperature,
+			Temperature:                      monitorParam.Temperature,
+			ReplacementRate:                  monitorParam.ReplacementRate,
+			DisplacementQuantity:             monitorParam.DisplacementQuantity,
+			Ktv:                              monitorParam.KTV,
+			Symptom:                          monitorParam.Symptom,
+			Dispose:                          monitorParam.Dispose,
+			Result:                           monitorParam.Result,
+			MonitoringNurse:                  adminUserInfo.AdminUser.Id,
+			Conductivity:                     monitorParam.Conductivity,
+			DisplacementFlowQuantity:         monitorParam.DisplacementFlowQuantity,
+			Status:                           1,
+			CreatedTime:                      time.Now().Unix(),
+			UpdatedTime:                      time.Now().Unix(),
+			BloodOxygenSaturation:            monitorParam.BloodOxygenSaturation,
+			Creator:                          adminUserInfo.AdminUser.Id,
+			Heparin:                          monitorParam.Heparin,
+			DialysateFlow:                    monitorParam.DialysateFlow,
+			Urr:                              monitorParam.Urr,
+			BloodSugar:                       monitorParam.BloodSugar,
+			MonitorAnticoagulant:             monitorParam.MonitorAnticoagulant,
+			MonitorAnticoagulantValue:        monitorParam.MonitorAnticoagulantValue,
+			BloodPressureMonitoringSite:      monitorParam.BloodPressureMonitoringSite,
+			Complication:                     monitorParam.Complication,
+			AccumulatedBloodVolume:           monitorParam.AccumulatedBloodVolume,
+			BloodTemperature:                 monitorParam.BloodTemperature,
+			UreaMonitoring:                   monitorParam.UreaMonitoring,
+			BloodThickness:                   monitorParam.BloodThickness,
+			BloodMonitor:                     monitorParam.BloodMonitor,
+			HeparinAmount:                    monitorParam.HeparinAmount,
+			Dehydration:                      monitorParam.Dehydration,
+			FilterPressure:                   monitorParam.FilterPressure,
+			ReplacementSpeed:                 monitorParam.ReplacementSpeed,
+			Dicarbonate:                      monitorParam.Dicarbonate,
+			IsPressure:                       monitorParam.IsPressure,
+			UltrafiltrationRateOne:           monitorParam.UltrafiltrationRateOne,
+			HeparinOne:                       monitorParam.HeparinOne,
+			MonitorSystolicBloodPressureOne:  monitorParam.MonitorSystolicBloodPressureOne,
+			MonitorDiastolicBloodPressureOne: monitorParam.MonitorDiastolicBloodPressureOne,
+			MonitorPulseFrequencyOne:         monitorParam.MonitorPulseFrequencyOne,
+			BloodFlowVolumeOne:               monitorParam.BloodFlowVolumeOne,
+			VenousPressureOne:                monitorParam.VenousPressureOne,
+			ArterialPressureOne:              monitorParam.ArterialPressureOne,
+			TransmembranePressureOne:         monitorParam.TransmembranePressureOne,
+			UltrafiltrationVolumeOne:         monitorParam.UltrafiltrationVolumeOne,
+			SodiumConcentrationOne:           monitorParam.SodiumConcentrationOne,
+			DialysateTemperatureOne:          monitorParam.DialysateTemperatureOne,
+			ReplacementRateOne:               monitorParam.ReplacementRateOne,
+			DisplacementQuantityOne:          monitorParam.DisplacementQuantityOne,
+			KtvOne:                           monitorParam.KtvOne,
+			UrrOne:                           monitorParam.UrrOne,
+			ConductivityOne:                  monitorParam.ConductivityOne,
+			DisplacementFlowQuantityOne:      monitorParam.DisplacementFlowQuantityOne,
+			BloodOxygenSaturationOne:         monitorParam.BloodOxygenSaturationOne,
+			DialysateFlowOne:                 monitorParam.DialysateFlowOne,
+			BloodSugarOne:                    monitorParam.BloodSugarOne,
+			MonitorTemperatureOne:            monitorParam.MonitorTemperatureOne,
+			PulseFrequencyOne:                monitorParam.PulseFrequencyOne,
+			BloodTemperatureOne:              monitorParam.BloodTemperatureOne,
+			UreaMonitoringOne:                monitorParam.UreaMonitoringOne,
+			BloodThicknessOne:                monitorParam.BloodThicknessOne,
+			BloodMonitorOne:                  monitorParam.BloodMonitorOne,
+			ReplacementSpeedOne:              monitorParam.ReplacementSpeedOne,
+			DicarbonateOne:                   monitorParam.DicarbonateOne,
+			AccumulatedBloodVolumeOne:        monitorParam.AccumulatedBloodVolumeOne,
 		}
 		createErr := service.CreateMonitor(&monitor)
 
@@ -859,6 +915,35 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.IsPressure = monitorParam.IsPressure
 		monitor.UltrafiltrationRateOne = monitorParam.UltrafiltrationRateOne
 		monitor.HeparinOne = monitorParam.HeparinOne
+		monitor.MonitorSystolicBloodPressureOne = monitorParam.MonitorSystolicBloodPressureOne
+		monitor.MonitorDiastolicBloodPressureOne = monitorParam.MonitorDiastolicBloodPressureOne
+		monitor.MonitorPulseFrequencyOne = monitorParam.MonitorPulseFrequencyOne
+		monitor.BloodFlowVolumeOne = monitorParam.BloodFlowVolumeOne
+		monitor.VenousPressureOne = monitorParam.VenousPressureOne
+		monitor.ArterialPressureOne = monitorParam.ArterialPressureOne
+		monitor.TransmembranePressureOne = monitorParam.TransmembranePressureOne
+		monitor.UltrafiltrationVolumeOne = monitorParam.UltrafiltrationVolumeOne
+		monitor.SodiumConcentrationOne = monitorParam.SodiumConcentrationOne
+		monitor.DialysateTemperatureOne = monitorParam.DialysateTemperatureOne
+		monitor.ReplacementRateOne = monitorParam.ReplacementRateOne
+		monitor.DisplacementQuantityOne = monitorParam.DisplacementQuantityOne
+		monitor.KtvOne = monitorParam.KtvOne
+		monitor.UrrOne = monitorParam.UrrOne
+		monitor.ConductivityOne = monitorParam.ConductivityOne
+		monitor.DisplacementFlowQuantityOne = monitorParam.DisplacementFlowQuantityOne
+		monitor.BloodOxygenSaturationOne = monitorParam.BloodOxygenSaturationOne
+		monitor.DialysateFlowOne = monitorParam.DialysateFlowOne
+		monitor.BloodSugarOne = monitorParam.BloodSugarOne
+		monitor.MonitorTemperatureOne = monitorParam.MonitorTemperatureOne
+		monitor.PulseFrequencyOne = monitorParam.PulseFrequencyOne
+		monitor.BloodTemperatureOne = monitorParam.BloodTemperatureOne
+		monitor.UreaMonitoringOne = monitorParam.UreaMonitoringOne
+		monitor.BloodThicknessOne = monitorParam.BloodThicknessOne
+		monitor.BloodMonitorOne = monitorParam.BloodMonitorOne
+		monitor.ReplacementSpeedOne = monitorParam.ReplacementSpeedOne
+		monitor.DicarbonateOne = monitorParam.DicarbonateOne
+		monitor.AccumulatedBloodVolumeOne = monitorParam.AccumulatedBloodVolumeOne
+
 		updateErr := service.UpdateMonitor(monitor)
 		//记录日志
 		byterequest, _ := json.Marshal(monitor)
@@ -1595,7 +1680,12 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		if adminUserInfo.CurrentOrgId == 10101 {
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
 		} else {
-			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
+			if adminUserInfo.CurrentOrgId == 10693 {
+				tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
+			} else {
+				tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
+			}
+
 		}
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 
@@ -1609,6 +1699,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		}
+
 	}
 
 	if adminUserInfo.CurrentOrgId == 9583 {

controllers/gobal_config_api_controller.go

@@ -128,6 +128,12 @@ func GobalConfigRegistRouters() {
 
 	beego.Router("/api/checkremind/config/commit", &GobalConfigApiController{}, "post:PostCheckRemindConfig")
 	beego.Router("/api/checkremind/config/get", &GobalConfigApiController{}, "get:GetCheckRemindConfig")
+
+	beego.Router("/api/changeselfprescriptionopen", &GobalConfigApiController{}, "Get:ChangeSelfPrescriptionOpen")
+
+	beego.Router("/api/changeselfprescriptionoutopen", &GobalConfigApiController{}, "Get:ChangeSelfPrescriptionOutOpen")
+
+	beego.Router("/api/getselfprintlist", &GobalConfigApiController{}, "Get:GetSelfPrintList")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -2691,3 +2697,75 @@ func (this *GobalConfigApiController) ChangeGoodOutOpen() {
 		"msg": 1,
 	})
 }
+
+func (this *GobalConfigApiController) ChangeSelfPrescriptionOpen() {
+
+	is_open, _ := this.GetInt64("is_open")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	selfPrescriptionOpen, _ := service.GeteSelfPrescriptionOpen(orgId)
+
+	config := models.XtSelfDrugInfoConfig{
+		ID:        selfPrescriptionOpen.ID,
+		UserOrgId: orgId,
+		Status:    1,
+		IsOpen:    is_open,
+	}
+
+	if selfPrescriptionOpen.ID == 0 {
+		service.CreaterSelfConfig(config)
+	}
+
+	if selfPrescriptionOpen.ID > 0 {
+		service.SaveSelfConfig(config)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"selfPrescriptionOpen": selfPrescriptionOpen,
+	})
+}
+
+func (this *GobalConfigApiController) ChangeSelfPrescriptionOutOpen() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	is_open, _ := this.GetInt64("is_open")
+
+	selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(orgId)
+
+	config := models.XtSelfDrugOutConfig{
+		ID:        selfPrescriptionOutOpen.ID,
+		UserOrgId: orgId,
+		IsOpen:    is_open,
+		Status:    1,
+	}
+
+	if config.ID == 0 {
+
+		service.CreateSelfDrugOutConfig(config)
+	}
+
+	if config.ID > 0 {
+
+		service.UpdateSelfDrugOutConfig(config)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"selfPrescriptionOutOpen": selfPrescriptionOutOpen,
+	})
+}
+
+func (this *GobalConfigApiController) GetSelfPrintList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	selfPrescriptionOpen, _ := service.GeteSelfPrescriptionOpen(orgId)
+
+	selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"selfPrescriptionOpen":    selfPrescriptionOpen,
+		"selfPrescriptionOutOpen": selfPrescriptionOutOpen,
+	})
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3570,6 +3570,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
+			fmt.Println("oooooooooooooooooooooooooooooo", adminUserInfo.Org.Id)
+			if adminUserInfo.Org.Id == 10702 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
 
 		}
 	}

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -113,6 +113,35 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	is_pressure := this.GetString("is_pressure")
 	heparin_one := this.GetString("heparin_one")
 	ultrafiltration_rate_one := this.GetString("ultrafiltration_rate_one")
+
+	monitor_diastolic_blood_pressure_one := this.GetString("monitor_diastolic_blood_pressure_one")
+	monitor_systolic_blood_pressure_one := this.GetString("monitor_systolic_blood_pressure_one")
+	monitor_pulse_frequency_one := this.GetString("monitor_pulse_frequency_one")
+	blood_flow_volume_one := this.GetString("blood_flow_volume_one")
+	venous_pressure_one := this.GetString("venous_pressure_one")
+	arterial_pressure_one := this.GetString("arterial_pressure_one")
+	transmembrane_pressure_one := this.GetString("transmembrane_pressure_one")
+	ultrafiltration_volume_one := this.GetString("ultrafiltration_volume_one")
+	sodium_concentration_one := this.GetString("sodium_concentration_one")
+	dialysate_temperature_one := this.GetString("dialysate_temperature_one")
+	replacement_rate_one := this.GetString("replacement_rate_one")
+	displacement_quantity_one := this.GetString("displacement_quantity_one")
+	ktv_one := this.GetString("ktv_one")
+	urr_one := this.GetString("urr_one")
+	conductivity_one := this.GetString("conductivity_one")
+	displacement_flow_quantity_one := this.GetString("displacement_flow_quantity_one")
+	blood_oxygen_saturation_one := this.GetString("blood_oxygen_saturation_one")
+	dialysate_flow_one := this.GetString("dialysate_flow_one")
+	blood_sugar_one := this.GetString("blood_sugar_one")
+	monitor_temperature_one := this.GetString("monitor_temperature_one")
+	pulse_frequency_one := this.GetString("pulse_frequency_one")
+	blood_temperature_one := this.GetString("blood_temperature_one")
+	urea_monitoring_one := this.GetString("urea_monitoring_one")
+	blood_thickness_one := this.GetString("blood_thickness_one")
+	blood_monitor_one := this.GetString("blood_monitor_one")
+	replacement_speed_one := this.GetString("replacement_speed_one")
+	dicarbonate_one := this.GetString("dicarbonate_one")
+	accumulated_blood_volume_one := this.GetString("accumulated_blood_volume_one")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
@@ -155,59 +184,87 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		MonitoringDate:  date,
 		OperateTime:     operateTime,
 		// MonitoringTime:            recordTime,
-		PulseFrequency:              pulseFrequency,
-		BreathingRate:               breathingRated,
-		SystolicBloodPressure:       systolicBP,
-		DiastolicBloodPressure:      diastolicBP,
-		BloodPressureType:           int64(BPType),
-		BloodFlowVolume:             bloodFlowVolume,
-		VenousPressure:              venousPressure,
-		VenousPressureType:          venousPressureType,
-		ArterialPressure:            arterialPressure,
-		ArterialPressureType:        arterialPressureType,
-		TransmembranePressure:       transmembranePressure,
-		TransmembranePressureType:   transmembranePressureType,
-		UltrafiltrationRate:         ultrafiltrationRate,
-		UltrafiltrationVolume:       ultrafiltrationVolume,
-		SodiumConcentration:         sodiumConcentration,
-		DialysateTemperature:        dialysateTemperature,
-		Temperature:                 temperature,
-		ReplacementRate:             replacementRate,
-		DisplacementQuantity:        displacementQuantity,
-		Ktv:                         ktv,
-		Symptom:                     symptom,
-		Dispose:                     dispose,
-		Result:                      result,
-		MonitoringNurse:             monitoringNurse,
-		Status:                      1,
-		CreatedTime:                 time.Now().Unix(),
-		UpdatedTime:                 time.Now().Unix(),
-		Conductivity:                conductivity,
-		DisplacementFlowQuantity:    displacement_flow_quantity,
-		BloodOxygenSaturation:       blood_oxygen_saturation,
-		Creator:                     adminInfo.AdminUser.Id,
-		Modify:                      0,
-		Heparin:                     heparin,
-		DialysateFlow:               dialysate_flow,
-		Urr:                         urr,
-		BloodSugar:                  blood_sugar,
-		MonitorAnticoagulant:        monitor_anticoagulant,
-		MonitorAnticoagulantValue:   monitor_anticoagulant_value,
-		BloodPressureMonitoringSite: blood_pressure_monitoring_site,
-		Complication:                complication,
-		AccumulatedBloodVolume:      accumulated_blood_volume,
-		BloodTemperature:            blood_temperature,
-		UreaMonitoring:              urea_monitoring,
-		BloodThickness:              blood_thickness,
-		BloodMonitor:                blood_monitor,
-		HeparinAmount:               heparin_amount,
-		Dehydration:                 dehydration,
-		FilterPressure:              filter_pressure,
-		Dicarbonate:                 dicarbonate,
-		ReplacementSpeed:            replacement_speed,
-		IsPressure:                  is_pressure,
-		HeparinOne:                  heparin_one,
-		UltrafiltrationRateOne:      ultrafiltration_rate_one,
+		PulseFrequency:                   pulseFrequency,
+		BreathingRate:                    breathingRated,
+		SystolicBloodPressure:            systolicBP,
+		DiastolicBloodPressure:           diastolicBP,
+		BloodPressureType:                int64(BPType),
+		BloodFlowVolume:                  bloodFlowVolume,
+		VenousPressure:                   venousPressure,
+		VenousPressureType:               venousPressureType,
+		ArterialPressure:                 arterialPressure,
+		ArterialPressureType:             arterialPressureType,
+		TransmembranePressure:            transmembranePressure,
+		TransmembranePressureType:        transmembranePressureType,
+		UltrafiltrationRate:              ultrafiltrationRate,
+		UltrafiltrationVolume:            ultrafiltrationVolume,
+		SodiumConcentration:              sodiumConcentration,
+		DialysateTemperature:             dialysateTemperature,
+		Temperature:                      temperature,
+		ReplacementRate:                  replacementRate,
+		DisplacementQuantity:             displacementQuantity,
+		Ktv:                              ktv,
+		Symptom:                          symptom,
+		Dispose:                          dispose,
+		Result:                           result,
+		MonitoringNurse:                  monitoringNurse,
+		Status:                           1,
+		CreatedTime:                      time.Now().Unix(),
+		UpdatedTime:                      time.Now().Unix(),
+		Conductivity:                     conductivity,
+		DisplacementFlowQuantity:         displacement_flow_quantity,
+		BloodOxygenSaturation:            blood_oxygen_saturation,
+		Creator:                          adminInfo.AdminUser.Id,
+		Modify:                           0,
+		Heparin:                          heparin,
+		DialysateFlow:                    dialysate_flow,
+		Urr:                              urr,
+		BloodSugar:                       blood_sugar,
+		MonitorAnticoagulant:             monitor_anticoagulant,
+		MonitorAnticoagulantValue:        monitor_anticoagulant_value,
+		BloodPressureMonitoringSite:      blood_pressure_monitoring_site,
+		Complication:                     complication,
+		AccumulatedBloodVolume:           accumulated_blood_volume,
+		BloodTemperature:                 blood_temperature,
+		UreaMonitoring:                   urea_monitoring,
+		BloodThickness:                   blood_thickness,
+		BloodMonitor:                     blood_monitor,
+		HeparinAmount:                    heparin_amount,
+		Dehydration:                      dehydration,
+		FilterPressure:                   filter_pressure,
+		Dicarbonate:                      dicarbonate,
+		ReplacementSpeed:                 replacement_speed,
+		IsPressure:                       is_pressure,
+		HeparinOne:                       heparin_one,
+		UltrafiltrationRateOne:           ultrafiltration_rate_one,
+		MonitorDiastolicBloodPressureOne: monitor_diastolic_blood_pressure_one,
+		MonitorSystolicBloodPressureOne:  monitor_systolic_blood_pressure_one,
+		MonitorPulseFrequencyOne:         monitor_pulse_frequency_one,
+		BloodFlowVolumeOne:               blood_flow_volume_one,
+		VenousPressureOne:                venous_pressure_one,
+		ArterialPressureOne:              arterial_pressure_one,
+		TransmembranePressureOne:         transmembrane_pressure_one,
+		UltrafiltrationVolumeOne:         ultrafiltration_volume_one,
+		SodiumConcentrationOne:           sodium_concentration_one,
+		DialysateTemperatureOne:          dialysate_temperature_one,
+		ReplacementRateOne:               replacement_rate_one,
+		DisplacementFlowQuantityOne:      displacement_flow_quantity_one,
+		KtvOne:                           ktv_one,
+		UrrOne:                           urr_one,
+		ConductivityOne:                  conductivity_one,
+		DisplacementQuantityOne:          displacement_quantity_one,
+		BloodOxygenSaturationOne:         blood_oxygen_saturation_one,
+		DialysateFlowOne:                 dialysate_flow_one,
+		BloodSugarOne:                    blood_sugar_one,
+		MonitorTemperatureOne:            monitor_temperature_one,
+		PulseFrequencyOne:                pulse_frequency_one,
+		BloodTemperatureOne:              blood_temperature_one,
+		UreaMonitoringOne:                urea_monitoring_one,
+		BloodThicknessOne:                blood_thickness_one,
+		BloodMonitorOne:                  blood_monitor_one,
+		ReplacementSpeedOne:              replacement_speed_one,
+		DicarbonateOne:                   dicarbonate_one,
+		AccumulatedBloodVolumeOne:        accumulated_blood_volume_one,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -360,6 +417,35 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	is_pressure := this.GetString("is_pressure")
 	ultrafiltration_rate_one := this.GetString("ultrafiltration_rate_one")
 	heparin_one := this.GetString("heparin_one")
+
+	monitor_diastolic_blood_pressure_one := this.GetString("monitor_diastolic_blood_pressure_one")
+	monitor_systolic_blood_pressure_one := this.GetString("monitor_systolic_blood_pressure_one")
+	monitor_pulse_frequency_one := this.GetString("monitor_pulse_frequency_one")
+	blood_flow_volume_one := this.GetString("blood_flow_volume_one")
+	venous_pressure_one := this.GetString("venous_pressure_one")
+	arterial_pressure_one := this.GetString("arterial_pressure_one")
+	transmembrane_pressure_one := this.GetString("transmembrane_pressure_one")
+	ultrafiltration_volume_one := this.GetString("ultrafiltration_volume_one")
+	sodium_concentration_one := this.GetString("sodium_concentration_one")
+	dialysate_temperature_one := this.GetString("dialysate_temperature_one")
+	replacement_rate_one := this.GetString("replacement_rate_one")
+	displacement_quantity_one := this.GetString("displacement_quantity_one")
+	ktv_one := this.GetString("ktv_one")
+	urr_one := this.GetString("urr_one")
+	conductivity_one := this.GetString("conductivity_one")
+	displacement_flow_quantity_one := this.GetString("displacement_flow_quantity_one")
+	blood_oxygen_saturation_one := this.GetString("blood_oxygen_saturation_one")
+	dialysate_flow_one := this.GetString("dialysate_flow_one")
+	blood_sugar_one := this.GetString("blood_sugar_one")
+	monitor_temperature_one := this.GetString("monitor_temperature_one")
+	pulse_frequency_one := this.GetString("pulse_frequency_one")
+	blood_temperature_one := this.GetString("blood_temperature_one")
+	urea_monitoring_one := this.GetString("urea_monitoring_one")
+	blood_thickness_one := this.GetString("blood_thickness_one")
+	blood_monitor_one := this.GetString("blood_monitor_one")
+	replacement_speed_one := this.GetString("replacement_speed_one")
+	dicarbonate_one := this.GetString("dicarbonate_one")
+	accumulated_blood_volume_one := this.GetString("accumulated_blood_volume_one")
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -422,6 +508,34 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.IsPressure = is_pressure
 	monitor.UltrafiltrationRateOne = ultrafiltration_rate_one
 	monitor.HeparinOne = heparin_one
+	monitor.MonitorDiastolicBloodPressureOne = monitor_diastolic_blood_pressure_one
+	monitor.MonitorSystolicBloodPressureOne = monitor_systolic_blood_pressure_one
+	monitor.MonitorPulseFrequencyOne = monitor_pulse_frequency_one
+	monitor.BloodFlowVolumeOne = blood_flow_volume_one
+	monitor.VenousPressureOne = venous_pressure_one
+	monitor.ArterialPressureOne = arterial_pressure_one
+	monitor.TransmembranePressureOne = transmembrane_pressure_one
+	monitor.UltrafiltrationVolumeOne = ultrafiltration_volume_one
+	monitor.SodiumConcentrationOne = sodium_concentration_one
+	monitor.DialysateTemperatureOne = dialysate_temperature_one
+	monitor.ReplacementRateOne = replacement_rate_one
+	monitor.DisplacementFlowQuantityOne = displacement_flow_quantity_one
+	monitor.KtvOne = ktv_one
+	monitor.UrrOne = urr_one
+	monitor.ConductivityOne = conductivity_one
+	monitor.DisplacementQuantityOne = displacement_quantity_one
+	monitor.BloodOxygenSaturationOne = blood_oxygen_saturation_one
+	monitor.DialysateFlowOne = dialysate_flow_one
+	monitor.BloodSugarOne = blood_sugar_one
+	monitor.MonitorTemperatureOne = monitor_temperature_one
+	monitor.PulseFrequencyOne = pulse_frequency_one
+	monitor.BloodTemperatureOne = blood_temperature_one
+	monitor.UreaMonitoringOne = urea_monitoring_one
+	monitor.BloodThicknessOne = blood_thickness_one
+	monitor.BloodMonitorOne = blood_monitor_one
+	monitor.ReplacementSpeedOne = replacement_speed_one
+	monitor.DicarbonateOne = dicarbonate_one
+	monitor.AccumulatedBloodVolumeOne = accumulated_blood_volume_one
 
 	// 查询信息规挡的设置天数
 

controllers/patient_api_controller.go

@@ -4222,6 +4222,13 @@ func (c *PatientApiController) GetPatientDialysisRecords() {
 	adminInfo := c.GetAdminUserInfo()
 	records, total, _ := service.GetPatientDialysisRecord(adminInfo.CurrentOrgId, patientID, page, limit, theStartTIme, theEndtTIme, mode_id)
 
+	if len(records) == 0 {
+		list, _ := service.GetAllDialysisOrder(patientID)
+		for _, item := range list {
+			schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, adminInfo.CurrentOrgId, item.BedId, item.ZoneId, item.SchedualType)
+			service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, adminInfo.CurrentOrgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
+		}
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"total":   total,
 		"records": records,

controllers/pharmacy_controller.go

@@ -572,6 +572,7 @@ func (this *PharmacyController) DispensingDetails() {
 	var dislist []*models.DispensingList
 	var total int64
 	dislist, total, err = service.DispensingDetailsList(stime, etime, orgid, page, limit, keyword)
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())

controllers/self_drug_api_congtroller.go

@@ -148,6 +148,10 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/deleteselfwarehouseinfo", &SelfDrugApiController{}, "Get:DeleteSelfDrugWarehouse")
 
 	beego.Router("/api/drug/tocheckselfwarehouseinginfo", &SelfDrugApiController{}, "Get:TocheckSelfWarehouseingInfo")
+
+	beego.Router("/api/drug/getselfdrugbatchnumber", &SelfDrugApiController{}, "Get:GetSelfDrugBatchNumber")
+
+	beego.Router("/api/drug/postsetfdrugwarehouseout", &SelfDrugApiController{}, "Post:PostSelfDrugWarehouseOut")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -5134,3 +5138,247 @@ func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 		})
 	}
 }
+
+func (c *SelfDrugApiController) GetSelfDrugBatchNumber() {
+
+	id, _ := c.GetInt64("id")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetSelfDrugBatchNumber(id, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
+
+	fmt.Println("开启===========================================================")
+
+	db := service.XTWriteDB()
+	tx := db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	patient_id, _ := c.GetInt64("patient_id")
+	warehouse_out_id, _ := c.GetInt64("warehouse_out_id")
+	ctime := time.Now().Unix()
+	adminUserInfo := c.GetAdminUserInfo()
+
+	warehousing_out_time := c.GetString("warehousing_out_time")
+	warehousingOutDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_out_time)
+	if parseDateErr != nil {
+		c.ErrorLog("日期(%v)解析错误：%v", warehousingOutDate, parseDateErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.CurrentOrgId, tx)
+
+	total = total + 1
+	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+	number = number + total
+	warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+	operation_time := time.Now().Unix()
+	fmt.Println("operation_time=================================", operation_time)
+	creater := adminUserInfo.AdminUser.Id
+	//创建一个出库单
+	warehouseOut := models.XtSelfDrugWarehouseOut{
+		WarehouseOutOrderNumber: warehousing_out_order,
+		OperationTime:           operation_time,
+		OrgId:                   adminUserInfo.CurrentOrgId,
+		Creater:                 creater,
+		Ctime:                   ctime,
+		Status:                  1,
+		WarehouseOutTime:        warehousingOutDate.Unix(),
+		Type:                    0,
+		PatientId:               patient_id,
+		IsCheck:                 2,
+	}
+
+	if warehouse_out_id == 0 {
+		service.AddSelfSigleDrugWarehouseOut(&warehouseOut, tx)
+	}
+	if warehouse_out_id > 0 {
+		service.UpdateSelfSingleDrugWarehouseOut(warehouse_out_id, patient_id, tx)
+	}
+	lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOut(adminUserInfo.CurrentOrgId, tx)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//出库单详情
+	var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+	//把前端的参数加工为出库单详情
+	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
+		thisStockIn, _ := dataBody["stockOut"].([]interface{})
+
+		if len(thisStockIn) > 0 {
+			for _, item := range thisStockIn {
+
+				items := item.(map[string]interface{})
+
+				if items["drug_id"] == nil || reflect.TypeOf(items["drug_id"]).String() != "float64" {
+					utils.ErrorLog("drug_id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				drug_id := int64(items["drug_id"].(float64))
+
+				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
+					utils.ErrorLog("count")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+
+				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
+					utils.ErrorLog("price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				price, _ := strconv.ParseFloat(items["price"].(string), 64)
+
+				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
+
+				total := float64(count) * price
+				retail_price_total := float64(count) * price
+				remark := items["remark"].(string)
+				max_unit := items["max_unit"].(string)
+				dealer := int64(items["dealer"].(float64))
+
+				manufacturer := int64(items["manufacturer"].(float64))
+
+				number := items["number"].(string)
+				batch_number := items["batch_number"].(string)
+
+				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
+				var productDates int64
+				var expiryDates int64
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+
+				}
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+					}
+				}
+
+				admin_user_id := int64(items["admin_user_id"].(float64))
+
+				//if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+				//  utils.ErrorLog("last_price")
+				//  c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//  return
+				//}
+				//last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+
+				stock_count, _ := items["stock_count"].(string)
+
+				patient_id := int64(items["patient_id"].(float64))
+
+				id := int64(items["id"].(float64))
+
+				class_type, _ := items["class_type"].(string)
+
+				warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+					ID:                      id,
+					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+					WarehouseOutId:          lastWarehouseOut.ID,
+					DrugId:                  drug_id,
+					Count:                   count,
+					Price:                   price,
+					TotalPrice:              total,
+					Status:                  1,
+					Ctime:                   warehousingOutDate.Unix(),
+					Mtime:                   ctime,
+					Remark:                  remark,
+					OrgId:                   adminUserInfo.CurrentOrgId,
+					Type:                    0,
+					Manufacturer:            manufacturer,
+					Dealer:                  dealer,
+					RetailPrice:             price,
+					RetailTotalPrice:        retail_price_total,
+					CountUnit:               max_unit,
+					ExpiryDate:              expiryDates,
+					ProductDate:             productDates,
+					Number:                  number,
+					BatchNumber:             batch_number,
+					IsSys:                   0,
+					WarehouseInfoId:         warehouse_info_id,
+					AdminUserId:             admin_user_id,
+					StockCount:              stock_count,
+					IsCheck:                 2,
+					SysRecordTime:           warehousingOutDate.Unix(),
+					PatientId:               patient_id,
+					ClassType:               class_type,
+				}
+				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+			}
+		}
+	}
+
+	//调用出库逻辑
+	for _, item := range warehousingOutInfo {
+		if item.ID == 0 {
+			errOne := service.AddSelfSigleDrugWarehouseOutInfo(item, tx)
+			fmt.Println(errOne)
+		}
+		if item.ID > 0 {
+			service.UpdatedSelfDrugWarehouseInfo(item, item.ID, tx)
+		}
+
+	}
+
+	list, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+
+	warehousingOutInfoList, _ := service.GetDrugWarehouseOutListById(lastWarehouseOut.ID, adminUserInfo.CurrentOrgId)
+
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminUserInfo.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":                "2",
+		"drug_name":          "",
+		"dose":               "",
+		"dose_unit":          "",
+		"min_number":         "",
+		"min_unit":           "",
+		"max_unit":           "",
+		"dealerList":         list,
+		"manufacturerList":   manufacturerList,
+		"warehousingOutInfo": warehousingOutInfoList,
+		"warehouseOut":       lastWarehouseOut,
+		"drugTypeList":       drugTypeList,
+	})
+	return
+}

controllers/sign_api_controller.go

@@ -1242,7 +1242,8 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	//}
 
-	list, _ := service.GetAllDialysisOrder(31831)
+	list, _ := service.GetAllDialysisOrderTwo(10892)
+	fmt.Println("list=============", list)
 	for _, item := range list {
 		schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
 		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)

models/dialysis.go

@@ -715,67 +715,95 @@ func (DryWeightAdjust) TableName() string {
 }
 
 type MonitoringRecord struct {
-	ID                          int64   `gorm:"column:id" json:"id"`
-	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId                   int64   `gorm:"column:patient_id" json:"patient_id"`
-	DialysisOrderId             int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
-	MonitoringDate              int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
-	OperateTime                 int64   `gorm:"column:operate_time" json:"operate_time"`
-	MonitoringTime              string  `gorm:"column:monitoring_time" json:"monitoring_time"`
-	PulseFrequency              float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate               string  `gorm:"column:breathing_rate" json:"breathing_rate"`
-	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	BloodPressureType           int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
-	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"`
-	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"`
-	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"`
-	DialysateTemperature        float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
-	Temperature                 float64 `gorm:"column:temperature" json:"temperature"`
-	ReplacementRate             float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
-	DisplacementQuantity        float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
-	Ktv                         float64 `gorm:"column:ktv" json:"ktv"`
-	Symptom                     string  `gorm:"column:symptom" json:"symptom"`
-	Dispose                     string  `gorm:"column:dispose" json:"dispose"`
-	Result                      string  `gorm:"column:result" json:"result"`
-	MonitoringNurse             int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
-	Status                      int64   `gorm:"column:status" json:"status"`
-	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time"`
-	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time"`
-	Conductivity                float64 `gorm:"column:conductivity" json:"conductivity"`
-	DisplacementFlowQuantity    float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
-	BloodOxygenSaturation       string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Creator                     int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	Modify                      int64   `gorm:"column:modify" json:"modify" form:"modify"`
-	Heparin                     float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
-	DialysateFlow               float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	Urr                         string  `gorm:"column:urr" json:"urr"`
-	BloodSugar                  float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
-	MonitorAnticoagulant        int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
-	MonitorAnticoagulantValue   string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
-	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
-	Complication                int64   `gorm:"column:complication" json:"complication" form:"complication"`
-	AccumulatedBloodVolume      float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
-	BloodTemperature            float64 `gorm:"column:blood_temperature" json:"blood_temperature" form:"blood_temperature"`
-	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"`
-	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
-	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
-	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
-	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
-	IsPressure                  string  `gorm:"column:is_pressure" json:"is_pressure" form:"is_pressure"`
-	UltrafiltrationRateOne      string  `gorm:"column:ultrafiltration_rate_one" json:"ultrafiltration_rate_one" form:"ultrafiltration_rate_one"`
-	HeparinOne                  string  `gorm:"column:heparin_one" json:"heparin_one" form:"heparin_one"`
+	ID                               int64   `gorm:"column:id" json:"id"`
+	UserOrgId                        int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                        int64   `gorm:"column:patient_id" json:"patient_id"`
+	DialysisOrderId                  int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	MonitoringDate                   int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
+	OperateTime                      int64   `gorm:"column:operate_time" json:"operate_time"`
+	MonitoringTime                   string  `gorm:"column:monitoring_time" json:"monitoring_time"`
+	PulseFrequency                   float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
+	BreathingRate                    string  `gorm:"column:breathing_rate" json:"breathing_rate"`
+	SystolicBloodPressure            float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure           float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	BloodPressureType                int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
+	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"`
+	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"`
+	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"`
+	DialysateTemperature             float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
+	Temperature                      float64 `gorm:"column:temperature" json:"temperature"`
+	ReplacementRate                  float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
+	DisplacementQuantity             float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
+	Ktv                              float64 `gorm:"column:ktv" json:"ktv"`
+	Symptom                          string  `gorm:"column:symptom" json:"symptom"`
+	Dispose                          string  `gorm:"column:dispose" json:"dispose"`
+	Result                           string  `gorm:"column:result" json:"result"`
+	MonitoringNurse                  int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
+	Status                           int64   `gorm:"column:status" json:"status"`
+	CreatedTime                      int64   `gorm:"column:created_time" json:"created_time"`
+	UpdatedTime                      int64   `gorm:"column:updated_time" json:"updated_time"`
+	Conductivity                     float64 `gorm:"column:conductivity" json:"conductivity"`
+	DisplacementFlowQuantity         float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
+	BloodOxygenSaturation            string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Creator                          int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                           int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	Heparin                          float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow                    float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Urr                              string  `gorm:"column:urr" json:"urr"`
+	BloodSugar                       float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
+	MonitorAnticoagulant             int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
+	MonitorAnticoagulantValue        string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	BloodPressureMonitoringSite      int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
+	Complication                     int64   `gorm:"column:complication" json:"complication" form:"complication"`
+	AccumulatedBloodVolume           float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
+	BloodTemperature                 float64 `gorm:"column:blood_temperature" json:"blood_temperature" form:"blood_temperature"`
+	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"`
+	Dehydration                      float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
+	FilterPressure                   string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
+	ReplacementSpeed                 float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
+	Dicarbonate                      float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
+	IsPressure                       string  `gorm:"column:is_pressure" json:"is_pressure" form:"is_pressure"`
+	UltrafiltrationRateOne           string  `gorm:"column:ultrafiltration_rate_one" json:"ultrafiltration_rate_one" form:"ultrafiltration_rate_one"`
+	HeparinOne                       string  `gorm:"column:heparin_one" json:"heparin_one" form:"heparin_one"`
+	MonitorSystolicBloodPressureOne  string  `gorm:"column:monitor_systolic_blood_pressure_one" json:"monitor_systolic_blood_pressure_one" form:"monitor_systolic_blood_pressure_one"`
+	MonitorDiastolicBloodPressureOne string  `gorm:"column:monitor_diastolic_blood_pressure_one" json:"monitor_diastolic_blood_pressure_one" form:"monitor_diastolic_blood_pressure_one"`
+	MonitorPulseFrequencyOne         string  `gorm:"column:monitor_pulse_frequency_one" json:"monitor_pulse_frequency_one" form:"monitor_pulse_frequency_one"`
+	BloodFlowVolumeOne               string  `gorm:"column:blood_flow_volume_one" json:"blood_flow_volume_one" form:"blood_flow_volume_one"`
+	VenousPressureOne                string  `gorm:"column:venous_pressure_one" json:"venous_pressure_one" form:"venous_pressure_one"`
+	ArterialPressureOne              string  `gorm:"column:arterial_pressure_one" json:"arterial_pressure_one" form:"arterial_pressure_one"`
+	TransmembranePressureOne         string  `gorm:"column:transmembrane_pressure_one" json:"transmembrane_pressure_one" form:"transmembrane_pressure_one"`
+	UltrafiltrationVolumeOne         string  `gorm:"column:ultrafiltration_volume_one" json:"ultrafiltration_volume_one" form:"ultrafiltration_volume_one"`
+	SodiumConcentrationOne           string  `gorm:"column:sodium_concentration_one" json:"sodium_concentration_one" form:"sodium_concentration_one"`
+	DialysateTemperatureOne          string  `gorm:"column:dialysate_temperature_one" json:"dialysate_temperature_one" form:"dialysate_temperature_one"`
+	ReplacementRateOne               string  `gorm:"column:replacement_rate_one" json:"replacement_rate_one" form:"replacement_rate_one"`
+	DisplacementQuantityOne          string  `gorm:"column:displacement_quantity_one" json:"displacement_quantity_one" form:"displacement_quantity_one"`
+	KtvOne                           string  `gorm:"column:ktv_one" json:"ktv_one" form:"ktv_one"`
+	UrrOne                           string  `gorm:"column:urr_one" json:"urr_one" form:"urr_one"`
+	ConductivityOne                  string  `gorm:"column:conductivity_one" json:"conductivity_one" form:"conductivity_one"`
+	DisplacementFlowQuantityOne      string  `gorm:"column:displacement_flow_quantity_one" json:"displacement_flow_quantity_one" form:"displacement_flow_quantity_one"`
+	BloodOxygenSaturationOne         string  `gorm:"column:blood_oxygen_saturation_one" json:"blood_oxygen_saturation_one" form:"blood_oxygen_saturation_one"`
+	DialysateFlowOne                 string  `gorm:"column:dialysate_flow_one" json:"dialysate_flow_one" form:"dialysate_flow_one"`
+	BloodSugarOne                    string  `gorm:"column:blood_sugar_one" json:"blood_sugar_one" form:"blood_sugar_one"`
+	MonitorTemperatureOne            string  `gorm:"column:monitor_temperature_one" json:"monitor_temperature_one" form:"monitor_temperature_one"`
+	PulseFrequencyOne                string  `gorm:"column:pulse_frequency_one" json:"pulse_frequency_one" form:"pulse_frequency_one"`
+	BloodTemperatureOne              string  `gorm:"column:blood_temperature_one" json:"blood_temperature_one" form:"blood_temperature_one"`
+	UreaMonitoringOne                string  `gorm:"column:urea_monitoring_one" json:"urea_monitoring_one" form:"urea_monitoring_one"`
+	BloodThicknessOne                string  `gorm:"column:blood_thickness_one" json:"blood_thickness_one" form:"blood_thickness_one"`
+	BloodMonitorOne                  string  `gorm:"column:blood_monitor_one" json:"blood_monitor_one" form:"blood_monitor_one"`
+	ReplacementSpeedOne              string  `gorm:"column:replacement_speed_one" json:"replacement_speed_one" form:"replacement_speed_one"`
+	DicarbonateOne                   string  `gorm:"column:dicarbonate_one" json:"dicarbonate_one" form:"dicarbonate_one"`
+	AccumulatedBloodVolumeOne        string  `gorm:"column:accumulated_blood_volume_one" json:"accumulated_blood_volume_one" form:"accumulated_blood_volume_one"`
 }
 
 func (MonitoringRecord) TableName() string {

models/drug.go

@@ -303,21 +303,22 @@ func (BaseDrugLibTwenty) TableName() string {
 }
 
 type BaseDrugLibThrity struct {
-	ID                    int64                   `gorm:"column:id" json:"id" form:"id"`
-	DrugName              string                  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Manufacturer          int64                   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	ManufacturerName      string                  `gorm:"column:manufacturer_name" json:"manufacturer_name"`
-	MaxUnit               string                  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber             int64                   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit               string                  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                  string                  `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit              string                  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	IsSelfDrug            int64                   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
-	OrgId                 int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Status                int64                   `gorm:"column:status" json:"status" form:"status"`
-	Dealer                int64                   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	DrugType              int64                   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	LastDrugWarehouseInfo XtSelfDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"first_drug_warehouse_info"`
+	ID                    int64                      `gorm:"column:id" json:"id" form:"id"`
+	DrugName              string                     `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Manufacturer          int64                      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	ManufacturerName      string                     `gorm:"column:manufacturer_name" json:"manufacturer_name"`
+	MaxUnit               string                     `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber             int64                      `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit               string                     `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                  string                     `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit              string                     `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	IsSelfDrug            int64                      `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	OrgId                 int64                      `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Status                int64                      `gorm:"column:status" json:"status" form:"status"`
+	Dealer                int64                      `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	DrugType              int64                      `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	LastDrugWarehouseInfo XtSelfDrugWarehouseInfo    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"first_drug_warehouse_info"`
+	DrugWarehouseInfo     []*XtSelfDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
 }
 
 func (BaseDrugLibThrity) TableName() string {
@@ -479,3 +480,83 @@ type XtSelfDrugStockCount struct {
 func (XtSelfDrugStockCount) TableName() string {
 	return "xt_self_drug_stock_count"
 }
+
+type XtSelfDrugWarehouseOut struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutOrderNumber string `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	OperationTime           int64  `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	Creater                 int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	OrgId                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Remark                  string `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                  int64  `gorm:"column:status" json:"status" form:"status"`
+	WarehouseOutTime        int64  `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
+	Dealer                  int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type                    int64  `gorm:"column:type" json:"type" form:"type"`
+	IsSys                   int64  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SupplyCancelOutId       int64  `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId            int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseId       int64  `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	IsCheck                 int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OrderId                 int64  `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	PatientId               int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+}
+
+func (XtSelfDrugWarehouseOut) TableName() string {
+	return "xt_self_drug_warehouse_out"
+}
+
+type XtSelfDrugWarehouseOutInfo struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceId                int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyCancelOutId       int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64   `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsCheck                 int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OverCount               int64   `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	OrderId                 int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ManafacturerName        string  `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	DepartmentName          string  `gorm:"column:department_name" json:"department_name" form:"department_name"`
+	ClassType               string  `gorm:"column:class_type" json:"class_type" form:"class_type"`
+}
+
+func (XtSelfDrugWarehouseOutInfo) TableName() string {
+	return "xt_self_drug_warehouse_out_info"
+}

models/his_models.go

@@ -2873,3 +2873,25 @@ type HisPrescriptionTen struct {
 func (HisPrescriptionTen) TableName() string {
 	return "his_prescription"
 }
+
+type XtSelfDrugInfoConfig struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (XtSelfDrugInfoConfig) TableName() string {
+	return "xt_self_drug_info_config"
+}
+
+type XtSelfDrugOutConfig struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtSelfDrugOutConfig) TableName() string {
+	return "xt_self_drug_out_config"
+}

models/new_monitor.go

@@ -110,21 +110,28 @@ func (VMAssessmentAfterDislysis) TableName() string {
 }
 
 type VMMonitoringRecord struct {
-	ID                     int64   `gorm:"column:id" json:"id"`
-	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId              int64   `gorm:"column:patient_id" json:"patient_id"`
-	MonitoringDate         int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
-	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	Status                 int64   `gorm:"column:status" json:"status"`
-	AccumulatedBloodVolume float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
-	UltrafiltrationVolume  float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume" form:"ultrafiltration_volume"`
-	VenousPressure         float64 `gorm:"column:venous_pressure" json:"venous_pressure" form:"venous_pressure"`
-	ArterialPressure       float64 `gorm:"column:arterial_pressure" json:"arterial_pressure" form:"arterial_pressure"`
-	BloodOxygenSaturation  string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Symptom                string  `gorm:"column:symptom" json:"symptom" form:"symptom"`
-	Dispose                string  `gorm:"column:dispose" json:"dispose" form:"dispose"`
-	Result                 string  `gorm:"column:result" json:"result" form:"result"`
+	ID                               int64   `gorm:"column:id" json:"id"`
+	UserOrgId                        int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                        int64   `gorm:"column:patient_id" json:"patient_id"`
+	MonitoringDate                   int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
+	SystolicBloodPressure            float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure           float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	MonitorSystolicBloodPressureOne  string  `gorm:"column:monitor_systolic_blood_pressure_one" json:"monitor_systolic_blood_pressure_one" form:"monitor_systolic_blood_pressure_one"`
+	MonitorDiastolicBloodPressureOne string  `gorm:"column:monitor_diastolic_blood_pressure_one" json:"monitor_diastolic_blood_pressure_one" form:"monitor_diastolic_blood_pressure_one"`
+	Status                           int64   `gorm:"column:status" json:"status"`
+	AccumulatedBloodVolume           float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
+	AccumulatedBloodVolumeOne        string  `gorm:"column:accumulated_blood_volume_one" json:"accumulated_blood_volume_one" form:"accumulated_blood_volume_one"`
+	UltrafiltrationVolume            float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume" form:"ultrafiltration_volume"`
+	UltrafiltrationVolumeOne         string  `gorm:"column:ultrafiltration_volume_one" json:"ultrafiltration_volume_one" form:"ultrafiltration_volume_one"`
+	VenousPressure                   float64 `gorm:"column:venous_pressure" json:"venous_pressure" form:"venous_pressure"`
+	ArterialPressure                 float64 `gorm:"column:arterial_pressure" json:"arterial_pressure" form:"arterial_pressure"`
+	VenousPressureOne                string  `gorm:"column:venous_pressure_one" json:"venous_pressure_one" form:"venous_pressure_one"`
+	ArterialPressureOne              string  `gorm:"column:arterial_pressure_one" json:"arterial_pressure_one" form:"arterial_pressure_one"`
+	BloodOxygenSaturation            string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	BloodOxygenSaturationOne         string  `gorm:"column:blood_oxygen_saturation_one" json:"blood_oxygen_saturation_one" form:"blood_oxygen_saturation_one"`
+	Symptom                          string  `gorm:"column:symptom" json:"symptom" form:"symptom"`
+	Dispose                          string  `gorm:"column:dispose" json:"dispose" form:"dispose"`
+	Result                           string  `gorm:"column:result" json:"result" form:"result"`
 }
 
 func (VMMonitoringRecord) TableName() string {

service/dialysis_service.go

@@ -895,7 +895,7 @@ func GetAdminUserEsTwo(orgid int64, aapid int64) (admin []*models.UserAdminRoles
 	db := readUserDb.Table("sgj_user_admin_role as x")
 	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
 	fmt.Println("table", table)
-	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ? and x.app_id =?", orgid, aapid).Group("user_name").Scan(&admin).Error
+	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ? and x.app_id =? and x.status=1", orgid, aapid).Group("user_name").Scan(&admin).Error
 	return admin, err
 }
 

service/new_stock_service.go

@@ -680,3 +680,10 @@ func UpdateSelfDrugStockSum(patient_id int64, drug_id int64, user_org_id int64,
 	}
 	return err
 }
+
+func GetSelfDrugBatchNumber(drug_id int64, org_id int64) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("drug_id = ? and org_id = ? and status=1 and batch_number <>''", drug_id, org_id).Find(&info).Error
+
+	return info, err
+}

service/patient_service.go

@@ -2752,7 +2752,8 @@ func GetAllMonitorList(orgID int64, scheduleDate int64) (monitor []*models.VMMon
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_record_list_all"
 	monitor_record_list_all, _ := redis.Get(key).Result()
-	fmt.Println("monitor_recorde_list", len(monitor_record_list_all))
+
+	redis.Set(key, "", time.Second)
 	if len(monitor_record_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
 		if err != nil {

service/pharmacy_service.go

@@ -453,6 +453,7 @@ func DispensingDetailsList(stime, etime, orgid, page, limit int64, keyword strin
 		}
 		dbone = dbone.Where("patient_id in (?)", tmp_ids)
 	}
+	fmt.Println("fenye=============================", fenye)
 	//查询出分页用的数据
 	err = dbone.Count(&total).Offset(offset).Order("mtime desc").Limit(limit).Find(&fenye).Error
 	if err != nil {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -533,53 +533,81 @@ func (XtReceiveTreatmentAsses) TableName() string {
 }
 
 type MonitoringRecordVM struct {
-	ID                          int64   `gorm:"column:id" json:"id"`
-	PatientID                   int64   `gorm:"column:patient_id" json:"patient_id"`
-	MonitoringDate              int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
-	OperateTime                 int64   `gorm:"column:operate_time" json:"operate_time"`
-	PulseFrequency              float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate               string  `gorm:"column:breathing_rate" json:"breathing_rate"`
-	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	BloodPressureType           int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
-	BloodFlowVolume             float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
-	VenousPressure              float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
-	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"`
-	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"`
-	DialysateTemperature        float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
-	Temperature                 float64 `gorm:"column:temperature" json:"temperature"`
-	ReplacementRate             float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
-	DisplacementQuantity        float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
-	Ktv                         float64 `gorm:"column:ktv" json:"ktv"`
-	Symptom                     string  `gorm:"column:symptom" json:"symptom"`
-	Dispose                     string  `gorm:"column:dispose" json:"dispose"`
-	Result                      string  `gorm:"column:result" json:"result"`
-	MonitoringNurse             int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
-	Conductivity                float64 `gorm:"column:conductivity" json:"conductivity"`
-	DisplacementFlowQuantity    float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
-	BloodOxygenSaturation       string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Creator                     int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	Modify                      int64   `gorm:"column:modify" json:"modify" form:"modify"`
-	Heparin                     float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
-	DialysateFlow               float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	AccumulatedBloodVolume      float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
-	BloodTemperature            float64 `gorm:"column:blood_temperature" json:"blood_temperature" form:"blood_temperature"`
-	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"`
-	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
-	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
-	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
-	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
-	UltrafiltrationRateOne      string  `gorm:"column:ultrafiltration_rate_one" json:"ultrafiltration_rate_one" form:"ultrafiltration_rate_one"`
-	HeparinOne                  string  `gorm:"column:heparin_one" json:"heparin_one" form:"heparin_one"`
+	ID                               int64   `gorm:"column:id" json:"id"`
+	PatientID                        int64   `gorm:"column:patient_id" json:"patient_id"`
+	MonitoringDate                   int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
+	OperateTime                      int64   `gorm:"column:operate_time" json:"operate_time"`
+	PulseFrequency                   float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
+	BreathingRate                    string  `gorm:"column:breathing_rate" json:"breathing_rate"`
+	SystolicBloodPressure            float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure           float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	BloodPressureType                int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
+	BloodFlowVolume                  float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
+	VenousPressure                   float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
+	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"`
+	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"`
+	DialysateTemperature             float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
+	Temperature                      float64 `gorm:"column:temperature" json:"temperature"`
+	ReplacementRate                  float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
+	DisplacementQuantity             float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
+	Ktv                              float64 `gorm:"column:ktv" json:"ktv"`
+	Symptom                          string  `gorm:"column:symptom" json:"symptom"`
+	Dispose                          string  `gorm:"column:dispose" json:"dispose"`
+	Result                           string  `gorm:"column:result" json:"result"`
+	MonitoringNurse                  int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
+	Conductivity                     float64 `gorm:"column:conductivity" json:"conductivity"`
+	DisplacementFlowQuantity         float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
+	BloodOxygenSaturation            string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Creator                          int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                           int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	Heparin                          float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow                    float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	AccumulatedBloodVolume           float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
+	BloodTemperature                 float64 `gorm:"column:blood_temperature" json:"blood_temperature" form:"blood_temperature"`
+	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"`
+	BloodPressureMonitoringSite      int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
+	UserOrgId                        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	FilterPressure                   string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
+	Dicarbonate                      float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
+	ReplacementSpeed                 float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
+	UltrafiltrationRateOne           string  `gorm:"column:ultrafiltration_rate_one" json:"ultrafiltration_rate_one" form:"ultrafiltration_rate_one"`
+	HeparinOne                       string  `gorm:"column:heparin_one" json:"heparin_one" form:"heparin_one"`
+	MonitorSystolicBloodPressureOne  string  `gorm:"column:monitor_systolic_blood_pressure_one" json:"monitor_systolic_blood_pressure_one" form:"monitor_systolic_blood_pressure_one"`
+	MonitorDiastolicBloodPressureOne string  `gorm:"column:monitor_diastolic_blood_pressure_one" json:"monitor_diastolic_blood_pressure_one" form:"monitor_diastolic_blood_pressure_one"`
+	MonitorPulseFrequencyOne         string  `gorm:"column:monitor_pulse_frequency_one" json:"monitor_pulse_frequency_one" form:"monitor_pulse_frequency_one"`
+	BloodFlowVolumeOne               string  `gorm:"column:blood_flow_volume_one" json:"blood_flow_volume_one" form:"blood_flow_volume_one"`
+	VenousPressureOne                string  `gorm:"column:venous_pressure_one" json:"venous_pressure_one" form:"venous_pressure_one"`
+	ArterialPressureOne              string  `gorm:"column:arterial_pressure_one" json:"arterial_pressure_one" form:"arterial_pressure_one"`
+	TransmembranePressureOne         string  `gorm:"column:transmembrane_pressure_one" json:"transmembrane_pressure_one" form:"transmembrane_pressure_one"`
+	UltrafiltrationVolumeOne         string  `gorm:"column:ultrafiltration_volume_one" json:"ultrafiltration_volume_one" form:"ultrafiltration_volume_one"`
+	SodiumConcentrationOne           string  `gorm:"column:sodium_concentration_one" json:"sodium_concentration_one" form:"sodium_concentration_one"`
+	DialysateTemperatureOne          string  `gorm:"column:dialysate_temperature_one" json:"dialysate_temperature_one" form:"dialysate_temperature_one"`
+	ReplacementRateOne               string  `gorm:"column:replacement_rate_one" json:"replacement_rate_one" form:"replacement_rate_one"`
+	DisplacementQuantityOne          string  `gorm:"column:displacement_quantity_one" json:"displacement_quantity_one" form:"displacement_quantity_one"`
+	KtvOne                           string  `gorm:"column:ktv_one" json:"ktv_one" form:"ktv_one"`
+	UrrOne                           string  `gorm:"column:urr_one" json:"urr_one" form:"urr_one"`
+	ConductivityOne                  string  `gorm:"column:conductivity_one" json:"conductivity_one" form:"conductivity_one"`
+	DisplacementFlowQuantityOne      string  `gorm:"column:displacement_flow_quantity_one" json:"displacement_flow_quantity_one" form:"displacement_flow_quantity_one"`
+	BloodOxygenSaturationOne         string  `gorm:"column:blood_oxygen_saturation_one" json:"blood_oxygen_saturation_one" form:"blood_oxygen_saturation_one"`
+	DialysateFlowOne                 string  `gorm:"column:dialysate_flow_one" json:"dialysate_flow_one" form:"dialysate_flow_one"`
+	BloodSugarOne                    string  `gorm:"column:blood_sugar_one" json:"blood_sugar_one" form:"blood_sugar_one"`
+	MonitorTemperatureOne            string  `gorm:"column:monitor_temperature_one" json:"monitor_temperature_one" form:"monitor_temperature_one"`
+	PulseFrequencyOne                string  `gorm:"column:pulse_frequency_one" json:"pulse_frequency_one" form:"pulse_frequency_one"`
+	BloodTemperatureOne              string  `gorm:"column:blood_temperature_one" json:"blood_temperature_one" form:"blood_temperature_one"`
+	UreaMonitoringOne                string  `gorm:"column:urea_monitoring_one" json:"urea_monitoring_one" form:"urea_monitoring_one"`
+	BloodThicknessOne                string  `gorm:"column:blood_thickness_one" json:"blood_thickness_one" form:"blood_thickness_one"`
+	BloodMonitorOne                  string  `gorm:"column:blood_monitor_one" json:"blood_monitor_one" form:"blood_monitor_one"`
+	ReplacementSpeedOne              string  `gorm:"column:replacement_speed_one" json:"replacement_speed_one" form:"replacement_speed_one"`
+	DicarbonateOne                   string  `gorm:"column:dicarbonate_one" json:"dicarbonate_one" form:"dicarbonate_one"`
+	AccumulatedBloodVolumeOne        string  `gorm:"column:accumulated_blood_volume_one" json:"accumulated_blood_volume_one" form:"accumulated_blood_volume_one"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/sign_service.go

@@ -2110,9 +2110,16 @@ func UpdateAllPatient(id int64, diagose string, orgid int64) error {
 	return err
 }
 
-func GetAllDialysisOrder(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
+func GetAllDialysisOrderTwo(patient_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1", 31831).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status =1 and dialysis_date>=1696089600", patient_id).Find(&list).Error
+
+	return list, err
+}
+
+func GetAllDialysisOrder(patient_id int64) (list []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and status =1", patient_id).Find(&list).Error
 
 	return list, err
 }

service/stock_service.go

@@ -1537,6 +1537,19 @@ func FindAllDrugWarehouseOut(org_id int64) (total int64, err error) {
 
 }
 
+func FindAllSelfDrugWarehouseOut(org_id int64, tx *gorm.DB) (total int64, err error) {
+
+	err = tx.Model(&models.XtSelfDrugWarehouseOut{}).Where("org_id = ?", org_id).Count(&total).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return
+		}
+	}
+	return total, err
+
+}
+
 func AddSigleWarehouseOut(warehouseOut *models.WarehouseOut) error {
 	err := writeDb.Create(&warehouseOut).Error
 	return err
@@ -1564,6 +1577,17 @@ func AddSigleDrugWarehouseOut(warehouseOut *models.DrugWarehouseOut) error {
 
 }
 
+func AddSelfSigleDrugWarehouseOut(warehouseOut *models.XtSelfDrugWarehouseOut, tx *gorm.DB) error {
+
+	err := tx.Create(&warehouseOut).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+
+}
+
 func AddNewSigleDrugWarehouseOut(warehouseOut *models.DrugWarehouseOut, tx *gorm.DB) error {
 
 	err := tx.Create(&warehouseOut).Error
@@ -1581,6 +1605,12 @@ func UpdateSingleDrugWarehouseOut(id int64, storehouse_id int64) error {
 	return err
 }
 
+func UpdateSelfSingleDrugWarehouseOut(id int64, patient_id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"patient_id": patient_id}).Error
+	return err
+}
+
 func CreateWarehousingOutInfo(warehouseOutInfo []*models.WarehouseOutInfo) (err error) {
 	if len(warehouseOutInfo) > 0 {
 		utx := writeDb.Begin()
@@ -3465,6 +3495,18 @@ func AddSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) error {
 	return err
 }
 
+func AddSelfSigleDrugWarehouseOutInfo(info *models.XtSelfDrugWarehouseOutInfo, tx *gorm.DB) error {
+
+	err := tx.Create(&info).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func AddNewSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo, tx *gorm.DB) error {
 
 	err := tx.Create(&info).Error
@@ -8125,12 +8167,31 @@ func UpdatedDrugWarehouseInfo(info *models.DrugWarehouseOutInfo, id int64) error
 	return err
 }
 
+func UpdatedSelfDrugWarehouseInfo(info *models.XtSelfDrugWarehouseOutInfo, id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "count_unit": info.CountUnit, "price": info.Price, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "batch_number": info.BatchNumber, "admin_user_id": info.AdminUserId, "last_price": info.LastPrice, "stock_count": info.StockCount, "storehouse_id": info.StorehouseId, "patient_id": info.PatientId, "class_type": info.ClassType}).Error
+	if err != gorm.ErrRecordNotFound {
+		return err
+	}
+	return err
+}
+
 func GetDrugLastWarehouseOut(orgid int64) (models.DrugWarehouseOut, error) {
 	out := models.DrugWarehouseOut{}
 	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&out).Error
 	return out, err
 }
 
+func GetSelfDrugLastWarehouseOut(orgid int64, tx *gorm.DB) (models.XtSelfDrugWarehouseOut, error) {
+	out := models.XtSelfDrugWarehouseOut{}
+	err := tx.Where("org_id = ? and status = 1", orgid).Find(&out).Error
+	if err != gorm.ErrRecordNotFound {
+		tx.Rollback()
+		return out, err
+	}
+	return out, err
+}
+
 func GetDrugWarehouseOutListById(warehouse_out_id int64, orgId int64) (info []*models.DrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("warehouse_out_id = ? and org_id  =? and status = 1", warehouse_out_id, orgId).Preload("BaseDrugLib", "status=1").Find(&info).Error
@@ -9276,3 +9337,48 @@ func UpdateNewDrugWarehouseInfoById(id int64, last_stock_max_number int64, last_
 
 	return err
 }
+
+func GeteSelfPrescriptionOpen(user_org_id int64) (models.XtSelfDrugInfoConfig, error) {
+
+	drugInfoConfig := models.XtSelfDrugInfoConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&drugInfoConfig).Error
+
+	return drugInfoConfig, err
+}
+
+func CreaterSelfConfig(infoConfig models.XtSelfDrugInfoConfig) error {
+
+	err := XTWriteDB().Create(&infoConfig).Error
+
+	return err
+}
+
+func SaveSelfConfig(infoConfig models.XtSelfDrugInfoConfig) error {
+
+	err := XTWriteDB().Save(&infoConfig).Error
+
+	return err
+}
+
+func GetSelfPrescriptionOutOpen(user_org_id int64) (models.XtSelfDrugOutConfig, error) {
+
+	drugOutConfig := models.XtSelfDrugOutConfig{}
+
+	err := XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&drugOutConfig).Error
+
+	return drugOutConfig, err
+}
+
+func CreateSelfDrugOutConfig(config models.XtSelfDrugOutConfig) error {
+
+	err := XTWriteDB().Create(&config).Error
+
+	return err
+}
+
+func UpdateSelfDrugOutConfig(config models.XtSelfDrugOutConfig) error {
+
+	err := XTWriteDB().Save(&config).Error
+
+	return err
+}