Merge remote-tracking branch 'origin/20230223_xt_api_new_branch' into 20230223_xt_api_new_branch

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10721 //机构id
+		subscibe.OrgId = 10744 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10744 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18723 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10721 //机构id小英9675或4
+		subscibe.OrgId = 10744 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10744 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18723 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -243,7 +243,9 @@ func (c *DialysisApiController) UpdateQueueCall() {
 }
 
 func (c *DialysisApiController) PostPrescription() {
+
 	patient, _ := c.GetInt64("patient_id", 0)
+
 	recordDateStr := c.GetString("record_date")
 
 	if patient <= 0 {
@@ -382,6 +384,24 @@ func (c *DialysisApiController) PostPrescription() {
 
 	conduct := c.GetString("conduct")
 
+	sterilization_water := c.GetString("sterilization_water")
+
+	five_glucose := c.GetString("five_glucose")
+
+	fifty_glucose := c.GetString("fifty_glucose")
+
+	magnesium_sulfate_injection := c.GetString("magnesium_sulfate_injection")
+
+	calcium_gluconate := c.GetString("calcium_gluconate")
+
+	five_potassium_chloride_injection := c.GetString("five_potassium_chloride_injection")
+
+	ten_potassium_chloride_injection := c.GetString("ten_potassium_chloride_injection")
+
+	five_sodium_bicarbonate_injection := c.GetString("five_sodium_bicarbonate_injection")
+
+	new_sty := c.GetString("new_sty")
+
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -442,94 +462,115 @@ func (c *DialysisApiController) PostPrescription() {
 		Bicarbonate:               bicarbonate,
 		Glucose:                   glucose,
 		// DryWeight:                 dry_weight,
-		DialysateFlow:              dialysate_flow,
-		DialysateTemperature:       dialysate_temperature,
-		Conductivity:               conductivity,
-		Remark:                     remark,
-		Status:                     1,
-		CreatedTime:                time.Now().Unix(),
-		UpdatedTime:                time.Now().Unix(),
-		DialysisDurationMinute:     dialysisDurationMinute,
-		DialysisDurationHour:       dialysisDurationHour,
-		TargetUltrafiltration:      targetUltrafiltration,
-		DialysateFormulation:       dialysateFormulation,
-		DialyzerPerfusionApparatus: dialyzerPerfusionApparatus,
-		BodyFluid:                  body_fluid,
-		SpecialMedicine:            special_medicine,
-		SpecialMedicineOther:       special_medicine_other,
-		DisplaceLiquiPart:          displace_liqui_part,
-		DisplaceLiquiValue:         displace_liqui_value,
-		BloodAccess:                blood_access,
-		Ultrafiltration:            ultrafiltration,
-		BodyFluidOther:             body_fluid_other,
-		TargetKtv:                  target_ktv,
-		Niprocart:                  niprocart,
-		Jms:                        jms,
-		FistulaNeedleSet:           fistula_needle_set,
-		FistulaNeedleSet16:         fistula_needle_set_16,
-		Hemoperfusion:              hemoperfusion,
-		DialyserSterilised:         dialyser_sterilised,
-		Filtryzer:                  filtryzer,
-		Dialyzers:                  dialyzers,
-		Injector:                   injector,
-		Bloodlines:                 bloodlines,
-		TubingHemodialysis:         tubing_hemodialysis,
-		Package:                    safe_package,
-		ALiquid:                    a_liquid,
-		PreImpulse:                 preImpules,
-		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
-		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                      blood,
-		DialysisDialyszers:         dialysis_dialyszers,
-		DialysisIrrigation:         dialysis_irrigation,
-		AntioxidantCommodityName:   antioxidant_commodity_name,
-		DisplaceSpeed:              displace_speed,
-		Illness:                    illness,
-		Amylaceum:                  amylaceum,
-		SingleTime:                 single_time,
-		SingleWater:                single_water,
-		ReplacementFlow:            replacement_flow,
-		PlasmaSeparator:            plasma_separator,
-		BilirubinAdsorptionColumn:  bilirubin_adsorption_column,
-		OxygenFlow:                 oxygen_flow,
-		OxygenUptake:               oxygen_uptake,
-		OxygenTime:                 oxygen_time,
-		HemodialysisPipelines:      hemodialysis_pipelines,
-		HemodialysisPipelinesCount: hemodialysis_pipelines_count,
-		PunctureNeedle:             puncture_needle,
-		PunctureNeedleCount:        puncture_needle_count,
-		Epo:                        epo,
-		EpoCount:                   epo_count,
-		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
-		AdminUserId:                admin_user_id,
-		IsWater:                    is_water,
-		DrhyWater:                  drhy_water,
-		DryWaterHour:               dry_water_hour,
-		WaterMachine:               water_machine,
-		AddAmount:                  add_amount,
-		ReduceAmount:               reduce_amount,
-		DialysisRemark:             dialysis_remark,
-		PrescribingNumber:          prescribing_number,
-		TreatmentRemark:            treatment_remark,
-		PrescriptionSodium:         prescription_sodium,
-		StartSodium:                start_sodium,
-		SodiumCurve:                sodium_curve,
-		DialysisFluidFlow:          dialysis_fluid_flow,
-		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
-		PrescriptionWater:          prescription_water,
-		DialysisStrainer:           dialysis_strainer,
-		Chaptalization:             chaptalization,
-		WarshCount:                 warsh_count,
-		WashingTime:                washing_time,
-		BloodAccessPartId:          blood_access_part_id,
-		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
-		Dialyzate:                  dialyzate,
-		DialysisStrainerId:         dialysis_strainer_id,
-		DialysisIrrigationId:       dialysis_irrigation_id,
-		DialysisDialyszersId:       dialysis_dialyszers_id,
-		FirstSuper:                 first_super,
-		IsSequential:               is_sequential,
-		Conduct:                    conduct,
+		DialysateFlow:                  dialysate_flow,
+		DialysateTemperature:           dialysate_temperature,
+		Conductivity:                   conductivity,
+		Remark:                         remark,
+		Status:                         1,
+		CreatedTime:                    time.Now().Unix(),
+		UpdatedTime:                    time.Now().Unix(),
+		DialysisDurationMinute:         dialysisDurationMinute,
+		DialysisDurationHour:           dialysisDurationHour,
+		TargetUltrafiltration:          targetUltrafiltration,
+		DialysateFormulation:           dialysateFormulation,
+		DialyzerPerfusionApparatus:     dialyzerPerfusionApparatus,
+		BodyFluid:                      body_fluid,
+		SpecialMedicine:                special_medicine,
+		SpecialMedicineOther:           special_medicine_other,
+		DisplaceLiquiPart:              displace_liqui_part,
+		DisplaceLiquiValue:             displace_liqui_value,
+		BloodAccess:                    blood_access,
+		Ultrafiltration:                ultrafiltration,
+		BodyFluidOther:                 body_fluid_other,
+		TargetKtv:                      target_ktv,
+		Niprocart:                      niprocart,
+		Jms:                            jms,
+		FistulaNeedleSet:               fistula_needle_set,
+		FistulaNeedleSet16:             fistula_needle_set_16,
+		Hemoperfusion:                  hemoperfusion,
+		DialyserSterilised:             dialyser_sterilised,
+		Filtryzer:                      filtryzer,
+		Dialyzers:                      dialyzers,
+		Injector:                       injector,
+		Bloodlines:                     bloodlines,
+		TubingHemodialysis:             tubing_hemodialysis,
+		Package:                        safe_package,
+		ALiquid:                        a_liquid,
+		PreImpulse:                     preImpules,
+		AnticoagulantStopTimeHour:      anticoagulant_stop_time_hour,
+		AnticoagulantStopTimeMin:       anticoagulant_stop_time_min,
+		Blood:                          blood,
+		DialysisDialyszers:             dialysis_dialyszers,
+		DialysisIrrigation:             dialysis_irrigation,
+		AntioxidantCommodityName:       antioxidant_commodity_name,
+		DisplaceSpeed:                  displace_speed,
+		Illness:                        illness,
+		Amylaceum:                      amylaceum,
+		SingleTime:                     single_time,
+		SingleWater:                    single_water,
+		ReplacementFlow:                replacement_flow,
+		PlasmaSeparator:                plasma_separator,
+		BilirubinAdsorptionColumn:      bilirubin_adsorption_column,
+		OxygenFlow:                     oxygen_flow,
+		OxygenUptake:                   oxygen_uptake,
+		OxygenTime:                     oxygen_time,
+		HemodialysisPipelines:          hemodialysis_pipelines,
+		HemodialysisPipelinesCount:     hemodialysis_pipelines_count,
+		PunctureNeedle:                 puncture_needle,
+		PunctureNeedleCount:            puncture_needle_count,
+		Epo:                            epo,
+		EpoCount:                       epo_count,
+		MaxUltrafiltrationRate:         max_ultrafiltration_rate,
+		AdminUserId:                    admin_user_id,
+		IsWater:                        is_water,
+		DrhyWater:                      drhy_water,
+		DryWaterHour:                   dry_water_hour,
+		WaterMachine:                   water_machine,
+		AddAmount:                      add_amount,
+		ReduceAmount:                   reduce_amount,
+		DialysisRemark:                 dialysis_remark,
+		PrescribingNumber:              prescribing_number,
+		TreatmentRemark:                treatment_remark,
+		PrescriptionSodium:             prescription_sodium,
+		StartSodium:                    start_sodium,
+		SodiumCurve:                    sodium_curve,
+		DialysisFluidFlow:              dialysis_fluid_flow,
+		SodiumBicarbonateFlow:          sodium_bicarbonate_flow,
+		PrescriptionWater:              prescription_water,
+		DialysisStrainer:               dialysis_strainer,
+		Chaptalization:                 chaptalization,
+		WarshCount:                     warsh_count,
+		WashingTime:                    washing_time,
+		BloodAccessPartId:              blood_access_part_id,
+		AnticoagulantWeichiHour:        anticoagulant_weichi_hour,
+		Dialyzate:                      dialyzate,
+		DialysisStrainerId:             dialysis_strainer_id,
+		DialysisIrrigationId:           dialysis_irrigation_id,
+		DialysisDialyszersId:           dialysis_dialyszers_id,
+		FirstSuper:                     first_super,
+		IsSequential:                   is_sequential,
+		Conduct:                        conduct,
+		SterilizationWater:             sterilization_water,
+		FiveGlucose:                    five_glucose,
+		FiftyGlucose:                   fifty_glucose,
+		MagnesiumSulfateInjection:      magnesium_sulfate_injection,
+		CalciumGluconate:               calcium_gluconate,
+		FivePotassiumChlorideInjection: five_potassium_chloride_injection,
+		TenPotassiumChlorideInjection:  ten_potassium_chloride_injection,
+		FiveSodiumBicarbonateInjection: five_sodium_bicarbonate_injection,
+		NewSty:                         new_sty,
+	}
+
+	if prescription.ModeId != 13 {
+		prescription.SterilizationWater = ""
+		prescription.FiveGlucose = ""
+		prescription.FiftyGlucose = ""
+		prescription.MagnesiumSulfateInjection = ""
+		prescription.CalciumGluconate = ""
+		prescription.FivePotassiumChlorideInjection = ""
+		prescription.TenPotassiumChlorideInjection = ""
+		prescription.FiveSodiumBicarbonateInjection = ""
+		prescription.NewSty = ""
 	}
 
 	if adminUserInfo.CurrentOrgId == 10721 {
@@ -541,6 +582,15 @@ func (c *DialysisApiController) PostPrescription() {
 		}
 	}
 
+	if adminUserInfo.CurrentOrgId == 10766 {
+		if prescription.ModeId == 2 || prescription.ModeId == 13 {
+			if prescription.ReplacementTotal == 0 {
+				prescription.ReplacementTotal = 15
+			}
+
+		}
+	}
+
 	//长沙南雅医院，自动生成抗凝剂的临时处方
 	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
 		if prescribing_number == 0 {
@@ -683,9 +733,9 @@ func (c *DialysisApiController) PostPrescription() {
 		prescription.Creater = adminUserInfo.AdminUser.Id
 
 		//针对河间咸得
-		if adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10090 || adminUserInfo.CurrentOrgId == 3877 {
+		if adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10090 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10766 {
 
-			if prescription.ModeId != 2 && prescription.ModeId != 5 && prescription.ModeId != 12 {
+			if prescription.ModeId != 2 && prescription.ModeId != 5 && prescription.ModeId != 12 && prescription.ModeId != 13 {
 
 				prescription.DisplaceLiquiPart = 0
 				prescription.DisplaceLiquiValue = 0
@@ -722,7 +772,7 @@ func (c *DialysisApiController) PostPrescription() {
 
 		err := service.AddSigleRecord(&prescription)
 
-		if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 {
+		if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 9478 {
 
 			monitorList, _ := service.GetMobilePatientMonitor(prescription.PatientId, prescription.RecordDate, prescription.UserOrgId)
 
@@ -733,8 +783,20 @@ func (c *DialysisApiController) PostPrescription() {
 				ultrafiltration_rate = (math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)) / 1000
 				var replacement_rate float64
 
-				//乘10 除10是为了保留一位小数
-				replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				if adminUserInfo.CurrentOrgId == 10721 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				}
+
+				if adminUserInfo.CurrentOrgId == 9478 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+				}
+
+				if adminUserInfo.CurrentOrgId == 10766 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+				}
 
 				var firstOpeateTime = monitorList[0].OperateTime
 				for _, item := range monitorList {
@@ -904,7 +966,7 @@ func (c *DialysisApiController) PostPrescription() {
 
 		updateErr := service.UpDateDialysisPrescription(&prescription)
 
-		if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 {
+		if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 9478 {
 
 			monitorList, _ := service.GetMobilePatientMonitor(prescription.PatientId, prescription.RecordDate, prescription.UserOrgId)
 
@@ -915,8 +977,20 @@ func (c *DialysisApiController) PostPrescription() {
 				ultrafiltration_rate = (math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)) / 1000
 				var replacement_rate float64
 
-				//乘10 除10是为了保留一位小数
-				replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				if adminUserInfo.CurrentOrgId == 10721 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				}
+
+				if adminUserInfo.CurrentOrgId == 9478 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+				}
+
+				if adminUserInfo.CurrentOrgId == 10766 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+				}
 
 				var firstOpeateTime = monitorList[0].OperateTime
 				for _, item := range monitorList {
@@ -1155,6 +1229,24 @@ func (c *DialysisApiController) PostSoulution() {
 
 	conduct := c.GetString("conduct")
 
+	sterilization_water := c.GetString("sterilization_water")
+
+	five_glucose := c.GetString("five_glucose")
+
+	fifty_glucose := c.GetString("fifty_glucose")
+
+	magnesium_sulfate_injection := c.GetString("magnesium_sulfate_injection")
+
+	calcium_gluconate := c.GetString("calcium_gluconate")
+
+	five_potassium_chloride_injection := c.GetString("five_potassium_chloride_injection")
+
+	ten_potassium_chloride_injection := c.GetString("ten_potassium_chloride_injection")
+
+	five_sodium_bicarbonate_injection := c.GetString("five_sodium_bicarbonate_injection")
+
+	new_sty := c.GetString("new_sty")
+
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -1299,60 +1391,81 @@ func (c *DialysisApiController) PostSoulution() {
 		Package:                    safe_package,
 		ALiquid:                    a_liquid,
 
-		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
-		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                      blood,
-		DialysisIrrigation:         dialysis_irrigation,
-		DialysisDialyszers:         dialysis_dialyszers,
-		AntioxidantCommodityName:   antioxidant_commodity_name,
-		DisplaceSpeed:              displace_speed,
-		Illness:                    illness,
-		Amylaceum:                  amylaceum,
-		SingleTime:                 single_time,
-		SingleWater:                single_water,
-		ReplacementFlow:            replacement_flow,
-		PlasmaSeparator:            plasma_separator,
-		BilirubinAdsorptionColumn:  bilirubin_adsorption_column,
-		OxygenTime:                 oxygen_time,
-		OxygenUptake:               oxygen_uptake,
-		OxygenFlow:                 oxygen_flow,
-		HemodialysisPipelines:      hemodialysis_pipelines,
-		HemodialysisPipelinesCount: hemodialysis_pipelines_count,
-		PunctureNeedle:             puncture_needle,
-		PunctureNeedleCount:        puncture_needle_count,
-		Epo:                        epo,
-		EpoCount:                   epo_count,
-		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
-		PreImpulse:                 preImpules,
-		AdminUserId:                admin_user_id,
-		IsWater:                    is_water,
-		DryWaterHour:               dry_water_hour,
-		DrhyWater:                  drhy_water,
-		WaterMachine:               water_machine,
-		AddAmount:                  add_amount,
-		ReduceAmount:               reduce_amount,
-		DialysisRemark:             dialysis_remark,
-		PrescribingNumber:          prescribing_number,
-		StartSodium:                start_sodium,
-		PrescriptionSodium:         prescription_sodium,
-		SodiumCurve:                sodium_curve,
-		TreatmentRemark:            treatment_remark,
-		DialysisFluidFlow:          dialysis_fluid_flow,
-		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
-		PrescriptionWater:          prescription_water,
-		DialysisStrainer:           dialysis_strainer,
-		Chaptalization:             chaptalization,
-		WarshCount:                 warsh_count,
-		WashingTime:                washing_time,
-		BloodAccessPartId:          blood_access_part_id,
-		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
-		Dialyzate:                  dialyzate,
-		DialysisDialyszersId:       dialysis_dialyszers_id,
-		DialysisIrrigationId:       dialysis_irrigation_id,
-		DialysisStrainerId:         dialysis_strainer_id,
-		FirstSuper:                 first_super,
-		IsSequential:               is_sequential,
-		Conduct:                    conduct,
+		AnticoagulantStopTimeHour:      anticoagulant_stop_time_hour,
+		AnticoagulantStopTimeMin:       anticoagulant_stop_time_min,
+		Blood:                          blood,
+		DialysisIrrigation:             dialysis_irrigation,
+		DialysisDialyszers:             dialysis_dialyszers,
+		AntioxidantCommodityName:       antioxidant_commodity_name,
+		DisplaceSpeed:                  displace_speed,
+		Illness:                        illness,
+		Amylaceum:                      amylaceum,
+		SingleTime:                     single_time,
+		SingleWater:                    single_water,
+		ReplacementFlow:                replacement_flow,
+		PlasmaSeparator:                plasma_separator,
+		BilirubinAdsorptionColumn:      bilirubin_adsorption_column,
+		OxygenTime:                     oxygen_time,
+		OxygenUptake:                   oxygen_uptake,
+		OxygenFlow:                     oxygen_flow,
+		HemodialysisPipelines:          hemodialysis_pipelines,
+		HemodialysisPipelinesCount:     hemodialysis_pipelines_count,
+		PunctureNeedle:                 puncture_needle,
+		PunctureNeedleCount:            puncture_needle_count,
+		Epo:                            epo,
+		EpoCount:                       epo_count,
+		MaxUltrafiltrationRate:         max_ultrafiltration_rate,
+		PreImpulse:                     preImpules,
+		AdminUserId:                    admin_user_id,
+		IsWater:                        is_water,
+		DryWaterHour:                   dry_water_hour,
+		DrhyWater:                      drhy_water,
+		WaterMachine:                   water_machine,
+		AddAmount:                      add_amount,
+		ReduceAmount:                   reduce_amount,
+		DialysisRemark:                 dialysis_remark,
+		PrescribingNumber:              prescribing_number,
+		StartSodium:                    start_sodium,
+		PrescriptionSodium:             prescription_sodium,
+		SodiumCurve:                    sodium_curve,
+		TreatmentRemark:                treatment_remark,
+		DialysisFluidFlow:              dialysis_fluid_flow,
+		SodiumBicarbonateFlow:          sodium_bicarbonate_flow,
+		PrescriptionWater:              prescription_water,
+		DialysisStrainer:               dialysis_strainer,
+		Chaptalization:                 chaptalization,
+		WarshCount:                     warsh_count,
+		WashingTime:                    washing_time,
+		BloodAccessPartId:              blood_access_part_id,
+		AnticoagulantWeichiHour:        anticoagulant_weichi_hour,
+		Dialyzate:                      dialyzate,
+		DialysisDialyszersId:           dialysis_dialyszers_id,
+		DialysisIrrigationId:           dialysis_irrigation_id,
+		DialysisStrainerId:             dialysis_strainer_id,
+		FirstSuper:                     first_super,
+		IsSequential:                   is_sequential,
+		Conduct:                        conduct,
+		SterilizationWater:             sterilization_water,
+		FiveGlucose:                    five_glucose,
+		FiftyGlucose:                   fifty_glucose,
+		MagnesiumSulfateInjection:      magnesium_sulfate_injection,
+		CalciumGluconate:               calcium_gluconate,
+		FivePotassiumChlorideInjection: five_potassium_chloride_injection,
+		TenPotassiumChlorideInjection:  ten_potassium_chloride_injection,
+		FiveSodiumBicarbonateInjection: five_sodium_bicarbonate_injection,
+		NewSty:                         new_sty,
+	}
+
+	if prescription.ModeId != 13 {
+		prescription.SterilizationWater = ""
+		prescription.FiveGlucose = ""
+		prescription.FiftyGlucose = ""
+		prescription.MagnesiumSulfateInjection = ""
+		prescription.CalciumGluconate = ""
+		prescription.FivePotassiumChlorideInjection = ""
+		prescription.TenPotassiumChlorideInjection = ""
+		prescription.FiveSodiumBicarbonateInjection = ""
+		prescription.NewSty = ""
 	}
 
 	if prescription.Anticoagulant == 0 {
@@ -1512,64 +1625,85 @@ func (c *DialysisApiController) PostSoulution() {
 		Bicarbonate:               bicarbonate,
 		Glucose:                   glucose,
 		// DryWeight:                 dry_weight,
-		DialysateFlow:              dialysate_flow,
-		DialysateTemperature:       dialysate_temperature,
-		Conductivity:               conductivity,
-		Remark:                     remark,
-		Status:                     1,
-		CreatedTime:                time.Now().Unix(),
-		UpdatedTime:                time.Now().Unix(),
-		DialysisDurationMinute:     dialysisDurationMinute,
-		DialysisDurationHour:       dialysisDurationHour,
-		TargetUltrafiltration:      targetUltrafiltration,
-		DialysateFormulation:       dialysateFormulation,
-		DialyzerPerfusionApparatus: dialyzerPerfusionApparatus,
-		BodyFluid:                  body_fluid,
-		SpecialMedicine:            special_medicine,
-		SpecialMedicineOther:       special_medicine_other,
-		DisplaceLiquiPart:          displace_liqui_part,
-		DisplaceLiquiValue:         displace_liqui_value,
-		BloodAccess:                blood_access,
-		Ultrafiltration:            ultrafiltration,
-		BodyFluidOther:             body_fluid_other,
-		ReplacementTotal:           replacement_total,
-		TargetKtv:                  target_ktv,
-		DialysisIrrigation:         dialysis_irrigation,
-		DialysisDialyszers:         dialysis_dialyszers,
-		HemodialysisPipelines:      hemodialysis_pipelines,
-		HemodialysisPipelinesCount: hemodialysis_pipelines_count,
-		PunctureNeedle:             puncture_needle,
-		PunctureNeedleCount:        puncture_needle_count,
-		Epo:                        epo,
-		EpoCount:                   epo_count,
-		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
-		OxygenUptake:               oxygen_uptake,
-		OxygenFlow:                 oxygen_flow,
-		OxygenTime:                 oxygen_time,
-		PreImpulse:                 preImpules,
-		SolutionStatus:             1,
-		DialysisRemark:             dialysis_remark,
-		PrescribingNumber:          prescribing_number,
-		StartSodium:                start_sodium,
-		PrescriptionSodium:         prescription_sodium,
-		SodiumCurve:                sodium_curve,
-		TreatmentRemark:            treatment_remark,
-		DialysisFluidFlow:          dialysis_fluid_flow,
-		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
-		PrescriptionWater:          prescribing_number,
-		DialysisStrainer:           dialysis_strainer,
-		Chaptalization:             chaptalization,
-		WarshCount:                 warsh_count,
-		WashingTime:                washing_time,
-		BloodAccessPartId:          blood_access_part_id,
-		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
-		Dialyzate:                  dialyzate,
-		DialysisDialyszersId:       dialysis_dialyszers_id,
-		DialysisIrrigationId:       dialysis_irrigation_id,
-		DialysisStrainerId:         dialysis_strainer_id,
-		FirstSuper:                 first_super,
-		IsSequential:               is_sequential,
-		Conduct:                    conduct,
+		DialysateFlow:                  dialysate_flow,
+		DialysateTemperature:           dialysate_temperature,
+		Conductivity:                   conductivity,
+		Remark:                         remark,
+		Status:                         1,
+		CreatedTime:                    time.Now().Unix(),
+		UpdatedTime:                    time.Now().Unix(),
+		DialysisDurationMinute:         dialysisDurationMinute,
+		DialysisDurationHour:           dialysisDurationHour,
+		TargetUltrafiltration:          targetUltrafiltration,
+		DialysateFormulation:           dialysateFormulation,
+		DialyzerPerfusionApparatus:     dialyzerPerfusionApparatus,
+		BodyFluid:                      body_fluid,
+		SpecialMedicine:                special_medicine,
+		SpecialMedicineOther:           special_medicine_other,
+		DisplaceLiquiPart:              displace_liqui_part,
+		DisplaceLiquiValue:             displace_liqui_value,
+		BloodAccess:                    blood_access,
+		Ultrafiltration:                ultrafiltration,
+		BodyFluidOther:                 body_fluid_other,
+		ReplacementTotal:               replacement_total,
+		TargetKtv:                      target_ktv,
+		DialysisIrrigation:             dialysis_irrigation,
+		DialysisDialyszers:             dialysis_dialyszers,
+		HemodialysisPipelines:          hemodialysis_pipelines,
+		HemodialysisPipelinesCount:     hemodialysis_pipelines_count,
+		PunctureNeedle:                 puncture_needle,
+		PunctureNeedleCount:            puncture_needle_count,
+		Epo:                            epo,
+		EpoCount:                       epo_count,
+		MaxUltrafiltrationRate:         max_ultrafiltration_rate,
+		OxygenUptake:                   oxygen_uptake,
+		OxygenFlow:                     oxygen_flow,
+		OxygenTime:                     oxygen_time,
+		PreImpulse:                     preImpules,
+		SolutionStatus:                 1,
+		DialysisRemark:                 dialysis_remark,
+		PrescribingNumber:              prescribing_number,
+		StartSodium:                    start_sodium,
+		PrescriptionSodium:             prescription_sodium,
+		SodiumCurve:                    sodium_curve,
+		TreatmentRemark:                treatment_remark,
+		DialysisFluidFlow:              dialysis_fluid_flow,
+		SodiumBicarbonateFlow:          sodium_bicarbonate_flow,
+		PrescriptionWater:              prescribing_number,
+		DialysisStrainer:               dialysis_strainer,
+		Chaptalization:                 chaptalization,
+		WarshCount:                     warsh_count,
+		WashingTime:                    washing_time,
+		BloodAccessPartId:              blood_access_part_id,
+		AnticoagulantWeichiHour:        anticoagulant_weichi_hour,
+		Dialyzate:                      dialyzate,
+		DialysisDialyszersId:           dialysis_dialyszers_id,
+		DialysisIrrigationId:           dialysis_irrigation_id,
+		DialysisStrainerId:             dialysis_strainer_id,
+		FirstSuper:                     first_super,
+		IsSequential:                   is_sequential,
+		Conduct:                        conduct,
+		SterilizationWater:             sterilization_water,
+		FiveGlucose:                    five_glucose,
+		FiftyGlucose:                   fifty_glucose,
+		MagnesiumSulfateInjection:      magnesium_sulfate_injection,
+		CalciumGluconate:               calcium_gluconate,
+		FivePotassiumChlorideInjection: five_potassium_chloride_injection,
+		TenPotassiumChlorideInjection:  ten_potassium_chloride_injection,
+		FiveSodiumBicarbonateInjection: five_sodium_bicarbonate_injection,
+		NewSty:                         new_sty,
+	}
+
+	if solution.ModeId != 13 {
+		solution.SterilizationWater = ""
+		solution.FiveGlucose = ""
+		solution.FiftyGlucose = ""
+		solution.MagnesiumSulfateInjection = ""
+		solution.CalciumGluconate = ""
+		solution.FivePotassiumChlorideInjection = ""
+		solution.TenPotassiumChlorideInjection = ""
+		solution.FiveSodiumBicarbonateInjection = ""
+		solution.NewSty = ""
 	}
 
 	if solution.Anticoagulant == 0 {
@@ -1585,9 +1719,9 @@ func (c *DialysisApiController) PostSoulution() {
 		}
 	}
 
-	if adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10090 || adminUserInfo.CurrentOrgId == 3877 {
+	if adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10090 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10766 {
 
-		if solution.ModeId != 2 && solution.ModeId != 5 && solution.ModeId != 12 {
+		if solution.ModeId != 2 && solution.ModeId != 5 && solution.ModeId != 12 && solution.ModeId != 13 {
 
 			solution.DisplaceLiquiPart = 0
 			solution.DisplaceLiquiValue = 0
@@ -1609,7 +1743,7 @@ func (c *DialysisApiController) PostSoulution() {
 
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
-	if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 {
+	if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 9478 {
 
 		monitorList, _ := service.GetMobilePatientMonitor(prescription.PatientId, prescription.RecordDate, prescription.UserOrgId)
 
@@ -1620,8 +1754,20 @@ func (c *DialysisApiController) PostSoulution() {
 			ultrafiltration_rate = (math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)) / 1000
 			var replacement_rate float64
 
-			//乘10 除10是为了保留一位小数
-			replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+			if adminUserInfo.CurrentOrgId == 10721 {
+				//乘10 除10是为了保留一位小数
+				replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+			}
+
+			if adminUserInfo.CurrentOrgId == 9478 {
+				//乘10 除10是为了保留一位小数
+				replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+			}
+
+			if adminUserInfo.CurrentOrgId == 10766 {
+				//乘10 除10是为了保留一位小数
+				replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+			}
 
 			var firstOpeateTime = monitorList[0].OperateTime
 			for _, item := range monitorList {
@@ -2879,13 +3025,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 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10480 || adminUserInfo.CurrentOrgId == 10293 || adminUserInfo.CurrentOrgId == 9478 {
+		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 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10480 || adminUserInfo.CurrentOrgId == 10293 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 {
 			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 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 && adminUserInfo.CurrentOrgId != 10723 && adminUserInfo.CurrentOrgId != 10480 && adminUserInfo.CurrentOrgId != 10293 && adminUserInfo.CurrentOrgId != 9478 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 && adminUserInfo.CurrentOrgId != 10723 && adminUserInfo.CurrentOrgId != 10480 && adminUserInfo.CurrentOrgId != 10293 && adminUserInfo.CurrentOrgId != 9478 && adminUserInfo.CurrentOrgId != 10744 && adminUserInfo.CurrentOrgId != 10766 {
 					dewater_amount = dewater_amount * 1000
 				}
 
@@ -3526,7 +3672,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10697 || adminUserInfo.CurrentOrgId == 9478 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10697 || adminUserInfo.CurrentOrgId == 9478 || adminUserInfo.CurrentOrgId == 10766 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
@@ -3553,7 +3699,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 
 		}
 
-		if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 {
+		if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10766 || adminUserInfo.CurrentOrgId == 9478 {
 
 			prescription, _ := service.GetTodayPrescription(patient, adminUserInfo.CurrentOrgId, recordDate.Unix())
 

controllers/doctors_api_controller.go

@@ -1723,6 +1723,106 @@ func (c *DoctorsApiController) GetLongScheduleAdvicesList() {
 
 	scheduals, err := service.MobileGetLongScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type, execution_frequency, keyword)
 
+	fmt.Println("admin_user_org", adminUserInfo.CurrentOrgId)
+	if adminUserInfo.CurrentOrgId == 10744 {
+		if len(scheduals) > 0 {
+			for _, it := range scheduals {
+
+				templatelist, _ := service.GetHisPrescriptionTemplateListTwety(it.UserOrgId, it.PatientId, it.ModeId)
+
+				if len(templatelist.HisPrescriptionInfoTemplateSix) > 0 {
+
+					for _, its := range templatelist.HisPrescriptionInfoTemplateSix {
+
+						if its.Type == 1 {
+							for _, item := range its.HisPrescriptionAdviceTemplate {
+
+								doctorAdvice := service.MDoctorAdviceVM{
+									ID:                    item.ID,
+									UserOrgId:             item.UserOrgId,
+									PatientId:             item.PatientId,
+									AdviceType:            item.AdviceType,
+									AdviceDate:            item.AdviceDate,
+									StartTime:             item.StartTime,
+									AdviceName:            item.AdviceName,
+									AdviceDesc:            item.AdviceDesc,
+									ReminderDate:          item.ReminderDate,
+									SingleDose:            item.SingleDose,
+									SingleDoseUnit:        item.SingleDoseUnit,
+									DrugSpec:              item.DrugSpec,
+									DrugSpecUnit:          item.DrugSpecUnit,
+									PrescribingNumber:     item.PrescribingNumber,
+									PrescribingNumberUnit: item.PrescribingNumberUnit,
+									DeliveryWay:           item.DeliveryWay,
+									ExecutionFrequency:    item.ExecutionFrequency,
+									AdviceDoctor:          item.AdviceDoctor,
+									Status:                item.Status,
+									CreatedTime:           item.CreatedTime,
+									UpdatedTime:           item.UpdatedTime,
+									AdviceAffirm:          item.AdviceAffirm,
+									Remark:                item.Remark,
+									StopTime:              item.StopTime,
+									StopReason:            item.StopReason,
+									StopDoctor:            item.StopDoctor,
+									StopState:             item.StopState,
+									ParentId:              item.ParentId,
+									ExecutionTime:         item.ExecutionTime,
+									ExecutionStaff:        item.ExecutionStaff,
+									ExecutionState:        item.ExecutionState,
+									Checker:               item.Checker,
+									RecordDate:            item.RecordDate,
+									DialysisOrderId:       item.DialysisOrderId,
+									CheckTime:             item.CheckTime,
+									CheckState:            item.CheckState,
+									RemindType:            item.RemindType,
+									FrequencyType:         item.FrequencyType,
+									DayCount:              item.DayCount,
+									WeekDay:               item.WeekDay,
+									TemplateId:            "",
+									Modifier:              item.Modifier,
+									IsMedicine:            0,
+									IsSettle:              0,
+								}
+								it.DoctorAdvices = append(it.DoctorAdvices, &doctorAdvice)
+							}
+						}
+
+						if its.Type == 2 {
+
+							for _, item := range its.HisPrescriptionProjectTemplateSeven {
+
+								if item.Type == 2 {
+									project := service.MDoctorAdviceVM{
+										ID:                 item.ID,
+										UserOrgId:          item.UserOrgId,
+										PatientId:          item.PatientId,
+										AdviceType:         2,
+										AdviceDate:         0,
+										StartTime:          item.Ctime,
+										AdviceName:         item.HisProject.ProjectName,
+										DeliveryWay:        item.DeliveryWay,
+										ExecutionFrequency: item.ExecutionFrequency,
+										Status:             item.Status,
+										Remark:             item.Remark,
+										FrequencyType:      item.FrequencyType,
+										DayCount:           item.DayCount,
+										WeekDay:            item.WeekDay,
+										TemplateId:         "",
+										IsMedicine:         0,
+										IsSettle:           0,
+									}
+									it.DoctorAdvices = append(it.DoctorAdvices, &project)
+								}
+
+							}
+						}
+
+					}
+				}
+			}
+		}
+	}
+
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 	if err != nil {
 		c.ErrorLog("获取排班信息失败:%v", err)

controllers/his_api_controller.go

@@ -3494,7 +3494,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10567 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 

controllers/his_config_api_controller.go

@@ -1,19 +1,20 @@
 package controllers
 
 import (
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/config"
 	"golang.org/x/sync/errgroup"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type HisConfigApiController struct {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -319,8 +319,8 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 10537 || adminUserInfo.Org.Id == 10667 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10731 {
-		if adminUserInfo.Org.Id != 10447 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 10537 || adminUserInfo.Org.Id == 10667 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10731 || adminUserInfo.Org.Id == 10766 {
+		if adminUserInfo.Org.Id != 10447 && adminUserInfo.Org.Id != 10766 {
 			dewater_amount = dewater_amount * 1000
 		}
 
@@ -985,7 +985,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		//针对患者称重两次没有数据的问题
-		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745 || adminUserInfo.Org.Id == 10697 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745 || adminUserInfo.Org.Id == 10697 || adminUserInfo.Org.Id == 10766 {
 
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -564,6 +564,19 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.ReplacementSpeed = replacement_speed
 	monitor.Dicarbonate = dicarbonate
 	err = service.UpdateMonitor(monitor)
+
+	if adminInfo.Org.Id == 10766 || adminInfo.Org.Id == 10164 {
+
+		firstMonitor, _ := service.GetFirstMonitor(patientID, monitor.MonitoringDate)
+		service.UpdateDialysisOrderTenty(patientID, monitor.MonitoringDate, firstMonitor.OperateTime, monitor.UserOrgId)
+		redis := service.RedisClient()
+		key := strconv.FormatInt(monitor.UserOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(monitor.MonitoringDate, 10) + ":dialysis_order"
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(monitor.UserOrgId, 10) + ":" + strconv.FormatInt(monitor.MonitoringDate, 10) + ":dialysis_orders_list_all"
+		//清空key 值
+		redis.Set(keyOne, "", time.Second)
+
+	}
 	//记录日志
 	byterequest, _ := json.Marshal(monitor)
 	monitorRecordLog := models.XtMonitorRecordLog{

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -233,4 +233,8 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/savelongadvicetemplate", &DialysisAPIController{}, "Post:SaveLongAdviceTemplate")
 
 	beego.Router("/m/api/stoplongadvice", &DialysisAPIController{}, "Get:StopLongAdvice")
+
+	beego.Router("/m/api/batchadvicechecklist", &DialysisAPIController{}, "Post:BatchAdviceCheckList")
+
+	beego.Router("/m/api/batchadviceexecutionlist", &DialysisAPIController{}, "Post:BatchAdviceExeCutionList")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3186,7 +3186,7 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 		}
 		service.ModifyHisPrescriptionProject(&project, ids)
 
-		if adminUserInfo.Org.Id == 10644 {
+		if adminUserInfo.Org.Id == 10644 || adminUserInfo.Org.Id == 9478 {
 			projectList, _ := service.GetHisPrescriptionProjectByIds(ids)
 			if len(projectList) > 0 {
 				for _, item := range projectList {
@@ -3878,9 +3878,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 || adminUserInfo.Org.Id == 9478 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 || adminUserInfo.Org.Id == 9478 || adminUserInfo.Org.Id == 10766 {
 
-			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 && adminUserInfo.Org.Id != 10752 && adminUserInfo.Org.Id != 9478 {
+			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 && adminUserInfo.Org.Id != 10752 && adminUserInfo.Org.Id != 9478 && adminUserInfo.Org.Id != 10766 {
 				dewater_amount = dewater_amount * 1000
 			}
 
@@ -4603,7 +4603,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	//针对孝昌康桥超滤率计算问题
-	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 || adminUserInfo.Org.Id == 9478 {
+	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 || adminUserInfo.Org.Id == 9478 || adminUserInfo.Org.Id == 10766 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {

controllers/patient_api_controller.go

@@ -4143,8 +4143,10 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 }
 
 func (c *PatientApiController) UpdateDoctorAdvice() {
+
 	patient, _ := c.GetInt64("patient", 0)
 	id, _ := c.GetInt64("id", 0)
+
 	if id <= 0 || patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -4153,6 +4155,7 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	advice, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
+
 	if advice.ID == 0 || advice.PatientId != patient {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 		return
@@ -4882,6 +4885,8 @@ func (c *PatientApiController) ProEducation() {
 }
 
 func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (code int) {
+
+	fmt.Println("actiong===============", action)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(data, &dataBody)
 	if err != nil {
@@ -5006,6 +5011,7 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		return
 	}
 	adviceName, _ := dataBody["advice_name"].(string)
+
 	if len(adviceName) == 0 {
 		utils.ErrorLog("len(advice_name) == 0")
 		code = enums.ErrorCodeParamWrong
@@ -5093,6 +5099,8 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 
 	if dataBody["push_start_time"] != nil && reflect.TypeOf(dataBody["push_start_time"]).String() == "string" {
 		push_start_time, _ := dataBody["push_start_time"].(string)
+
+		fmt.Println("push_start_time===========", push_start_time)
 		var startTime int64
 		if len(push_start_time) > 0 {
 			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", push_start_time+" 00:00:00", loc)
@@ -5530,6 +5538,51 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		blood_access_part_id := dataBody["blood_access_part_id"].(string)
 		solution.BloodAccessPartId = blood_access_part_id
 	}
+
+	if dataBody["sterilization_water"] != nil && reflect.TypeOf(dataBody["sterilization_water"]).String() == "string" {
+		sterilization_water := dataBody["sterilization_water"].(string)
+		solution.SterilizationWater = sterilization_water
+	}
+
+	if dataBody["five_glucose"] != nil && reflect.TypeOf(dataBody["five_glucose"]).String() == "string" {
+		five_glucose := dataBody["five_glucose"].(string)
+		solution.FiveGlucose = five_glucose
+	}
+
+	if dataBody["fifty_glucose"] != nil && reflect.TypeOf(dataBody["fifty_glucose"]).String() == "string" {
+		fifty_glucose := dataBody["fifty_glucose"].(string)
+		solution.FiftyGlucose = fifty_glucose
+	}
+
+	if dataBody["magnesium_sulfate_injection"] != nil && reflect.TypeOf(dataBody["magnesium_sulfate_injection"]).String() == "string" {
+		magnesium_sulfate_injection := dataBody["magnesium_sulfate_injection"].(string)
+		solution.MagnesiumSulfateInjection = magnesium_sulfate_injection
+	}
+
+	if dataBody["calcium_gluconate"] != nil && reflect.TypeOf(dataBody["calcium_gluconate"]).String() == "string" {
+		calcium_gluconate := dataBody["calcium_gluconate"].(string)
+		solution.CalciumGluconate = calcium_gluconate
+	}
+
+	if dataBody["five_potassium_chloride_injection"] != nil && reflect.TypeOf(dataBody["five_potassium_chloride_injection"]).String() == "string" {
+		five_potassium_chloride_injection := dataBody["five_potassium_chloride_injection"].(string)
+		solution.FivePotassiumChlorideInjection = five_potassium_chloride_injection
+	}
+
+	if dataBody["ten_potassium_chloride_injection"] != nil && reflect.TypeOf(dataBody["ten_potassium_chloride_injection"]).String() == "string" {
+		ten_potassium_chloride_injection := dataBody["ten_potassium_chloride_injection"].(string)
+		solution.TenPotassiumChlorideInjection = ten_potassium_chloride_injection
+	}
+
+	if dataBody["five_sodium_bicarbonate_injection"] != nil && reflect.TypeOf(dataBody["five_sodium_bicarbonate_injection"]).String() == "string" {
+		five_sodium_bicarbonate_injection := dataBody["five_sodium_bicarbonate_injection"].(string)
+		solution.FiveSodiumBicarbonateInjection = five_sodium_bicarbonate_injection
+	}
+
+	if dataBody["new_sty"] != nil && reflect.TypeOf(dataBody["new_sty"]).String() == "string" {
+		new_sty := dataBody["new_sty"].(string)
+		solution.NewSty = new_sty
+	}
 	return
 }
 

controllers/schedule_api_controller.go

@@ -4859,7 +4859,7 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	}
 
 	//查询排班里面的空透析器
-	if adminInfo.CurrentOrgId == 10375 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 9538 || adminInfo.CurrentOrgId == 10742 || adminInfo.CurrentOrgId == 10387 || adminInfo.CurrentOrgId == 10740 {
+	if adminInfo.CurrentOrgId == 10375 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 9538 || adminInfo.CurrentOrgId == 10742 || adminInfo.CurrentOrgId == 10387 || adminInfo.CurrentOrgId == 10740 || adminInfo.CurrentOrgId == 10766 || adminInfo.CurrentOrgId == 9478 {
 
 		schedulesFive, _ := service.GetWeekScheduleFive(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 

controllers/sign_api_controller.go

@@ -1582,13 +1582,38 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//}
 
 	//tx.Commit()
-	schedule, _ := service.CheckSchedule()
+	//schedule, _ := service.CheckSchedule()
+	//
+	//if len(schedule) > 0 {
+	//	for _, item := range schedule {
+	//		fmt.Println("item.p------------------", item.PatientId)
+	//
+	//		service.UpdateScheduleByIdOneList(item.ID, item.ScheduleDate, item.ScheduleType, item.ScheduleWeek, item.Status, item.PatientId, item.PartitionId, item.BedId, item.DialysisMachineName, item.UserOrgId, item.ModeId)
+	//	}
+	//}
+
+	list, _ := service.GetPatientVascularAccessByUser(10766)
 
-	if len(schedule) > 0 {
-		for _, item := range schedule {
-			fmt.Println("item.p------------------", item.PatientId)
+	if len(list) > 0 {
+		for _, item := range list {
+			var blood_access int64
+			if item.BloodAccessPartOperaId == "带隧道带绦纶套颈内静脉导管" {
+				blood_access = 3
+			}
+			if item.BloodAccessPartOperaId == "无涤纶套腋静脉导管" {
+				blood_access = 37
+			}
+			if item.BloodAccessPartOperaId == "无绦纶套股静脉导管" {
+				blood_access = 6
+			}
+			if item.BloodAccessPartOperaId == "无绦纶套颈内静脉导管" {
+				blood_access = 8
+			}
+			if item.BloodAccessPartOperaId == "自体动静脉内瘘" {
+				blood_access = 11
+			}
 
-			service.UpdateScheduleByIdOneList(item.ID, item.ScheduleDate, item.ScheduleType, item.ScheduleWeek, item.Status, item.PatientId, item.PartitionId, item.BedId, item.DialysisMachineName, item.UserOrgId, item.ModeId)
+			service.UpdateDialysisPatientSolution(item.PatientId, item.BloodAccessPartId, blood_access)
 		}
 	}
 

go.mod

@@ -1,6 +1,6 @@
 module XT_New
 
-go 1.22.2
+go 1.23
 
 require (
 	github.com/astaxie/beego v1.12.3
@@ -9,7 +9,7 @@ require (
 	github.com/mozillazg/go-pinyin v0.20.0
 	github.com/robfig/cron v1.2.0
 	github.com/shopspring/decimal v1.4.0
-	golang.org/x/sync v0.8.0
+	golang.org/x/sync v0.7.0
 )
 
 require (
@@ -43,12 +43,12 @@ require (
 	github.com/ulikunitz/xz v0.5.9 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
-	github.com/xuri/excelize/v2 v2.9.0 // indirect
+	github.com/xuri/excelize/v2 v2.8.1 // indirect
 	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
-	golang.org/x/crypto v0.28.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/crypto v0.25.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
 	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/protobuf v1.23.0 // indirect
 	gopkg.in/yaml.v2 v2.2.8 // indirect
 )

models/patient_models.go

@@ -291,110 +291,119 @@ type DialysisPrescription struct {
 	BloodFilter               int64   `gorm:"column:blood_filter" json:"blood_filter"`
 	PerfusionApparatus        int64   `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus"`
 	//DryWeight                 float64 `gorm:"column:dry_weight" json:"dry_weight"`
-	VascularAccessMode         int64         `gorm:"column:vascular_access_mode" json:"vascular_access_mode"`
-	VascularAccess             int64         `gorm:"column:vascular_access" json:"vascular_access"`
-	BloodFlowVolume            float64       `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
-	DialysateFlow              float64       `gorm:"column:dialysate_flow" json:"dialysate_flow"`
-	DisplaceLiqui              float64       `gorm:"column:displace_liqui" json:"displace_liqui"`
-	Kalium                     float64       `gorm:"column:kalium" json:"kalium"`
-	Sodium                     float64       `gorm:"column:sodium" json:"sodium"`
-	Calcium                    float64       `gorm:"column:calcium" json:"calcium"`
-	Bicarbonate                float64       `gorm:"column:bicarbonate" json:"bicarbonate"`
-	Glucose                    float64       `gorm:"column:glucose" json:"glucose"`
-	DialysateTemperature       float64       `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
-	Conductivity               float64       `gorm:"column:conductivity" json:"conductivity"`
-	PrescriptionDoctor         int64         `gorm:"column:prescription_doctor" json:"prescription_doctor"`
-	Remark                     string        `gorm:"column:remark" json:"remark"`
-	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"`
-	RecordDate                 int64         `gorm:"column:record_date" json:"record_date"`
-	RecordId                   int64         `gorm:"column:record_id" json:"record_id"`
-	Creater                    int64         `gorm:"column:creater" json:"creater"`
-	Modifier                   int64         `gorm:"column:modifier" json:"modifier"`
-	DialysisDurationHour       int64         `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour"`
-	DialysisDurationMinute     int64         `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute"`
-	DialysateFormulation       int64         `gorm:"column:dialysate_formulation" json:"dialysate_formulation"`
-	TargetUltrafiltration      float64       `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
-	DialyzerPerfusionApparatus string        `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
-	BodyFluid                  int64         `gorm:"column:body_fluid" json:"body_fluid"`
-	SpecialMedicine            int64         `gorm:"column:special_medicine" json:"special_medicine"`
-	SpecialMedicineOther       string        `gorm:"column:special_medicine_other" json:"special_medicine_other"`
-	DisplaceLiquiPart          int64         `gorm:"column:displace_liqui_part" json:"displace_liqui_part"`
-	DisplaceLiquiValue         float64       `gorm:"column:displace_liqui_value" json:"displace_liqui_value"`
-	BloodAccess                int64         `gorm:"column:blood_access" json:"blood_access"`
-	Ultrafiltration            float64       `gorm:"column:ultrafiltration" json:"ultrafiltration"`
-	BodyFluidOther             string        `gorm:"column:body_fluid_other" json:"body_fluid_other"`
-	Niprocart                  int64         `gorm:"column:niprocart" json:"niprocart"`
-	Jms                        int64         `gorm:"column:jms" json:"jms"`
-	FistulaNeedleSet           int64         `gorm:"column:fistula_needle_set" json:"fistula_needle_set"`
-	FistulaNeedleSet16         int64         `gorm:"column:fistula_needle_set_16" json:"fistula_needle_set_16"`
-	Hemoperfusion              int64         `gorm:"column:hemoperfusion" json:"hemoperfusion"`
-	DialyserSterilised         int64         `gorm:"column:dialyser_sterilised" json:"dialyser_sterilised"`
-	Filtryzer                  int64         `gorm:"column:filtryzer" json:"filtryzer"`
-	TargetKtv                  float64       `gorm:"column:target_ktv" json:"target_ktv"`
-	Dialyzers                  int64         `gorm:"column:dialyzers" json:"dialyzers"`
-	Injector                   int64         `gorm:"column:injector" json:"injector"`
-	Bloodlines                 int64         `gorm:"column:bloodlines" json:"bloodlines"`
-	TubingHemodialysis         int64         `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis"`
-	Package                    int64         `gorm:"column:package" json:"package"`
-	ALiquid                    int64         `gorm:"column:a_liquid" json:"a_liquid"`
-	QCPatients                 QCPatients    `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientID;"`
-	UserAdminRole              UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:Creater;"`
-	PreImpulse                 float64       `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
-	AnticoagulantStopTimeMin   int64         `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
-	AnticoagulantStopTimeHour  int64         `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
-	Blood                      string        `gorm:"column:blood" json:"blood"`
-	DialysisDialyszers         string        `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
-	DialysisIrrigation         string        `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
-	AntioxidantCommodityName   string        `gorm:"column:antioxidant_commodity_name" json:"antioxidant_commodity_name" form:"antioxidant_commodity_name"`
-	DisplaceSpeed              string        `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
-	Illness                    int64         `gorm:"column:illness" json:"illness" form:"illness"`
-	Amylaceum                  string        `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
-	SingleTime                 string        `gorm:"column:single_time" json:"single_time" form:"single_time"`
-	SingleWater                string        `gorm:"column:single_water" json:"single_water" form:"single_water"`
-	ReplacementFlow            string        `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
-	PlasmaSeparator            string        `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
-	BilirubinAdsorptionColumn  string        `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
-	OxygenUptake               int64         `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
-	OxygenFlow                 string        `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
-	OxygenTime                 string        `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
-	HemodialysisPipelines      string        `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
-	HemodialysisPipelinesCount float64       `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
-	PunctureNeedle             string        `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
-	PunctureNeedleCount        float64       `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
-	Epo                        string        `gorm:"column:epo" json:"epo" form:"epo"`
-	EpoCount                   float64       `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
-	MaxUltrafiltrationRate     float64       `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
-	AdminUserId                int64         `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	IsWater                    int64         `gorm:"column:is_water" json:"is_water" form:"is_water"`
-	DrhyWater                  string        `gorm:"column:drhy_water" json:"drhy_water" form:"drhy_water"`
-	DryWaterHour               string        `gorm:"column:dry_water_hour" json:"dry_water_hour" form:"dry_water_hour"`
-	WaterMachine               string        `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
-	AddAmount                  float64       `gorm:"column:add_amount" json:"add_amount" form:"add_amount"`
-	ReduceAmount               float64       `gorm:"column:reduce_amount" json:"reduce_amount" form:"reduce_amount"`
-	DialysisRemark             string        `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
-	PrescribingNumber          float64       `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	TreatmentRemark            string        `gorm:"column:treatment_remark" json:"treatment_remark" form:"treatment_remark"`
-	PrescriptionSodium         string        `gorm:"column:prescription_sodium" json:"prescription_sodium" form:"prescription_sodium"`
-	StartSodium                string        `gorm:"column:start_sodium" json:"start_sodium" form:"start_sodium"`
-	SodiumCurve                string        `gorm:"column:sodium_curve" json:"sodium_curve" form:"sodium_curve"`
-	DialysisFluidFlow          string        `gorm:"column:dialysis_fluid_flow" json:"dialysis_fluid_flow" form:"dialysis_fluid_flow"`
-	SodiumBicarbonateFlow      string        `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
-	PrescriptionWater          float64       `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
-	DialysisStrainer           string        `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
-	Chaptalization             string        `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
-	WarshCount                 string        `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
-	WashingTime                string        `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
-	BloodAccessPartId          string        `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
-	AnticoagulantWeichiHour    string        `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
-	Dialyzate                  string        `gorm:"column:dialyzate" json:"dialyzate" form:"dialyzate"`
-	DialysisDialyszersId       int64         `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
-	DialysisStrainerId         int64         `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
-	DialysisIrrigationId       int64         `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
-	FirstSuper                 int64         `gorm:"column:first_super" json:"first_super" form:"first_super"`
-	IsSequential               int64         `gorm:"column:is_sequential" json:"is_sequential" form:"is_sequential"`
-	Conduct                    string        `gorm:"column:conduct" json:"conduct" form:"conduct"`
+	VascularAccessMode             int64         `gorm:"column:vascular_access_mode" json:"vascular_access_mode"`
+	VascularAccess                 int64         `gorm:"column:vascular_access" json:"vascular_access"`
+	BloodFlowVolume                float64       `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
+	DialysateFlow                  float64       `gorm:"column:dialysate_flow" json:"dialysate_flow"`
+	DisplaceLiqui                  float64       `gorm:"column:displace_liqui" json:"displace_liqui"`
+	Kalium                         float64       `gorm:"column:kalium" json:"kalium"`
+	Sodium                         float64       `gorm:"column:sodium" json:"sodium"`
+	Calcium                        float64       `gorm:"column:calcium" json:"calcium"`
+	Bicarbonate                    float64       `gorm:"column:bicarbonate" json:"bicarbonate"`
+	Glucose                        float64       `gorm:"column:glucose" json:"glucose"`
+	DialysateTemperature           float64       `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
+	Conductivity                   float64       `gorm:"column:conductivity" json:"conductivity"`
+	PrescriptionDoctor             int64         `gorm:"column:prescription_doctor" json:"prescription_doctor"`
+	Remark                         string        `gorm:"column:remark" json:"remark"`
+	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"`
+	RecordDate                     int64         `gorm:"column:record_date" json:"record_date"`
+	RecordId                       int64         `gorm:"column:record_id" json:"record_id"`
+	Creater                        int64         `gorm:"column:creater" json:"creater"`
+	Modifier                       int64         `gorm:"column:modifier" json:"modifier"`
+	DialysisDurationHour           int64         `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour"`
+	DialysisDurationMinute         int64         `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute"`
+	DialysateFormulation           int64         `gorm:"column:dialysate_formulation" json:"dialysate_formulation"`
+	TargetUltrafiltration          float64       `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
+	DialyzerPerfusionApparatus     string        `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	BodyFluid                      int64         `gorm:"column:body_fluid" json:"body_fluid"`
+	SpecialMedicine                int64         `gorm:"column:special_medicine" json:"special_medicine"`
+	SpecialMedicineOther           string        `gorm:"column:special_medicine_other" json:"special_medicine_other"`
+	DisplaceLiquiPart              int64         `gorm:"column:displace_liqui_part" json:"displace_liqui_part"`
+	DisplaceLiquiValue             float64       `gorm:"column:displace_liqui_value" json:"displace_liqui_value"`
+	BloodAccess                    int64         `gorm:"column:blood_access" json:"blood_access"`
+	Ultrafiltration                float64       `gorm:"column:ultrafiltration" json:"ultrafiltration"`
+	BodyFluidOther                 string        `gorm:"column:body_fluid_other" json:"body_fluid_other"`
+	Niprocart                      int64         `gorm:"column:niprocart" json:"niprocart"`
+	Jms                            int64         `gorm:"column:jms" json:"jms"`
+	FistulaNeedleSet               int64         `gorm:"column:fistula_needle_set" json:"fistula_needle_set"`
+	FistulaNeedleSet16             int64         `gorm:"column:fistula_needle_set_16" json:"fistula_needle_set_16"`
+	Hemoperfusion                  int64         `gorm:"column:hemoperfusion" json:"hemoperfusion"`
+	DialyserSterilised             int64         `gorm:"column:dialyser_sterilised" json:"dialyser_sterilised"`
+	Filtryzer                      int64         `gorm:"column:filtryzer" json:"filtryzer"`
+	TargetKtv                      float64       `gorm:"column:target_ktv" json:"target_ktv"`
+	Dialyzers                      int64         `gorm:"column:dialyzers" json:"dialyzers"`
+	Injector                       int64         `gorm:"column:injector" json:"injector"`
+	Bloodlines                     int64         `gorm:"column:bloodlines" json:"bloodlines"`
+	TubingHemodialysis             int64         `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis"`
+	Package                        int64         `gorm:"column:package" json:"package"`
+	ALiquid                        int64         `gorm:"column:a_liquid" json:"a_liquid"`
+	QCPatients                     QCPatients    `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientID;"`
+	UserAdminRole                  UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:Creater;"`
+	PreImpulse                     float64       `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
+	AnticoagulantStopTimeMin       int64         `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
+	AnticoagulantStopTimeHour      int64         `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
+	Blood                          string        `gorm:"column:blood" json:"blood"`
+	DialysisDialyszers             string        `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation             string        `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	AntioxidantCommodityName       string        `gorm:"column:antioxidant_commodity_name" json:"antioxidant_commodity_name" form:"antioxidant_commodity_name"`
+	DisplaceSpeed                  string        `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
+	Illness                        int64         `gorm:"column:illness" json:"illness" form:"illness"`
+	Amylaceum                      string        `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
+	SingleTime                     string        `gorm:"column:single_time" json:"single_time" form:"single_time"`
+	SingleWater                    string        `gorm:"column:single_water" json:"single_water" form:"single_water"`
+	ReplacementFlow                string        `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
+	PlasmaSeparator                string        `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
+	BilirubinAdsorptionColumn      string        `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
+	OxygenUptake                   int64         `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
+	OxygenFlow                     string        `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
+	OxygenTime                     string        `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
+	HemodialysisPipelines          string        `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount     float64       `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle                 string        `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount            float64       `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                            string        `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                       float64       `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	MaxUltrafiltrationRate         float64       `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	AdminUserId                    int64         `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	IsWater                        int64         `gorm:"column:is_water" json:"is_water" form:"is_water"`
+	DrhyWater                      string        `gorm:"column:drhy_water" json:"drhy_water" form:"drhy_water"`
+	DryWaterHour                   string        `gorm:"column:dry_water_hour" json:"dry_water_hour" form:"dry_water_hour"`
+	WaterMachine                   string        `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
+	AddAmount                      float64       `gorm:"column:add_amount" json:"add_amount" form:"add_amount"`
+	ReduceAmount                   float64       `gorm:"column:reduce_amount" json:"reduce_amount" form:"reduce_amount"`
+	DialysisRemark                 string        `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
+	PrescribingNumber              float64       `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	TreatmentRemark                string        `gorm:"column:treatment_remark" json:"treatment_remark" form:"treatment_remark"`
+	PrescriptionSodium             string        `gorm:"column:prescription_sodium" json:"prescription_sodium" form:"prescription_sodium"`
+	StartSodium                    string        `gorm:"column:start_sodium" json:"start_sodium" form:"start_sodium"`
+	SodiumCurve                    string        `gorm:"column:sodium_curve" json:"sodium_curve" form:"sodium_curve"`
+	DialysisFluidFlow              string        `gorm:"column:dialysis_fluid_flow" json:"dialysis_fluid_flow" form:"dialysis_fluid_flow"`
+	SodiumBicarbonateFlow          string        `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
+	PrescriptionWater              float64       `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
+	DialysisStrainer               string        `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	Chaptalization                 string        `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
+	WarshCount                     string        `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
+	WashingTime                    string        `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
+	BloodAccessPartId              string        `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	AnticoagulantWeichiHour        string        `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
+	Dialyzate                      string        `gorm:"column:dialyzate" json:"dialyzate" form:"dialyzate"`
+	DialysisDialyszersId           int64         `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
+	DialysisStrainerId             int64         `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
+	DialysisIrrigationId           int64         `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
+	FirstSuper                     int64         `gorm:"column:first_super" json:"first_super" form:"first_super"`
+	IsSequential                   int64         `gorm:"column:is_sequential" json:"is_sequential" form:"is_sequential"`
+	Conduct                        string        `gorm:"column:conduct" json:"conduct" form:"conduct"`
+	SterilizationWater             string        `gorm:"column:sterilization_water" json:"sterilization_water" form:"sterilization_water"`
+	FiveGlucose                    string        `gorm:"column:five_glucose" json:"five_glucose" form:"five_glucose"`
+	FiftyGlucose                   string        `gorm:"column:fifty_glucose" json:"fifty_glucose" form:"fifty_glucose"`
+	MagnesiumSulfateInjection      string        `gorm:"column:magnesium_sulfate_injection" json:"magnesium_sulfate_injection" form:"magnesium_sulfate_injection"`
+	CalciumGluconate               string        `gorm:"column:calcium_gluconate" json:"calcium_gluconate" form:"calcium_gluconate"`
+	FivePotassiumChlorideInjection string        `gorm:"column:five_potassium_chloride_injection" json:"five_potassium_chloride_injection" form:"five_potassium_chloride_injection"`
+	TenPotassiumChlorideInjection  string        `gorm:"column:ten_potassium_chloride_injection" json:"ten_potassium_chloride_injection" form:"ten_potassium_chloride_injection"`
+	FiveSodiumBicarbonateInjection string        `gorm:"column:five_sodium_bicarbonate_injection" json:"five_sodium_bicarbonate_injection" form:"five_sodium_bicarbonate_injection"`
+	NewSty                         string        `gorm:"column:new_sty" json:"new_sty" form:"new_sty"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -539,108 +548,117 @@ func (DialysisAssesmentBefor) TableName() string {
 }
 
 type DialysisSolution struct {
-	ID                         int64   `gorm:"column:id" json:"id" form:"id"`
-	Name                       string  `gorm:"column:name" json:"name" form:"name"`
-	SubName                    string  `gorm:"column:sub_name" json:"sub_name" form:"sub_name"`
-	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ParentId                   int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
-	Type                       int64   `gorm:"column:type" json:"type" form:"type"`
-	Period                     string  `gorm:"column:period" json:"period" form:"period"`
-	Times                      string  `gorm:"column:times" json:"times" form:"times"`
-	Anticoagulant              int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
-	AnticoagulantShouji        float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
-	AnticoagulantWeichi        float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
-	AnticoagulantZongliang     float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
-	AnticoagulantGaimingcheng  string  `gorm:"column:anticoagulant_gaimingcheng" json:"anticoagulant_gaimingcheng" form:"anticoagulant_gaimingcheng"`
-	AnticoagulantGaijiliang    string  `gorm:"column:anticoagulant_gaijiliang" json:"anticoagulant_gaijiliang" form:"anticoagulant_gaijiliang"`
-	ModeName                   string  `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
-	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	DialysisDuration           float64 `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
-	ReplacementWay             int64   `gorm:"column:replacement_way" json:"replacement_way" form:"replacement_way"`
-	HemodialysisMachine        int64   `gorm:"column:hemodialysis_machine" json:"hemodialysis_machine" form:"hemodialysis_machine"`
-	BloodFilter                int64   `gorm:"column:blood_filter" json:"blood_filter" form:"blood_filter"`
-	PerfusionApparatus         int64   `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus" form:"perfusion_apparatus"`
-	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
-	Dewater                    float64 `gorm:"column:dewater" json:"dewater" form:"dewater"`
-	DisplaceLiqui              float64 `gorm:"column:displace_liqui" json:"displace_liqui" form:"displace_liqui"`
-	Glucose                    float64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
-	DialysateFlow              float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	Kalium                     float64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
-	Sodium                     float64 `gorm:"column:sodium" json:"sodium" form:"sodium"`
-	Calcium                    float64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
-	Bicarbonate                float64 `gorm:"column:bicarbonate" json:"bicarbonate" form:"bicarbonate"`
-	Doctor                     int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	FirstDialysis              int64   `gorm:"column:first_dialysis" json:"first_dialysis" form:"first_dialysis"`
-	Remark                     string  `gorm:"column:remark" json:"remark" form:"remark"`
-	InitiateMode               int64   `gorm:"column:initiate_mode" json:"initiate_mode" form:"initiate_mode"`
-	AffirmState                int64   `gorm:"column:affirm_state" json:"affirm_state" form:"affirm_state"`
-	UseState                   int64   `gorm:"column:use_state" json:"use_state" form:"use_state"`
-	Status                     int64   `gorm:"column:status" json:"status" form:"status"`
-	RegistrarsId               int64   `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
-	CreatedTime                int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime                int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	SolutionType               int64   `gorm:"column:solution_type" json:"solution_type" form:"solution_type"`
-	DialysateTemperature       float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature" form:"dialysate_temperature"`
-	Conductivity               float64 `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
-	BodyFluid                  int64   `gorm:"column:body_fluid" json:"body_fluid"`
-	SpecialMedicine            int64   `gorm:"column:special_medicine" json:"special_medicine"`
-	SpecialMedicineOther       string  `gorm:"column:special_medicine_other" json:"special_medicine_other"`
-	DisplaceLiquiPart          int64   `gorm:"column:displace_liqui_part" json:"displace_liqui_part"`
-	DisplaceLiquiValue         float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value"`
-	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access"`
-	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration"`
-	DialysisDurationHour       int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour" form:"dialysis_duration_hour"`
-	DialysisDurationMinute     int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute" form:"dialysis_duration_minute"`
-	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
-	DialysateFormulation       int64   `gorm:"column:dialysate_formulation" json:"dialysate_formulation" form:"dialysate_formulation"`
-	Dialyzer                   int64   `gorm:"column:dialyzer" json:"dialyzer" form:"dialysate_formulation"`
-	ReplacementTotal           float64 `gorm:"column:replacement_total" json:"replacement_total"`
-	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
-	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other"`
-	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv"`
-	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
-	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
-	AntioxidantCommodityName   string  `gorm:"column:antioxidant_commodity_name" json:"antioxidant_commodity_name" form:"antioxidant_commodity_name"`
-	DisplaceSpeed              string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
-	Illness                    int64   `gorm:"column:illness" json:"illness" form:"illness"`
-	Amylaceum                  string  `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
-	PlasmaSeparator            string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
-	BilirubinAdsorptionColumn  string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
-	OxygenUptake               int64   `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
-	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
-	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
-	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
-	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
-	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
-	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
-	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
-	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
-	MaxUltrafiltrationRate     float64 `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
-	PreImpulse                 float64 `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
-	SolutionStatus             int64   `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
-	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
-	PrescribingNumber          float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	TreatmentRemark            string  `gorm:"column:treatment_remark" json:"treatment_remark" form:"treatment_remark"`
-	PrescriptionSodium         string  `gorm:"column:prescription_sodium" json:"prescription_sodium" form:"prescription_sodium"`
-	StartSodium                string  `gorm:"column:start_sodium" json:"start_sodium" form:"start_sodium"`
-	SodiumCurve                string  `gorm:"column:sodium_curve" json:"sodium_curve" form:"sodium_curve"`
-	DialysisFluidFlow          string  `gorm:"column:dialysis_fluid_flow" json:"dialysis_fluid_flow" form:"dialysis_fluid_flow"`
-	SodiumBicarbonateFlow      string  `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
-	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
-	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
-	Chaptalization             string  `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
-	WarshCount                 string  `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
-	WashingTime                string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
-	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
-	AnticoagulantWeichiHour    string  `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
-	Dialyzate                  string  `gorm:"column:dialyzate" json:"dialyzate" form:"dialyzate"`
-	DialysisDialyszersId       int64   `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
-	DialysisStrainerId         int64   `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
-	DialysisIrrigationId       int64   `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
-	FirstSuper                 int64   `gorm:"column:first_super" json:"first_super" form:"first_super"`
-	IsSequential               int64   `gorm:"column:is_sequential" json:"is_sequential" form:"is_sequential"`
-	Conduct                    string  `gorm:"column:conduct" json:"conduct" form:"conduct"`
+	ID                             int64   `gorm:"column:id" json:"id" form:"id"`
+	Name                           string  `gorm:"column:name" json:"name" form:"name"`
+	SubName                        string  `gorm:"column:sub_name" json:"sub_name" form:"sub_name"`
+	UserOrgId                      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                      int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ParentId                       int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	Type                           int64   `gorm:"column:type" json:"type" form:"type"`
+	Period                         string  `gorm:"column:period" json:"period" form:"period"`
+	Times                          string  `gorm:"column:times" json:"times" form:"times"`
+	Anticoagulant                  int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	AnticoagulantShouji            float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
+	AnticoagulantWeichi            float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
+	AnticoagulantZongliang         float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+	AnticoagulantGaimingcheng      string  `gorm:"column:anticoagulant_gaimingcheng" json:"anticoagulant_gaimingcheng" form:"anticoagulant_gaimingcheng"`
+	AnticoagulantGaijiliang        string  `gorm:"column:anticoagulant_gaijiliang" json:"anticoagulant_gaijiliang" form:"anticoagulant_gaijiliang"`
+	ModeName                       string  `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
+	ModeId                         int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	DialysisDuration               float64 `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
+	ReplacementWay                 int64   `gorm:"column:replacement_way" json:"replacement_way" form:"replacement_way"`
+	HemodialysisMachine            int64   `gorm:"column:hemodialysis_machine" json:"hemodialysis_machine" form:"hemodialysis_machine"`
+	BloodFilter                    int64   `gorm:"column:blood_filter" json:"blood_filter" form:"blood_filter"`
+	PerfusionApparatus             int64   `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus" form:"perfusion_apparatus"`
+	BloodFlowVolume                float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	Dewater                        float64 `gorm:"column:dewater" json:"dewater" form:"dewater"`
+	DisplaceLiqui                  float64 `gorm:"column:displace_liqui" json:"displace_liqui" form:"displace_liqui"`
+	Glucose                        float64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
+	DialysateFlow                  float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Kalium                         float64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	Sodium                         float64 `gorm:"column:sodium" json:"sodium" form:"sodium"`
+	Calcium                        float64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
+	Bicarbonate                    float64 `gorm:"column:bicarbonate" json:"bicarbonate" form:"bicarbonate"`
+	Doctor                         int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	FirstDialysis                  int64   `gorm:"column:first_dialysis" json:"first_dialysis" form:"first_dialysis"`
+	Remark                         string  `gorm:"column:remark" json:"remark" form:"remark"`
+	InitiateMode                   int64   `gorm:"column:initiate_mode" json:"initiate_mode" form:"initiate_mode"`
+	AffirmState                    int64   `gorm:"column:affirm_state" json:"affirm_state" form:"affirm_state"`
+	UseState                       int64   `gorm:"column:use_state" json:"use_state" form:"use_state"`
+	Status                         int64   `gorm:"column:status" json:"status" form:"status"`
+	RegistrarsId                   int64   `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	CreatedTime                    int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                    int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	SolutionType                   int64   `gorm:"column:solution_type" json:"solution_type" form:"solution_type"`
+	DialysateTemperature           float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature" form:"dialysate_temperature"`
+	Conductivity                   float64 `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
+	BodyFluid                      int64   `gorm:"column:body_fluid" json:"body_fluid"`
+	SpecialMedicine                int64   `gorm:"column:special_medicine" json:"special_medicine"`
+	SpecialMedicineOther           string  `gorm:"column:special_medicine_other" json:"special_medicine_other"`
+	DisplaceLiquiPart              int64   `gorm:"column:displace_liqui_part" json:"displace_liqui_part"`
+	DisplaceLiquiValue             float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value"`
+	BloodAccess                    int64   `gorm:"column:blood_access" json:"blood_access"`
+	Ultrafiltration                float64 `gorm:"column:ultrafiltration" json:"ultrafiltration"`
+	DialysisDurationHour           int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour" form:"dialysis_duration_hour"`
+	DialysisDurationMinute         int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute" form:"dialysis_duration_minute"`
+	TargetUltrafiltration          float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
+	DialysateFormulation           int64   `gorm:"column:dialysate_formulation" json:"dialysate_formulation" form:"dialysate_formulation"`
+	Dialyzer                       int64   `gorm:"column:dialyzer" json:"dialyzer" form:"dialysate_formulation"`
+	ReplacementTotal               float64 `gorm:"column:replacement_total" json:"replacement_total"`
+	DialyzerPerfusionApparatus     string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	BodyFluidOther                 string  `gorm:"column:body_fluid_other" json:"body_fluid_other"`
+	TargetKtv                      float64 `gorm:"column:target_ktv" json:"target_ktv"`
+	DialysisDialyszers             string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation             string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	AntioxidantCommodityName       string  `gorm:"column:antioxidant_commodity_name" json:"antioxidant_commodity_name" form:"antioxidant_commodity_name"`
+	DisplaceSpeed                  string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
+	Illness                        int64   `gorm:"column:illness" json:"illness" form:"illness"`
+	Amylaceum                      string  `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
+	PlasmaSeparator                string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
+	BilirubinAdsorptionColumn      string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
+	OxygenUptake                   int64   `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
+	OxygenFlow                     string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
+	OxygenTime                     string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
+	HemodialysisPipelines          string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount     float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle                 string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount            float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                            string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                       float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	MaxUltrafiltrationRate         float64 `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	PreImpulse                     float64 `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
+	SolutionStatus                 int64   `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
+	DialysisRemark                 string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
+	PrescribingNumber              float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	TreatmentRemark                string  `gorm:"column:treatment_remark" json:"treatment_remark" form:"treatment_remark"`
+	PrescriptionSodium             string  `gorm:"column:prescription_sodium" json:"prescription_sodium" form:"prescription_sodium"`
+	StartSodium                    string  `gorm:"column:start_sodium" json:"start_sodium" form:"start_sodium"`
+	SodiumCurve                    string  `gorm:"column:sodium_curve" json:"sodium_curve" form:"sodium_curve"`
+	DialysisFluidFlow              string  `gorm:"column:dialysis_fluid_flow" json:"dialysis_fluid_flow" form:"dialysis_fluid_flow"`
+	SodiumBicarbonateFlow          string  `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
+	PrescriptionWater              float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
+	DialysisStrainer               string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	Chaptalization                 string  `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
+	WarshCount                     string  `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
+	WashingTime                    string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
+	BloodAccessPartId              string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	AnticoagulantWeichiHour        string  `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
+	Dialyzate                      string  `gorm:"column:dialyzate" json:"dialyzate" form:"dialyzate"`
+	DialysisDialyszersId           int64   `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
+	DialysisStrainerId             int64   `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
+	DialysisIrrigationId           int64   `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
+	FirstSuper                     int64   `gorm:"column:first_super" json:"first_super" form:"first_super"`
+	IsSequential                   int64   `gorm:"column:is_sequential" json:"is_sequential" form:"is_sequential"`
+	Conduct                        string  `gorm:"column:conduct" json:"conduct" form:"conduct"`
+	SterilizationWater             string  `gorm:"column:sterilization_water" json:"sterilization_water" form:"sterilization_water"`
+	FiveGlucose                    string  `gorm:"column:five_glucose" json:"five_glucose" form:"five_glucose"`
+	FiftyGlucose                   string  `gorm:"column:fifty_glucose" json:"fifty_glucose" form:"fifty_glucose"`
+	MagnesiumSulfateInjection      string  `gorm:"column:magnesium_sulfate_injection" json:"magnesium_sulfate_injection" form:"magnesium_sulfate_injection"`
+	CalciumGluconate               string  `gorm:"column:calcium_gluconate" json:"calcium_gluconate" form:"calcium_gluconate"`
+	FivePotassiumChlorideInjection string  `gorm:"column:five_potassium_chloride_injection" json:"five_potassium_chloride_injection" form:"five_potassium_chloride_injection"`
+	TenPotassiumChlorideInjection  string  `gorm:"column:ten_potassium_chloride_injection" json:"ten_potassium_chloride_injection" form:"ten_potassium_chloride_injection"`
+	FiveSodiumBicarbonateInjection string  `gorm:"column:five_sodium_bicarbonate_injection" json:"five_sodium_bicarbonate_injection" form:"five_sodium_bicarbonate_injection"`
+	NewSty                         string  `gorm:"column:new_sty" json:"new_sty" form:"new_sty"`
 }
 
 func (DialysisSolution) TableName() string {

models/schedule_models.go

@@ -569,6 +569,7 @@ type HisPrescriptionProjectTemplateSeven struct {
 	Type               int64         `gorm:"column:type" json:"type" form:"type"`
 	PrescriptionId     int64         `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
 	GoodInfo           GoodInfoNight `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"good_info"`
+	HisProject         HisProject    `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	FrequencyType      int64         `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
 	DayCount           int64         `gorm:"column:day_count" json:"day_count" form:"day_count"`
 	WeekDay            string        `gorm:"column:week_day" json:"week_day" form:"week_day"`

service/dialysis_service.go

@@ -2804,3 +2804,103 @@ func StopLongAdvice(id int64, stop_time int64) (models.DoctorAdvice, error) {
 
 	return advice, err
 }
+
+func BatchAdviceDoctorList(patient_id int64, advice_date int64, id int64, user_org_id int64, checker int64, check_time int64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+
+	err := XTWriteDB().Model(&advice).Where("id = ? and patient_id = ? and advice_date =? and user_org_id = ? and check_state=0", id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
+
+	return advice, err
+}
+
+func BatchHisAdviceDoctorList(patient_id int64, advice_date int64, id int64, user_org_id int64, checker int64, check_time int64) (models.HisDoctorAdvice, error) {
+
+	advice := models.HisDoctorAdvice{}
+
+	err := XTWriteDB().Model(&advice).Where("id = ? and patient_id = ? and advice_date =? and user_org_id = ? and check_state=0", id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
+
+	return advice, err
+}
+
+func BatchHisPrescriptionProject(patient_id int64, record_date int64, id int64, user_org_id int64, checker int64, check_time int64) (models.HisPrescriptionProject, error) {
+
+	project := models.HisPrescriptionProject{}
+
+	err := XTWriteDB().Model(&project).Where("id = ? and patient_id = ? and record_date =? and user_org_id = ? and check_state=0", id, patient_id, record_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
+
+	return project, err
+
+}
+
+func BatchExecutionAdviceDoctorList(patient_id int64, advice_date int64, id int64, user_org_id int64, execution_staff int64, execution_time int64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+
+	err := XTWriteDB().Model(&advice).Where("id = ? and patient_id = ? and advice_date =? and user_org_id = ? and (execution_state=2 or execution_state=0)", id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"execution_staff": execution_staff, "execution_state": 1, "execution_time": execution_time}).Error
+
+	return advice, err
+}
+
+func BatchExecutionHisAdviceDoctorList(patient_id int64, advice_date int64, id int64, user_org_id int64, execution_staff int64, execution_time int64) (models.HisDoctorAdviceInfo, error) {
+
+	advice := models.HisDoctorAdviceInfo{}
+
+	err := XTWriteDB().Model(&advice).Where("id = ? and patient_id = ? and advice_date =? and user_org_id = ? and (execution_state=2 or execution_state=0)", id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"execution_staff": execution_staff, "execution_state": 1, "execution_time": execution_time}).Error
+
+	return advice, err
+}
+
+func BatchExecutionHisPrescriptionProject(patient_id int64, advice_date int64, id int64, user_org_id int64, execution_staff int64, execution_time int64) (models.HisPrescriptionProject, error) {
+
+	project := models.HisPrescriptionProject{}
+	err := XTWriteDB().Model(&project).Where("id = ? and patient_id = ? and record_date =? and user_org_id = ? and (execution_state=2 or execution_state=0)", id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"execution_staff": execution_staff, "execution_state": 1, "execution_time": execution_time}).Error
+
+	return project, err
+}
+
+func BatchExecutionPrescriptionProject(patient_id int64, advice_date int64, team_id int64, user_org_id int64, execution_staff int64, execution_time int64) (models.HisPrescriptionProject, error) {
+
+	project := models.HisPrescriptionProject{}
+
+	err := XTWriteDB().Model(&project).Where("team_id = ? and patient_id = ? and record_date =? and user_org_id = ? and (execution_state=2 or execution_state=0)", team_id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"execution_staff": execution_staff, "execution_state": 1, "execution_time": execution_time}).Error
+
+	return project, err
+}
+
+func GetBatchAdviceList(id []int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("id in(?) and status=1", id).Find(&advice).Error
+
+	return advice, err
+}
+
+func GetBatchHisAdviceList(id []int64) (hisadvice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("id in(?) and status=1", id).Find(&hisadvice).Error
+
+	return hisadvice, err
+}
+
+func GetBatchPrescriptionList(id []int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("id in(?) and status=1", id).Find(&project).Error
+
+	return project, err
+}
+
+func GetBatchTeamList(team_id []int64, patient_id int64, record_date int64, orgId int64) (list []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("team_id in(?) and status=1 and patient_id = ? and record_date = ? and user_org_id =?", team_id, patient_id, record_date, orgId).Find(&list).Error
+
+	return list, err
+}
+
+func BatchCheckPrescriptionProject(patient_id int64, advice_date int64, team_id int64, user_org_id int64, checker int64, check_time int64) (models.HisPrescriptionProject, error) {
+
+	project := models.HisPrescriptionProject{}
+
+	err := XTWriteDB().Model(&project).Where("team_id = ? and patient_id = ? and record_date =? and user_org_id = ? and (check_state=2 or check_state=0)", team_id, patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": check_time}).Error
+
+	return project, err
+}

service/gobal_config_service.go

@@ -1201,6 +1201,15 @@ func GetLastMonitorRecordList(patient_id int64, schedule_date int64, user_org_id
 
 }
 
+func GetFisrtMonitorRecordList(patient_id int64, schedule_date int64, user_org_id int64) (models.MonitoringRecord, error) {
+
+	record := models.MonitoringRecord{}
+	var err error
+	err = XTReadDB().Where("patient_id =? and monitoring_date = ? and user_org_id = ? and status = 1", patient_id, schedule_date, user_org_id).Order("operate_time asc").First(&record).Error
+
+	return record, err
+}
+
 func GetLastAfter(patient_id int64, schedule_date int64, user_org_id int64) (models.XtAssessmentAfterDislysis, error) {
 
 	dislysis := models.XtAssessmentAfterDislysis{}

service/his_config_service.go

@@ -1,16 +1,16 @@
 package service
 
 import (
+	"fmt"
+	"reflect"
+	"strconv"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/utils"
-	"fmt"
 	"github.com/astaxie/beego/config"
 	"golang.org/x/sync/errgroup"
-
-	"reflect"
-	"strconv"
-	"time"
 )
 
 func GetHisPrescriptionTemplatesList(patient_id int64, org_id int64, page int64, limit int64) (templates []*models.HisPrescriptionTemplate, total int64, err error) {
@@ -689,6 +689,7 @@ func ReplaceDrug(orgid, model, drug_id int64, patient_id []int64, advice models.
 		}
 	}()
 	var g errgroup.Group
+
 	var tmp []*models.DialysisPatient
 	err = tx.Raw("select his_prescription_advice_template.id from his_prescription_advice_template,("+
 		"select his_prescription_info_template.id from his_prescription_info_template,("+

service/mobile_dialysis_service.go

@@ -2275,7 +2275,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark, "catheter_operation": order.CatheterOperation, "blood_flow_volume": order.BloodFlowVolume, "blood_drawing": order.BloodDrawing, "dialysis_strainer": order.DialysisStrainer}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark, "catheter_operation": order.CatheterOperation, "blood_flow_volume": order.BloodFlowVolume, "blood_drawing": order.BloodDrawing, "dialysis_strainer": order.DialysisStrainer, "end_time": order.EndTime}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -3285,6 +3285,18 @@ func GetHisPrescriptionTemplateList(user_org_id int64, patient_id int64, mode_id
 	return templateSix, err
 }
 
+func GetHisPrescriptionTemplateListTwety(user_org_id int64, patient_id int64, mode_id int64) (models.HisPrescriptionTemplateSix, error) {
+
+	templateSix := models.HisPrescriptionTemplateSix{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode = ? and status =1", user_org_id, patient_id, mode_id).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status=1 and patient_id =?", user_org_id, patient_id).Preload("GoodInfo", "org_id = ? and status=1 ", user_org_id).Preload("HisProject", "user_org_id = ? and status=1 ", user_org_id)
+		}).Preload("HisPrescriptionAdviceTemplate", "status=1 and user_org_id = ? and patient_id = ?", user_org_id, patient_id)
+	}).Find(&templateSix).Error
+
+	return templateSix, err
+}
+
 func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his []*models.HisDoctorAdviceInfo, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -8288,6 +8300,15 @@ func UpdateDialysisOrder(patient_id int64, dialysis_date int64, user_org_id int6
 	return order, err
 }
 
+func UpdateDialysisOrderTenty(patient_id int64, dialysis_date int64, start_time int64, user_org_id int64) (models.DialysisOrder, error) {
+
+	order := models.DialysisOrder{}
+
+	err := XTWriteDB().Model(&order).Where("patient_id = ? and dialysis_date = ? and user_org_id = ? and status = 1", patient_id, dialysis_date, user_org_id).Updates(map[string]interface{}{"start_time": start_time}).Error
+
+	return order, err
+}
+
 func UpdateDeviceInformation(patientid int64, dialysis_date int64) error {
 
 	information := models.DeviceInformation{}
@@ -8306,10 +8327,16 @@ func MobileGetDoubleCheckSix(orgID int64, patientID int64, recordDate int64) (mo
 func GetFirstMonitor(patient_id int64, monit_date int64) (models.MonitoringRecord, error) {
 
 	record := models.MonitoringRecord{}
-	err := XTReadDB().Where("patient_id = ? and monitoring_date = ? and status=1", patient_id, monit_date).First(&record).Error
+	err := XTReadDB().Where("patient_id = ? and monitoring_date = ? and status=1", patient_id, monit_date).Order("operate_time asc").First(&record).Error
 	return record, err
 }
 
+func UpdateFirstMoitorById(id int64, operate_time int64) error {
+
+	err = XTWriteDB().Model(&models.MonitoringRecord{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"operate_time": operate_time}).Error
+	return err
+}
+
 func GetFirstMonitorOne(patient_id int64, monit_date int64, org_id int64) (models.MonitoringRecord, error) {
 
 	record := models.MonitoringRecord{}
@@ -8867,14 +8894,6 @@ func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.SgjPa
 
 func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64, execution_state int64, cost_type int64, execution_frequency string, keyword string) ([]*MScheduleDoctorAdviceVM, error) {
 
-	fmt.Println("deliverWay-----------------", deliverWay)
-	fmt.Println("execution_frequency------------------", execution_frequency)
-	fmt.Println("adviceType-----------------", adviceType)
-	fmt.Println("patientType----------------", patientType)
-	fmt.Println("patient_id----------------", patient_id)
-	fmt.Println("execution_state----------------", execution_state)
-	fmt.Println("cost_type---------------------", cost_type)
-	fmt.Println("execution_frequency", execution_frequency)
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	keyword = "%" + keyword + "%"
@@ -10038,6 +10057,28 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 	return vms, err
 }
 
+func GetHisPrescriptionAdvice(user_org_id int64, deliverWay string, execution_frequency string, keword string, excution_way int64) (advice []*models.HisPrescriptionAdviceTemplate, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status=1")
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if len(deliverWay) > 0 {
+		db = db.Where("delivery_way = ?", deliverWay)
+	}
+	if len(execution_frequency) > 0 {
+		db = db.Where("execution_frequency=?", execution_frequency)
+	}
+
+	if excution_way > 0 {
+		db = db.Where("execution_state=?", excution_way)
+	}
+
+	err = db.Find(&advice).Error
+
+	return advice, err
+}
+
 func GetLastAcceptTreatment(user_org_id int64, patient_id int64) (models.ReceiveTreatmentAsses, error) {
 
 	treatmentAsses := models.ReceiveTreatmentAsses{}

service/sign_service.go

@@ -2499,3 +2499,18 @@ func UpdateScheduleByIdOneList(id int64, schedule_date int64, schedule_type int6
 
 	return err
 }
+
+func GetPatientVascularAccessByUser(user_org_id int64) (access []*models.XtPatientVascularAccess, err error) {
+
+	err = XTReadDB().Where("user_org_id = 10766 and status=1").Find(&access).Error
+	return access, err
+}
+
+func UpdateDialysisPatientSolution(patient_id int64, blood_access_part_opera_id string, blood_access int64) (models.DialysisSolution, error) {
+
+	patientVascularAccess := models.DialysisSolution{}
+
+	err = XTWriteDB().Model(&patientVascularAccess).Where("patient_id = ? and status=1", patient_id).Updates(map[string]interface{}{"blood_access_part_id": blood_access_part_opera_id, "blood_access": blood_access}).Error
+
+	return patientVascularAccess, err
+}

service/warhouse_service.go

@@ -8852,12 +8852,14 @@ func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_
 			sum_count += item.StockCount
 		}
 
+		var now_time = time.Now().Unix() + 1
+
 		OutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   now_time,
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -8907,7 +8909,7 @@ func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_
 			Creator:                 creator,
 			UpdateCreator:           0,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   now_time,
 			Mtime:                   0,
 			Price:                   warehouse.PackingPrice, //零售价
 			WarehousingDetailId:     warehouse.ID,