耗材参数

controllers/dialysis_api_controller.go

@@ -249,6 +249,8 @@ func (c *DialysisApiController) PostPrescription() {
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
+	illness, _ := c.GetInt64("illness")
+	amylaceum := c.GetString("amylaceum")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -332,6 +334,8 @@ func (c *DialysisApiController) PostPrescription() {
 		DialysisIrrigation:         dialysis_irrigation,
 		AntioxidantCommodityName:   antioxidant_commodity_name,
 		DisplaceSpeed:              displace_speed,
+		Illness:                    illness,
+		Amylaceum:                  amylaceum,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -567,6 +571,8 @@ func (c *DialysisApiController) PostSoulution() {
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
+	illness, _ := c.GetInt64("illness")
+	amylaceum := c.GetString("amylaceum")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -661,6 +667,8 @@ func (c *DialysisApiController) PostSoulution() {
 		DialysisDialyszers:        dialysis_dialyszers,
 		AntioxidantCommodityName:  antioxidant_commodity_name,
 		DisplaceSpeed:             displace_speed,
+		Illness:                   illness,
+		Amylaceum:                 amylaceum,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1066,6 +1074,7 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 }
 
 func (c *DialysisApiController) PostAssessmentAfterDislysis() {
+
 	patient, _ := c.GetInt64("patient", 0)
 	recordDateStr := c.GetString("record_date")
 	fmt.Println(recordDateStr)
@@ -1164,6 +1173,12 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.AdditionalWeight = data.AdditionalWeight
 	assessment.OtherComplication = data.OtherComplication
 	assessment.Ktv = data.Ktv
+
+	assessment.Urr = data.Urr
+	assessment.Hypertenison = data.Hypertenison
+	assessment.Hypopiesia = data.Hypopiesia
+	assessment.LeaveOfficeMethod = data.LeaveOfficeMethod
+	assessment.Lapse = data.Lapse
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
@@ -1295,6 +1310,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	thrombus_av := c.GetString("thrombus_av")
 	thrombus_v := c.GetString("thromubus_v")
 	dehydration := c.GetString("dehydration")
+	pre_dialysis_drugs := c.GetString("pre_dialysis_drugs")
+	period, _ := c.GetInt64("period")
+	estimated_food_intake := c.GetString("estimated_food_intake")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1357,6 +1375,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		ThromubusA:                     thrombus_a,
 		ThromubusV:                     thrombus_v,
 		Dehydration:                    dehydration,
+		PreDialysisDrugs:               pre_dialysis_drugs,
+		Period:                         period,
+		EstimatedFoodIntake:            estimated_food_intake,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)

controllers/dialysis_record_api_controller.go

@@ -322,37 +322,39 @@ type EditMonitorParamObject struct {
 	MonitoringDate int64 `json:"monitoring_date"`
 	OperateTime    int64 `json:"operate_time"`
 	// MonitoringTime        string  `json:"monitoring_time"`
-	SystolicBP                float64 `json:"systolic_bp"`
-	DiastolicBP               float64 `json:"diastolic_bp"`
-	PulseFrequency            float64 `json:"pulse_frequency"`
-	BreathingRated            float64 `json:"breathing_rated"`
-	BloodFlowVolume           float64 `json:"blood_flow_volume"`
-	VenousPressure            float64 `json:"venous_pressure"`
-	VenousPressureType        int64   `json:"venous_pressure_type"`
-	TransmembranePressure     float64 `json:"transmembrane_pressure"`
-	TransmembranePressureType int64   `json:"transmembrane_pressure_type"`
-	UltrafiltrationVolume     float64 `json:"ultrafiltration_volume"`
-	UltrafiltrationRate       float64 `json:"ultrafiltration_rate"`
-	ArterialPressure          float64 `json:"arterial_pressure"`
-	ArterialPressureType      int64   `json:"arterial_pressure_type"`
-	SodiumConcentration       float64 `json:"sodium_concentration"`
-	DialysateTemperature      float64 `json:"dialysate_temperature"`
-	Temperature               float64 `json:"temperature"`
-	ReplacementRate           float64 `json:"replacement_rate"`
-	DisplacementQuantity      float64 `json:"displacement_quantity"`
-	KTV                       float64 `json:"ktv"`
-	Symptom                   string  `json:"symptom"`
-	Dispose                   string  `json:"dispose"`
-	Result                    string  `json:"result"`
-	Conductivity              float64 `json:"conductivity"`
-	DisplacementFlowQuantity  float64 `json:"displacement_flow_quantity"`
-	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
-	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	Urr                       string  `gorm:"column:urr" json:"urr" form:"urr"`
-	BloodSugar                float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
-	MonitorAnticoagulant      int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
-	MonitorAnticoagulantValue string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	SystolicBP                  float64 `json:"systolic_bp"`
+	DiastolicBP                 float64 `json:"diastolic_bp"`
+	PulseFrequency              float64 `json:"pulse_frequency"`
+	BreathingRated              float64 `json:"breathing_rated"`
+	BloodFlowVolume             float64 `json:"blood_flow_volume"`
+	VenousPressure              float64 `json:"venous_pressure"`
+	VenousPressureType          int64   `json:"venous_pressure_type"`
+	TransmembranePressure       float64 `json:"transmembrane_pressure"`
+	TransmembranePressureType   int64   `json:"transmembrane_pressure_type"`
+	UltrafiltrationVolume       float64 `json:"ultrafiltration_volume"`
+	UltrafiltrationRate         float64 `json:"ultrafiltration_rate"`
+	ArterialPressure            float64 `json:"arterial_pressure"`
+	ArterialPressureType        int64   `json:"arterial_pressure_type"`
+	SodiumConcentration         float64 `json:"sodium_concentration"`
+	DialysateTemperature        float64 `json:"dialysate_temperature"`
+	Temperature                 float64 `json:"temperature"`
+	ReplacementRate             float64 `json:"replacement_rate"`
+	DisplacementQuantity        float64 `json:"displacement_quantity"`
+	KTV                         float64 `json:"ktv"`
+	Symptom                     string  `json:"symptom"`
+	Dispose                     string  `json:"dispose"`
+	Result                      string  `json:"result"`
+	Conductivity                float64 `json:"conductivity"`
+	DisplacementFlowQuantity    float64 `json:"displacement_flow_quantity"`
+	BloodOxygenSaturation       string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Heparin                     float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow               float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Urr                         string  `gorm:"column:urr" json:"urr" form:"urr"`
+	BloodSugar                  float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
+	MonitorAnticoagulant        int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
+	MonitorAnticoagulantValue   string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
+	Complication                int64   `gorm:"column:complication" json:"complication" form:"complication"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -429,42 +431,44 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			MonitoringDate:  monitorParam.MonitoringDate,
 			OperateTime:     monitorParam.OperateTime,
 			// MonitoringTime:         monitorParam.MonitoringTime,
-			PulseFrequency:            monitorParam.PulseFrequency,
-			BreathingRate:             monitorParam.BreathingRated,
-			SystolicBloodPressure:     monitorParam.SystolicBP,
-			DiastolicBloodPressure:    monitorParam.DiastolicBP,
-			BloodFlowVolume:           monitorParam.BloodFlowVolume,
-			VenousPressure:            monitorParam.VenousPressure,
-			VenousPressureType:        monitorParam.VenousPressureType,
-			ArterialPressure:          monitorParam.ArterialPressure,
-			ArterialPressureType:      monitorParam.ArterialPressureType,
-			TransmembranePressure:     monitorParam.TransmembranePressure,
-			TransmembranePressureType: monitorParam.TransmembranePressureType,
-			UltrafiltrationRate:       monitorParam.UltrafiltrationRate,
-			UltrafiltrationVolume:     monitorParam.UltrafiltrationVolume,
-			SodiumConcentration:       monitorParam.SodiumConcentration,
-			DialysateTemperature:      monitorParam.DialysateTemperature,
-			Temperature:               monitorParam.Temperature,
-			ReplacementRate:           monitorParam.ReplacementRate,
-			DisplacementQuantity:      monitorParam.DisplacementQuantity,
-			Ktv:                       monitorParam.KTV,
-			Symptom:                   monitorParam.Symptom,
-			Dispose:                   monitorParam.Dispose,
-			Result:                    monitorParam.Result,
-			MonitoringNurse:           adminUserInfo.AdminUser.Id,
-			Conductivity:              monitorParam.Conductivity,
-			DisplacementFlowQuantity:  monitorParam.DisplacementFlowQuantity,
-			Status:                    1,
-			CreatedTime:               time.Now().Unix(),
-			UpdatedTime:               time.Now().Unix(),
-			BloodOxygenSaturation:     monitorParam.BloodOxygenSaturation,
-			Creator:                   adminUserInfo.AdminUser.Id,
-			Heparin:                   monitorParam.Heparin,
-			DialysateFlow:             monitorParam.DialysateFlow,
-			Urr:                       monitorParam.Urr,
-			BloodSugar:                monitorParam.BloodSugar,
-			MonitorAnticoagulant:      monitorParam.MonitorAnticoagulant,
-			MonitorAnticoagulantValue: monitorParam.MonitorAnticoagulantValue,
+			PulseFrequency:              monitorParam.PulseFrequency,
+			BreathingRate:               monitorParam.BreathingRated,
+			SystolicBloodPressure:       monitorParam.SystolicBP,
+			DiastolicBloodPressure:      monitorParam.DiastolicBP,
+			BloodFlowVolume:             monitorParam.BloodFlowVolume,
+			VenousPressure:              monitorParam.VenousPressure,
+			VenousPressureType:          monitorParam.VenousPressureType,
+			ArterialPressure:            monitorParam.ArterialPressure,
+			ArterialPressureType:        monitorParam.ArterialPressureType,
+			TransmembranePressure:       monitorParam.TransmembranePressure,
+			TransmembranePressureType:   monitorParam.TransmembranePressureType,
+			UltrafiltrationRate:         monitorParam.UltrafiltrationRate,
+			UltrafiltrationVolume:       monitorParam.UltrafiltrationVolume,
+			SodiumConcentration:         monitorParam.SodiumConcentration,
+			DialysateTemperature:        monitorParam.DialysateTemperature,
+			Temperature:                 monitorParam.Temperature,
+			ReplacementRate:             monitorParam.ReplacementRate,
+			DisplacementQuantity:        monitorParam.DisplacementQuantity,
+			Ktv:                         monitorParam.KTV,
+			Symptom:                     monitorParam.Symptom,
+			Dispose:                     monitorParam.Dispose,
+			Result:                      monitorParam.Result,
+			MonitoringNurse:             adminUserInfo.AdminUser.Id,
+			Conductivity:                monitorParam.Conductivity,
+			DisplacementFlowQuantity:    monitorParam.DisplacementFlowQuantity,
+			Status:                      1,
+			CreatedTime:                 time.Now().Unix(),
+			UpdatedTime:                 time.Now().Unix(),
+			BloodOxygenSaturation:       monitorParam.BloodOxygenSaturation,
+			Creator:                     adminUserInfo.AdminUser.Id,
+			Heparin:                     monitorParam.Heparin,
+			DialysateFlow:               monitorParam.DialysateFlow,
+			Urr:                         monitorParam.Urr,
+			BloodSugar:                  monitorParam.BloodSugar,
+			MonitorAnticoagulant:        monitorParam.MonitorAnticoagulant,
+			MonitorAnticoagulantValue:   monitorParam.MonitorAnticoagulantValue,
+			BloodPressureMonitoringSite: monitorParam.BloodPressureMonitoringSite,
+			Complication:                monitorParam.Complication,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {

controllers/doctors_api_controller.go

@@ -351,39 +351,66 @@ func (this *DoctorsApiController) SaveVasularAccess() {
 	creator := adminUserInfo.AdminUser.Id
 
 	//查询改日期是否存在
-	_, errcode := service.GetDialysisDateByDate(startTime.Unix(), patient_id, orgId)
-	if errcode == gorm.ErrRecordNotFound {
-		access := models.XtPatientVascularAccess{
-			AccessProject:          access_project,
-			BloodAccessPartId:      blood_access_part_id,
-			BloodAccessPartOperaId: blood_access_part_opera_id,
-			FirstStartTime:         firstStartTime.Unix(),
-			InflowPass:             inflow_pass,
-			Remark:                 remark,
-			StartTime:              startTime.Unix(),
-			StopReason:             stop_reason,
-			UserStatus:             user_status,
-			Creator:                creator,
-			UserOrgId:              orgId,
-			Status:                 1,
-			Ctime:                  time.Now().Unix(),
-			StopTime:               stopTime.Unix(),
-			PatientId:              patient_id,
-			OtherVascular:          other_vascular,
-			CiType:                 ci_type,
-			BloodCultupe:           blood_cultupe,
-			SequelaeType:           sequelae_type,
-		}
-		err := service.SaveVascularAccess(&access)
-		if err == nil {
-			this.ServeSuccessJSON(map[string]interface{}{
-				"access": access,
-			})
-			return
-		}
-	} else if errcode == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+	access := models.XtPatientVascularAccess{
+		AccessProject:          access_project,
+		BloodAccessPartId:      blood_access_part_id,
+		BloodAccessPartOperaId: blood_access_part_opera_id,
+		FirstStartTime:         firstStartTime.Unix(),
+		InflowPass:             inflow_pass,
+		Remark:                 remark,
+		StartTime:              startTime.Unix(),
+		StopReason:             stop_reason,
+		UserStatus:             user_status,
+		Creator:                creator,
+		UserOrgId:              orgId,
+		Status:                 1,
+		Ctime:                  time.Now().Unix(),
+		StopTime:               stopTime.Unix(),
+		PatientId:              patient_id,
+		OtherVascular:          other_vascular,
+		CiType:                 ci_type,
+		BloodCultupe:           blood_cultupe,
+		SequelaeType:           sequelae_type,
+	}
+	err := service.SaveVascularAccess(&access)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"access": access,
+		})
 		return
+		//_, errcode := service.GetDialysisDateByDate(startTime.Unix(), patient_id, orgId)
+		//if errcode == gorm.ErrRecordNotFound {
+		//	access := models.XtPatientVascularAccess{
+		//		AccessProject:          access_project,
+		//		BloodAccessPartId:      blood_access_part_id,
+		//		BloodAccessPartOperaId: blood_access_part_opera_id,
+		//		FirstStartTime:         firstStartTime.Unix(),
+		//		InflowPass:             inflow_pass,
+		//		Remark:                 remark,
+		//		StartTime:              startTime.Unix(),
+		//		StopReason:             stop_reason,
+		//		UserStatus:             user_status,
+		//		Creator:                creator,
+		//		UserOrgId:              orgId,
+		//		Status:                 1,
+		//		Ctime:                  time.Now().Unix(),
+		//		StopTime:               stopTime.Unix(),
+		//		PatientId:              patient_id,
+		//		OtherVascular:          other_vascular,
+		//		CiType:                 ci_type,
+		//		BloodCultupe:           blood_cultupe,
+		//		SequelaeType:           sequelae_type,
+		//	}
+		//	err := service.SaveVascularAccess(&access)
+		//	if err == nil {
+		//		this.ServeSuccessJSON(map[string]interface{}{
+		//			"access": access,
+		//		})
+		//		return
+		//	}
+		//} else if errcode == nil {
+		//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+		//	return
 	}
 
 }
@@ -467,20 +494,29 @@ func (this *DoctorsApiController) UpdateVasularAccess() {
 		CiType:                 ci_type,
 		BloodCultupe:           blood_cultupe,
 		SequelaeType:           sequelae_type,
+		PatientId:              patientId,
 	}
-	_, errcode := service.GetDialysisDateByDateOne(startTime.Unix(), patientId, orgId, id)
-	if errcode == gorm.ErrRecordNotFound {
-		err := service.UpdateVascularAccess(&access, id)
-		if err == nil {
-			this.ServeSuccessJSON(map[string]interface{}{
-				"access": access,
-			})
-			return
-		}
-	} else if errcode == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+
+	err := service.UpdateVascularAccess(&access, id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"access": access,
+		})
 		return
 	}
+	//_, errcode := service.GetDialysisDateByDateOne(startTime.Unix(), patientId, orgId, id)
+	//if errcode == gorm.ErrRecordNotFound {
+	//	err := service.UpdateVascularAccess(&access, id)
+	//	if err == nil {
+	//		this.ServeSuccessJSON(map[string]interface{}{
+	//			"access": access,
+	//		})
+	//		return
+	//	}
+	//} else if errcode == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+	//	return
+	//}
 
 }
 

controllers/manage_api_controller.go

@@ -123,6 +123,7 @@ func ManageRouters() {
 	beego.Router("/api/manage/deletehadwater", &MachineApiController{}, "Get:DeleteHadWater")
 	beego.Router("/api/manage/deletewater", &MachineApiController{}, "Get:DeleteWater")
 	beego.Router("/api/manage/deletedeviceph", &MachineApiController{}, "Get:DeleteDevicePh")
+
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -1192,35 +1193,35 @@ func (this *MachineApiController) SaveInformation() {
 			Date:  startdate,
 			Class: classtype,
 			//	Zone:                  zone,
-			BedNumber:           bednumber,
-			PatientId:           patient_time,
-			Contagion:           contagion,
-			DialysisMode:        dialysis_mode,
-			StartTime:           startDate.Unix(),
-			EndTime:             endDate.Unix(),
-			DialysisHour:        dialysis_time,
-			Hyperfiltratio:      hyperfiletration,
-			WeightLoss:          weight_loss,
-			WarningValue:        warining_value,
-			UserTotal:           user_total,
-			Move:                run,
-			FailureStage:        failure_stage,
-			FaultDescription:    falult_desciription,
-			CodeInformation:     code_information,
-			DisinfectantType:    disinfectant_type,
-			DisinfectType:       disinfect_type,
-			Disinfection:        disinfection,
-			MachineRun:          machine_run,
-			FluidPath:           fluid_path,
-			Disinfectant:        disinfectant,
-			DisinfectionStatus:  disinfection_status,
-			DisinfectionResidue: disinfection_residue,
-			LongTime:            longtime,
-			DisinfecStartime:    start_Date.Unix(),
-			DisinfecEndtime:     end_Date.Unix(),
-			DialysisChecked:     dialysis_checked,
-			DialysisName:        dialysis_name,
-			Norms:               norms,
+			BedNumber:             bednumber,
+			PatientId:             patient_time,
+			Contagion:             contagion,
+			DialysisMode:          dialysis_mode,
+			StartTime:             startDate.Unix(),
+			EndTime:               endDate.Unix(),
+			DialysisHour:          dialysis_time,
+			Hyperfiltratio:        hyperfiletration,
+			WeightLoss:            weight_loss,
+			WarningValue:          warining_value,
+			UserTotal:             user_total,
+			Move:                  run,
+			FailureStage:          failure_stage,
+			FaultDescription:      falult_desciription,
+			CodeInformation:       code_information,
+			DisinfectantType:      disinfectant_type,
+			DisinfectType:         disinfect_type,
+			Disinfection:          disinfection,
+			MachineRun:            machine_run,
+			FluidPath:             fluid_path,
+			Disinfectant:          disinfectant,
+			DisinfectionStatus:    disinfection_status,
+			DisinfectionResidue:   disinfection_residue,
+			LongTime:              longtime,
+			DisinfecStartime:      start_Date.Unix(),
+			DisinfecEndtime:       end_Date.Unix(),
+			DialysisChecked:       dialysis_checked,
+			DialysisName:          dialysis_name,
+			Norms:                 norms,
 			DialysisConcentration: dialysis_concentration,
 			GermChecked:           germ_checked,
 			GermName:              germ_name,
@@ -1241,38 +1242,38 @@ func (this *MachineApiController) SaveInformation() {
 		})
 	} else if errinfor == nil {
 		infor := models.DeviceInformation{
-			Date:                startdate,
-			Class:               classtype,
-			Zone:                zone,
-			BedNumber:           bednumber,
-			PatientId:           patient_time,
-			Contagion:           contagion,
-			DialysisMode:        dialysis_mode,
-			StartTime:           startDate.Unix(),
-			EndTime:             endDate.Unix(),
-			DialysisHour:        dialysis_time,
-			Hyperfiltratio:      hyperfiletration,
-			WeightLoss:          weight_loss,
-			WarningValue:        warining_value,
-			UserTotal:           user_total,
-			Move:                run,
-			FailureStage:        failure_stage,
-			FaultDescription:    falult_desciription,
-			CodeInformation:     code_information,
-			DisinfectantType:    disinfectant_type,
-			DisinfectType:       disinfect_type,
-			Disinfection:        disinfection,
-			MachineRun:          machine_run,
-			FluidPath:           fluid_path,
-			Disinfectant:        disinfectant,
-			DisinfectionStatus:  disinfection_status,
-			DisinfectionResidue: disinfection_residue,
-			LongTime:            longtime,
-			DisinfecStartime:    start_Date.Unix(),
-			DisinfecEndtime:     end_Date.Unix(),
-			DialysisChecked:     dialysis_checked,
-			DialysisName:        dialysis_name,
-			Norms:               norms,
+			Date:                  startdate,
+			Class:                 classtype,
+			Zone:                  zone,
+			BedNumber:             bednumber,
+			PatientId:             patient_time,
+			Contagion:             contagion,
+			DialysisMode:          dialysis_mode,
+			StartTime:             startDate.Unix(),
+			EndTime:               endDate.Unix(),
+			DialysisHour:          dialysis_time,
+			Hyperfiltratio:        hyperfiletration,
+			WeightLoss:            weight_loss,
+			WarningValue:          warining_value,
+			UserTotal:             user_total,
+			Move:                  run,
+			FailureStage:          failure_stage,
+			FaultDescription:      falult_desciription,
+			CodeInformation:       code_information,
+			DisinfectantType:      disinfectant_type,
+			DisinfectType:         disinfect_type,
+			Disinfection:          disinfection,
+			MachineRun:            machine_run,
+			FluidPath:             fluid_path,
+			Disinfectant:          disinfectant,
+			DisinfectionStatus:    disinfection_status,
+			DisinfectionResidue:   disinfection_residue,
+			LongTime:              longtime,
+			DisinfecStartime:      start_Date.Unix(),
+			DisinfecEndtime:       end_Date.Unix(),
+			DialysisChecked:       dialysis_checked,
+			DialysisName:          dialysis_name,
+			Norms:                 norms,
 			DialysisConcentration: dialysis_concentration,
 			GermChecked:           germ_checked,
 			GermName:              germ_name,
@@ -2488,37 +2489,37 @@ func (this *MachineApiController) UpdateForm() {
 	err = service.UpdatedZoneID(bednumber, orgid, &deviceNumber)
 	fmt.Println("更新区号失败", err)
 	information := models.DeviceInformation{
-		Date:                startdate,
-		Class:               classtype,
-		Zone:                zone,
-		BedNumber:           bednumber,
-		Contagion:           contagion,
-		DialysisMode:        dialysis_mode,
-		StartTime:           startDate.Unix(),
-		EndTime:             endDate.Unix(),
-		DialysisHour:        dialysis_time,
-		Hyperfiltratio:      hyperfiletration,
-		WeightLoss:          weight_loss,
-		WarningValue:        warining_value,
-		UserTotal:           user_total,
-		Move:                run,
-		FailureStage:        failure_stage,
-		FaultDescription:    falult_desciription,
-		CodeInformation:     code_information,
-		DisinfectantType:    disinfectant_type,
-		DisinfectType:       disinfect_type,
-		Disinfection:        disinfection,
-		MachineRun:          machine_run,
-		FluidPath:           fluid_path,
-		Disinfectant:        disinfectant,
-		DisinfectionStatus:  disinfection_status,
-		DisinfectionResidue: disinfection_residue,
-		LongTime:            longtime,
-		DisinfecStartime:    distartime,
-		DisinfecEndtime:     diendtime,
-		DialysisChecked:     dialysis_checked,
-		DialysisName:        dialysis_name,
-		Norms:               norms,
+		Date:                  startdate,
+		Class:                 classtype,
+		Zone:                  zone,
+		BedNumber:             bednumber,
+		Contagion:             contagion,
+		DialysisMode:          dialysis_mode,
+		StartTime:             startDate.Unix(),
+		EndTime:               endDate.Unix(),
+		DialysisHour:          dialysis_time,
+		Hyperfiltratio:        hyperfiletration,
+		WeightLoss:            weight_loss,
+		WarningValue:          warining_value,
+		UserTotal:             user_total,
+		Move:                  run,
+		FailureStage:          failure_stage,
+		FaultDescription:      falult_desciription,
+		CodeInformation:       code_information,
+		DisinfectantType:      disinfectant_type,
+		DisinfectType:         disinfect_type,
+		Disinfection:          disinfection,
+		MachineRun:            machine_run,
+		FluidPath:             fluid_path,
+		Disinfectant:          disinfectant,
+		DisinfectionStatus:    disinfection_status,
+		DisinfectionResidue:   disinfection_residue,
+		LongTime:              longtime,
+		DisinfecStartime:      distartime,
+		DisinfecEndtime:       diendtime,
+		DialysisChecked:       dialysis_checked,
+		DialysisName:          dialysis_name,
+		Norms:                 norms,
 		DialysisConcentration: dialysis_concentration,
 		GermChecked:           germ_checked,
 		GermName:              germ_name,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -847,6 +847,11 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	diastolic_pressure := c.GetString("diastolic_pressure")
 	other_complication := c.GetString("other_complication")
 	ktv := c.GetString("ktv")
+	urr := c.GetString("urr")
+	hypertenison, _ := c.GetInt64("hypertenison")
+	hypopiesia, _ := c.GetInt64("hypopiesia")
+	leave_office_method, _ := c.GetInt64("leave_office_method")
+	lapse, _ := c.GetInt64("lapse")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -940,6 +945,11 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		DiastolicPressure:            diastolic_pressure,
 		OtherComplication:            other_complication,
 		Ktv:                          ktv,
+		Urr:                          urr,
+		Hypopiesia:                   hypopiesia,
+		Hypertenison:                 hypertenison,
+		Lapse:                        lapse,
+		LeaveOfficeMethod:            leave_office_method,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -1078,6 +1088,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
+	illness, _ := c.GetInt64("illness")
+	amylaceum := c.GetString("amylaceum")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
@@ -1165,6 +1177,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		DialysisIrrigation:         dialysis_irrigation,
 		AntioxidantCommodityName:   antioxidant_commodity_name,
 		DisplaceSpeed:              displace_speed,
+		Illness:                    illness,
+		Amylaceum:                  amylaceum,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1958,6 +1972,8 @@ func (c *DialysisAPIController) PostSolution() {
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
+	illness, _ := c.GetInt64("illness")
+	amylaceum := c.GetString("amylaceum")
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -2046,6 +2062,8 @@ func (c *DialysisAPIController) PostSolution() {
 		DialysisIrrigation:        dialysis_irrigation,
 		AntioxidantCommodityName:  antioxidant_commodity_name,
 		DisplaceSpeed:             displace_speed,
+		Illness:                   illness,
+		Amylaceum:                 amylaceum,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3555,7 +3573,7 @@ func (c *DialysisAPIController) EditConsumables() {
 		if dataBody["goods"] != nil && reflect.TypeOf(dataBody["goods"]).String() == "[]interface {}" {
 
 			goods, _ := dataBody["goods"].([]interface{})
-			fmt.Println("goods2222222222222", goods)
+
 			if len(goods) > 0 {
 				for _, item := range goods {
 					items := item.(map[string]interface{})
@@ -3639,7 +3657,7 @@ func (c *DialysisAPIController) EditConsumables() {
 				}
 			}
 		}
-		fmt.Println("hhhhhhhhhhhhhhhhhhhh", beforePrepares)
+
 		//查询今日患者出库列表
 		consumables_source, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
 
@@ -3699,7 +3717,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 		//查询是否有出库单
 		out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
-		fmt.Println("是否有出库单22222222222222222222222", err)
+
 		if err == gorm.ErrRecordNotFound {
 			//没有记录，则创建出库单
 			timeStr := time.Now().Format("2006-01-02")
@@ -3848,7 +3866,7 @@ func (c *DialysisAPIController) EditConsumables() {
 							}
 							service.AddSigleAutoReduceRecordInfo(details)
 						} else if count == 1 {
-							fmt.Println("llllllllllllllllllllll")
+
 							service.UpdateUserInfoDetails(item.GoodTypeId, item.GoodId, record_time, adminInfo.Org.Id, patient_id, item.Count, &outInfo)
 						}
 						//details := &models.AutomaticReduceDetail{

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -80,7 +80,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	replacementRate, _ := this.GetFloat("replacement_rate")
 	displacementQuantity, _ := this.GetFloat("displacement_quantity")
 	ktv, _ := this.GetFloat("ktv")
-	fmt.Println("ktv -------------------", ktv)
+
 	symptom := this.GetString("symptom")
 	dispose := this.GetString("dispose")
 	conductivity, _ := this.GetFloat("conductivity")
@@ -94,6 +94,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	blood_sugar, _ := this.GetFloat("blood_sugar")
 	monitor_anticoagulant, _ := this.GetInt64("monitor_anticoagulant")
 	monitor_anticoagulant_value := this.GetString("monitor_anticoagulant_value")
+	blood_pressure_monitoring_site, _ := this.GetInt64("blood_pressure_monitoring_site")
+	complication, _ := this.GetInt64("complication")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
@@ -112,44 +114,46 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		MonitoringDate:  date,
 		OperateTime:     operateTime,
 		// MonitoringTime:            recordTime,
-		PulseFrequency:            pulseFrequency,
-		BreathingRate:             breathingRated,
-		SystolicBloodPressure:     systolicBP,
-		DiastolicBloodPressure:    diastolicBP,
-		BloodPressureType:         int64(BPType),
-		BloodFlowVolume:           bloodFlowVolume,
-		VenousPressure:            venousPressure,
-		VenousPressureType:        venousPressureType,
-		ArterialPressure:          arterialPressure,
-		ArterialPressureType:      arterialPressureType,
-		TransmembranePressure:     transmembranePressure,
-		TransmembranePressureType: transmembranePressureType,
-		UltrafiltrationRate:       ultrafiltrationRate,
-		UltrafiltrationVolume:     ultrafiltrationVolume,
-		SodiumConcentration:       sodiumConcentration,
-		DialysateTemperature:      dialysateTemperature,
-		Temperature:               temperature,
-		ReplacementRate:           replacementRate,
-		DisplacementQuantity:      displacementQuantity,
-		Ktv:                       ktv,
-		Symptom:                   symptom,
-		Dispose:                   dispose,
-		Result:                    result,
-		MonitoringNurse:           monitoringNurse,
-		Status:                    1,
-		CreatedTime:               time.Now().Unix(),
-		UpdatedTime:               time.Now().Unix(),
-		Conductivity:              conductivity,
-		DisplacementFlowQuantity:  displacement_flow_quantity,
-		BloodOxygenSaturation:     blood_oxygen_saturation,
-		Creator:                   adminInfo.AdminUser.Id,
-		Modify:                    0,
-		Heparin:                   heparin,
-		DialysateFlow:             dialysate_flow,
-		Urr:                       urr,
-		BloodSugar:                blood_sugar,
-		MonitorAnticoagulant:      monitor_anticoagulant,
-		MonitorAnticoagulantValue: monitor_anticoagulant_value,
+		PulseFrequency:              pulseFrequency,
+		BreathingRate:               breathingRated,
+		SystolicBloodPressure:       systolicBP,
+		DiastolicBloodPressure:      diastolicBP,
+		BloodPressureType:           int64(BPType),
+		BloodFlowVolume:             bloodFlowVolume,
+		VenousPressure:              venousPressure,
+		VenousPressureType:          venousPressureType,
+		ArterialPressure:            arterialPressure,
+		ArterialPressureType:        arterialPressureType,
+		TransmembranePressure:       transmembranePressure,
+		TransmembranePressureType:   transmembranePressureType,
+		UltrafiltrationRate:         ultrafiltrationRate,
+		UltrafiltrationVolume:       ultrafiltrationVolume,
+		SodiumConcentration:         sodiumConcentration,
+		DialysateTemperature:        dialysateTemperature,
+		Temperature:                 temperature,
+		ReplacementRate:             replacementRate,
+		DisplacementQuantity:        displacementQuantity,
+		Ktv:                         ktv,
+		Symptom:                     symptom,
+		Dispose:                     dispose,
+		Result:                      result,
+		MonitoringNurse:             monitoringNurse,
+		Status:                      1,
+		CreatedTime:                 time.Now().Unix(),
+		UpdatedTime:                 time.Now().Unix(),
+		Conductivity:                conductivity,
+		DisplacementFlowQuantity:    displacement_flow_quantity,
+		BloodOxygenSaturation:       blood_oxygen_saturation,
+		Creator:                     adminInfo.AdminUser.Id,
+		Modify:                      0,
+		Heparin:                     heparin,
+		DialysateFlow:               dialysate_flow,
+		Urr:                         urr,
+		BloodSugar:                  blood_sugar,
+		MonitorAnticoagulant:        monitor_anticoagulant,
+		MonitorAnticoagulantValue:   monitor_anticoagulant_value,
+		BloodPressureMonitoringSite: blood_pressure_monitoring_site,
+		Complication:                complication,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -246,6 +250,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	adminInfo := this.GetMobileAdminUserInfo()
 	monitor_anticoagulant, _ := this.GetInt64("monitor_anticoagulant")
 	monitor_anticoagulant_value := this.GetString("monitor_anticoagulant_value")
+	blood_pressure_monitoring_site, _ := this.GetInt64("blood_pressure_monitoring_site")
+	complication, _ := this.GetInt64("complication")
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -295,6 +301,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.BloodSugar = blood_sugar
 	monitor.MonitorAnticoagulant = monitor_anticoagulant
 	monitor.MonitorAnticoagulantValue = monitor_anticoagulant_value
+	monitor.BloodPressureMonitoringSite = blood_pressure_monitoring_site
+	monitor.Complication = complication
 	err = service.UpdateMonitor(monitor)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorUpdate)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2407,6 +2407,17 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		dehydration := dataBody["dehydration"].(string)
 		evaluation.Dehydration = dehydration
 	}
+
+	if dataBody["period"] != nil && reflect.TypeOf(dataBody["period"]).String() == "float64" {
+		period := int64(dataBody["period"].(float64))
+		evaluation.Period = period
+	}
+
+	if dataBody["estimated_food_intake"] != nil && reflect.TypeOf(dataBody["estimated_food_intake"]).String() == "string" {
+		estimated_food_intake := dataBody["estimated_food_intake"].(string)
+		evaluation.EstimatedFoodIntake = estimated_food_intake
+	}
+
 	return
 }
 

controllers/schedule_api_controller.go

@@ -790,6 +790,7 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 func (this *ScheduleApiController) GetWeekDaySchedule() {
 	week_type, _ := this.GetInt64("week_type", -1)
 	week_time, _ := this.GetInt64("week_time")
+	fmt.Println("week_time22222222222222", week_time)
 	thisTime := time.Now()
 	weekDay := int(thisTime.Weekday())
 	if weekDay == 0 {
@@ -1324,10 +1325,11 @@ func (this *ScheduleApiController) ExportSchedule() {
 			if err == nil {
 				for _, item := range schedules {
 					//查找当天日期是否存在
-					_, errcode := service.GetTodayScheduleIsExist(item.PatientId, item.ScheduleDate, item.UserOrgId)
+					_, errcode := service.GetTodayScheduleIsExist(item.PatientId, item.ScheduleDate, item.UserOrgId, item.ModeId, item.ScheduleType)
 					if errcode == gorm.ErrRecordNotFound {
 						service.CreateSchedule(item)
 					} else if errcode == nil {
+
 						schedule := models.XtSchedule{
 							PartitionId:  item.PartitionId,
 							BedId:        item.BedId,
@@ -1338,7 +1340,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 							ModeId:       item.ModeId,
 							Status:       1,
 						}
-						service.UpdateScheduleByOrgId(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
+
+						service.UpdateScheduleByOrgId(item.PatientId, item.ScheduleDate, item.UserOrgId, item.ModeId, item.ScheduleType, &schedule)
 					}
 
 				}

models/dialysis.go

@@ -84,81 +84,82 @@ func (SchedualPatient) TableName() string {
 }
 
 type SchedualPatient2 struct {
-	ID                      int64                `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId               int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	UserId                  int64                `gorm:"column:user_id" json:"user_id" form:"user_id"`
-	PatientType             int64                `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
-	Avatar                  string               `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	DialysisNo              string               `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-	AdmissionNumber         string               `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
-	Source                  int64                `gorm:"column:source" json:"source" form:"source"`
-	Lapseto                 int64                `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
-	PartitionId             int64                `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId                   int64                `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	Name                    string               `gorm:"column:name" json:"name" form:"name"`
-	Alias                   string               `gorm:"column:alias" json:"alias" form:"alias"`
-	Gender                  int64                `gorm:"column:gender" json:"gender" form:"gender"`
-	Nation                  string               `gorm:"column:nation" json:"nation" form:"nation"`
-	NativePlace             string               `gorm:"column:native_place" json:"native_place" form:"native_place"`
-	MaritalStatus           int64                `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
-	IdCardNo                string               `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	Birthday                int64                `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	ReimbursementWayId      int64                `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
-	HealthCareType          int64                `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
-	HealthCareNo            string               `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
-	HealthCareDueDate       int64                `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
-	Height                  int64                `gorm:"column:height" json:"height" form:"height"`
-	BloodType               int64                `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
-	Rh                      int64                `gorm:"column:rh" json:"rh" form:"rh"`
-	HealthCareDueAlertDate  int64                `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
-	EducationLevel          int64                `gorm:"column:education_level" json:"education_level" form:"education_level"`
-	Profession              int64                `gorm:"column:profession" json:"profession" form:"profession"`
-	Phone                   string               `gorm:"column:phone" json:"phone" form:"phone"`
-	HomeTelephone           string               `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
-	RelativePhone           string               `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
-	RelativeRelations       string               `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
-	HomeAddress             string               `gorm:"column:home_address" json:"home_address" form:"home_address"`
-	WorkUnit                string               `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
-	UnitAddress             string               `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
-	Children                int64                `gorm:"column:children" json:"children" form:"children"`
-	ReceivingDate           int64                `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
-	IsHospitalFirstDialysis int64                `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
-	FirstDialysisDate       int64                `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
-	FirstDialysisHospital   string               `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
-	InductionPeriod         int64                `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
-	InitialDialysis         int64                `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
-	TotalDialysis           int64                `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
-	AttendingDoctorId       int64                `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
-	HeadNurseId             int64                `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
-	Evaluate                string               `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
-	Diagnose                string               `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
-	Remark                  string               `gorm:"column:remark" json:"remark" form:"remark"`
-	RegistrarsId            int64                `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
-	Registrars              string               `gorm:"column:registrars" json:"registrars" form:"registrars"`
-	QrCode                  string               `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
-	BindingState            int64                `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
-	PatientComplains        string               `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
-	PresentHistory          string               `gorm:"column:present_history" json:"present_history"`     // 现病史
-	PastHistory             string               `gorm:"column:past_history" json:"past_history"`           // 既往史
-	Temperature             float64              `gorm:"column:temperature" json:"temperature"`             // 体格检查-体温
-	Pulse                   int64                `gorm:"column:pulse" json:"pulse"`                         // 体格检查-脉搏
-	Respiratory             int64                `gorm:"column:respiratory" json:"respiratory"`             // 体格检查-呼吸频率
-	SBP                     int64                `gorm:"column:sbp" json:"sbp"`                             // 体格检查-收缩压
-	DBP                     int64                `gorm:"column:dbp" json:"dbp"`                             // 体格检查-舒张压
-	Status                  int64                `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime             int64                `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime             int64                `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	DialysisSchedule        DialysisSchedule     `gorm:"ForeignKey:PatientId"`
-	InfectiousDiseases      []InfectiousDiseases `gorm:"ForeignKey:PatientId"`
-	Age                     int64                `gorm:"column:age" json:"age"`
-	IsOpenRemind            int64                `gorm:"column:is_open_remind" json:"is_open_remind"`
-	DialysisAge             int64                `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
-	ExpenseKind             int64                `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
-	TellPhone               string               `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
-	FirstTreatmentDate      int64                `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
-	ContactName             string               `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
-	UserSysBeforeCount      int64                `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
-	SchRemark               string               `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	ID                        int64                `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                 int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId                    int64                `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	PatientType               int64                `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	Avatar                    string               `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	DialysisNo                string               `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber           string               `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                    int64                `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                   int64                `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId               int64                `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                     int64                `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                      string               `gorm:"column:name" json:"name" form:"name"`
+	Alias                     string               `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                    int64                `gorm:"column:gender" json:"gender" form:"gender"`
+	Nation                    string               `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace               string               `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	MaritalStatus             int64                `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
+	IdCardNo                  string               `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                  int64                `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	ReimbursementWayId        int64                `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
+	HealthCareType            int64                `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
+	HealthCareNo              string               `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
+	HealthCareDueDate         int64                `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
+	Height                    int64                `gorm:"column:height" json:"height" form:"height"`
+	BloodType                 int64                `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
+	Rh                        int64                `gorm:"column:rh" json:"rh" form:"rh"`
+	HealthCareDueAlertDate    int64                `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
+	EducationLevel            int64                `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession                int64                `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone                     string               `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone             string               `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone             string               `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations         string               `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress               string               `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                  string               `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress               string               `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children                  int64                `gorm:"column:children" json:"children" form:"children"`
+	ReceivingDate             int64                `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
+	IsHospitalFirstDialysis   int64                `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate         int64                `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital     string               `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	InductionPeriod           int64                `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
+	InitialDialysis           int64                `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
+	TotalDialysis             int64                `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	AttendingDoctorId         int64                `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
+	HeadNurseId               int64                `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
+	Evaluate                  string               `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Diagnose                  string               `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                    string               `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId              int64                `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars                string               `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	QrCode                    string               `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
+	BindingState              int64                `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
+	PatientComplains          string               `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
+	PresentHistory            string               `gorm:"column:present_history" json:"present_history"`     // 现病史
+	PastHistory               string               `gorm:"column:past_history" json:"past_history"`           // 既往史
+	Temperature               float64              `gorm:"column:temperature" json:"temperature"`             // 体格检查-体温
+	Pulse                     int64                `gorm:"column:pulse" json:"pulse"`                         // 体格检查-脉搏
+	Respiratory               int64                `gorm:"column:respiratory" json:"respiratory"`             // 体格检查-呼吸频率
+	SBP                       int64                `gorm:"column:sbp" json:"sbp"`                             // 体格检查-收缩压
+	DBP                       int64                `gorm:"column:dbp" json:"dbp"`                             // 体格检查-舒张压
+	Status                    int64                `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime               int64                `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime               int64                `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	DialysisSchedule          DialysisSchedule     `gorm:"ForeignKey:PatientId"`
+	InfectiousDiseases        []InfectiousDiseases `gorm:"ForeignKey:PatientId"`
+	Age                       int64                `gorm:"column:age" json:"age"`
+	IsOpenRemind              int64                `gorm:"column:is_open_remind" json:"is_open_remind"`
+	DialysisAge               int64                `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	ExpenseKind               int64                `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
+	TellPhone                 string               `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate        int64                `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	ContactName               string               `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+	UserSysBeforeCount        int64                `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	SchRemark                 string               `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	HospitalFirstDialysisDate int64                `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
 }
 
 func (SchedualPatient2) TableName() string {
@@ -281,6 +282,9 @@ type PredialysisEvaluation struct {
 	ThromubusA                     string  `gorm:"column:thromubus_a" json:"thromubus_a" form:"thromubus_a"`
 	ThromubusV                     string  `gorm:"column:thromubus_v" json:"thromubus_v" form:"thromubus_v"`
 	Dehydration                    string  `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
+	PreDialysisDrugs               string  `gorm:"column:pre_dialysis_drugs" json:"pre_dialysis_drugs" form:"pre_dialysis_drugs"`
+	Period                         int64   `gorm:"column:period" json:"period" form:"period"`
+	EstimatedFoodIntake            string  `gorm:"column:estimated_food_intake" json:"estimated_food_intake" form:"estimated_food_intake"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -587,6 +591,11 @@ type AssessmentAfterDislysis struct {
 	DiastolicPressure               string  `gorm:"column:diastolic_pressure" json:"diastolic_pressure" form:"diastolic_pressure"`
 	OtherComplication               string  `gorm:"column:other_complication" json:"other_complication" form:"other_complication"`
 	Ktv                             string  `gorm:"column:ktv" json:"ktv" form:"ktv"`
+	Urr                             string  `gorm:"column:urr" json:"urr" form:"urr"`
+	Hypertenison                    int64   `gorm:"column:hypertenison" json:"hypertenison" form:"hypertenison"`
+	Hypopiesia                      int64   `gorm:"column:hypopiesia" json:"hypopiesia" form:"hypopiesia"`
+	LeaveOfficeMethod               int64   `gorm:"column:leave_office_method" json:"leave_office_method" form:"leave_office_method"`
+	Lapse                           int64   `gorm:"column:lapse" json:"lapse" form:"lapse"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {
@@ -643,52 +652,54 @@ func (DryWeightAdjust) TableName() string {
 }
 
 type MonitoringRecord struct {
-	ID                        int64   `gorm:"column:id" json:"id"`
-	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId                 int64   `gorm:"column:patient_id" json:"patient_id"`
-	DialysisOrderId           int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
-	MonitoringDate            int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
-	OperateTime               int64   `gorm:"column:operate_time" json:"operate_time"`
-	MonitoringTime            string  `gorm:"column:monitoring_time" json:"monitoring_time"`
-	PulseFrequency            float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate             float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
-	SystolicBloodPressure     float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure    float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	BloodPressureType         int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
-	Pic                       string  `gorm:"column:pic" json:"pic"`
-	BloodFlowVolume           float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
-	VenousPressure            float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
-	VenousPressureType        int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
-	ArterialPressure          float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
-	ArterialPressureType      int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
-	TransmembranePressure     float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
-	TransmembranePressureType int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
-	UltrafiltrationRate       float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
-	UltrafiltrationVolume     float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
-	SodiumConcentration       float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`
-	DialysateTemperature      float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
-	Temperature               float64 `gorm:"column:temperature" json:"temperature"`
-	ReplacementRate           float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
-	DisplacementQuantity      float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
-	Ktv                       float64 `gorm:"column:ktv" json:"ktv"`
-	Symptom                   string  `gorm:"column:symptom" json:"symptom"`
-	Dispose                   string  `gorm:"column:dispose" json:"dispose"`
-	Result                    string  `gorm:"column:result" json:"result"`
-	MonitoringNurse           int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
-	Status                    int64   `gorm:"column:status" json:"status"`
-	CreatedTime               int64   `gorm:"column:created_time" json:"created_time"`
-	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time"`
-	Conductivity              float64 `gorm:"column:conductivity" json:"conductivity"`
-	DisplacementFlowQuantity  float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
-	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
-	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
-	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	Urr                       string  `gorm:"column:urr" json:"urr"`
-	BloodSugar                float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
-	MonitorAnticoagulant      int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
-	MonitorAnticoagulantValue string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	ID                          int64   `gorm:"column:id" json:"id"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                   int64   `gorm:"column:patient_id" json:"patient_id"`
+	DialysisOrderId             int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	MonitoringDate              int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
+	OperateTime                 int64   `gorm:"column:operate_time" json:"operate_time"`
+	MonitoringTime              string  `gorm:"column:monitoring_time" json:"monitoring_time"`
+	PulseFrequency              float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
+	BreathingRate               float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
+	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	BloodPressureType           int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
+	Pic                         string  `gorm:"column:pic" json:"pic"`
+	BloodFlowVolume             float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
+	VenousPressure              float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
+	VenousPressureType          int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
+	ArterialPressure            float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
+	ArterialPressureType        int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
+	TransmembranePressure       float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
+	TransmembranePressureType   int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
+	UltrafiltrationRate         float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
+	UltrafiltrationVolume       float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
+	SodiumConcentration         float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`
+	DialysateTemperature        float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
+	Temperature                 float64 `gorm:"column:temperature" json:"temperature"`
+	ReplacementRate             float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
+	DisplacementQuantity        float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
+	Ktv                         float64 `gorm:"column:ktv" json:"ktv"`
+	Symptom                     string  `gorm:"column:symptom" json:"symptom"`
+	Dispose                     string  `gorm:"column:dispose" json:"dispose"`
+	Result                      string  `gorm:"column:result" json:"result"`
+	MonitoringNurse             int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
+	Status                      int64   `gorm:"column:status" json:"status"`
+	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time"`
+	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time"`
+	Conductivity                float64 `gorm:"column:conductivity" json:"conductivity"`
+	DisplacementFlowQuantity    float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
+	BloodOxygenSaturation       string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Creator                     int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                      int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	Heparin                     float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow               float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Urr                         string  `gorm:"column:urr" json:"urr"`
+	BloodSugar                  float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
+	MonitorAnticoagulant        int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
+	MonitorAnticoagulantValue   string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
+	Complication                int64   `gorm:"column:complication" json:"complication" form:"complication"`
 }
 
 func (MonitoringRecord) TableName() string {

models/patient_models.go

@@ -230,6 +230,8 @@ type DialysisPrescription struct {
 	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"`
 }
 
 func (DialysisPrescription) TableName() string {

routers/router.go

@@ -73,4 +73,5 @@ func init() {
 	new_m_api.NewDrugApiControllersRegisterRouters()
 	controllers.HisProjectRouters()
 	controllers.GdybRegistRouters()
+
 }

service/dialysis_service.go

@@ -1101,7 +1101,7 @@ func UpdateDialysisBeforePrepareTwo(info *models.DialysisBeforePrepare) (err err
 
 func UpdateAutoReduceDetailSix(detail *models.AutomaticReduceDetail) (err error) {
 
-	err = writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? and good_type_id = ? And patient_id = ? and org_id =?", detail.GoodId, detail.GoodTypeId, detail.PatientId, detail.OrgId).Updates(map[string]interface{}{"count": detail.Count, "mtime": detail.Mtime, "status": 1}).Error
+	err = writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? and good_type_id = ? And patient_id = ? and org_id =? and record_time = ?", detail.GoodId, detail.GoodTypeId, detail.PatientId, detail.OrgId, detail.RecordTime).Updates(map[string]interface{}{"count": detail.Count, "mtime": detail.Mtime, "status": 1}).Error
 	return err
 }
 

service/schedule_service.go

@@ -133,10 +133,10 @@ func CreateSchedule(m *models.Schedule) error {
 	return writeDb.Model(&models.Schedule{}).Create(&m).Error
 }
 
-func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64) (*models.XtSchedule, error) {
+func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64, mode_id int64, schedule_type int64) (*models.XtSchedule, error) {
 	var scheudle models.XtSchedule
 	var err error
-	err = XTReadDB().Model(&scheudle).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, schedudate, orgid).Find(&scheudle).Error
+	err = XTReadDB().Model(&scheudle).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1 and mode_id = ? and schedule_type = ?", patientid, schedudate, orgid, mode_id, schedule_type).Find(&scheudle).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -146,8 +146,8 @@ func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64) (*m
 	return &scheudle, nil
 }
 
-func UpdateScheduleByOrgId(patientid int64, scheduledate int64, orgid int64, sch *models.XtSchedule) error {
-	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, scheduledate, orgid).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix()}).Error
+func UpdateScheduleByOrgId(patientid int64, scheduledate int64, orgid int64, mode_id int64, schedule_type int64, sch *models.XtSchedule) error {
+	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1 and mode_id = ? and schedule_type = ?", patientid, scheduledate, orgid, mode_id, schedule_type).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix()}).Error
 	return err
 }
 
@@ -351,7 +351,8 @@ func GetSchedualPatientsByKeywords(keywords string, org_id int64) (schedule []*m
 }
 
 func GetWeekDayScheduleTwo(orgID int64, scheduleDate int64, scheduleDates *time.Time, weektime int64) (schedules []*models.WeekSchedule, err error) {
-
+	fmt.Println("日期22222222222222222", scheduleDate)
+	fmt.Println("scheduledate2222222222", scheduleDates)
 	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
 		db = db.Where("s.user_org_id = ?", orgID)
@@ -385,8 +386,7 @@ func GetWeekDayScheduleTwo(orgID int64, scheduleDate int64, scheduleDates *time.
 				advice.IsCheck = 1
 				if advice.FrequencyType == 3 {
 					week := int(scheduleDates.Weekday())
-					fmt.Println("week-------", week)
-					fmt.Println(advice.WeekDay)
+
 					switch week {
 					case 1:
 						if strings.Index(advice.WeekDay, "周一") > -1 {