修改bug

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9550
-runmode = dev
+runmode = prod
 
 copyrequestbody = true
 sessionon = true

controllers/admin_api_controllers/admin_api_router_register.go

@@ -45,4 +45,8 @@ func AdminAPIControllersRegisterRouters() {
 	beego.Router("/admin/api/followorg/list", &SystemApiController{}, "get:GetWaitFollowOrg")
 	beego.Router("/admin/api/unfolloworg/list", &SystemApiController{}, "get:GetAllFollowOrg")
 
+	beego.Router("/admin/api/org/list", &OrgAPIController{}, "get:GetOrgListOther")
+
+	//beego.Router("/admin/api/unfolloworg/list", &SystemApiController{}, "get:GetAllFollowOrg")
+
 }

controllers/admin_api_controllers/org_api_controller.go

@@ -322,3 +322,16 @@ func (this *OrgAPIController) GetOrgBed() {
 		"numbers": numbers,
 	})
 }
+
+func (this *OrgAPIController) GetOrgListOther() {
+	follow, _ := this.GetInt64("follow")
+
+	list, err := service.GetFollowOrgList(follow)
+	if err != nil {
+
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	}
+}

controllers/function_api_controllers/function_base_controller.go

@@ -0,0 +1,57 @@
+package function_api_controllers
+
+import (
+	"XT_Admin_Api/controllers"
+	"XT_Admin_Api/enums"
+	"XT_Admin_Api/models/admin_models"
+)
+
+type FuntionBaseController struct {
+	controllers.BaseAPIController
+}
+
+func (this *FuntionBaseController) ErrorLog(format string, a ...interface{}) {
+	//beego.Error(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
+}
+
+func (this *FuntionBaseController) WarnLog(format string, a ...interface{}) {
+	//beego.Warn(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
+}
+
+func (this *FuntionBaseController) InfoLog(format string, a ...interface{}) {
+	//beego.Info(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
+}
+
+func (this *FuntionBaseController) DebugLog(format string, a ...interface{}) {
+	//beego.Debug(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
+}
+
+func (this *FuntionBaseController) TraceLog(format string, a ...interface{}) {
+	//beego.Trace(fmt.Sprintf("[管理员后台] %v", fmt.Sprintf(format, a...)))
+}
+
+func (this *FuntionBaseController) GetAdminInfo() *AdminInfo {
+	userInfo := this.GetSession("admin_info")
+	if userInfo == nil {
+		return nil
+	} else {
+		return userInfo.(*AdminInfo)
+	}
+}
+
+type AdminInfo struct {
+	Admin *admin_models.AdminAccount
+}
+
+type FunctionBaseAPIAuthController struct {
+	FuntionBaseController
+}
+
+func (this *FunctionBaseAPIAuthController) Prepare() {
+	this.FuntionBaseController.Prepare()
+	adminInfo := this.GetAdminInfo()
+	if adminInfo == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
+	}
+}

models/function_models/fuction_query_models.go

@@ -1,152 +1,151 @@
 package function_models
 
 type XtPatients 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"`
-	Avatar string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	PatientType int64 `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
-	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"`
-	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"`
-	PredialysisCondition string `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
-	PreHospitalDialysisFrequency string `gorm:"column:pre_hospital_dialysis_frequency" json:"pre_hospital_dialysis_frequency" form:"pre_hospital_dialysis_frequency"`
-	PreHospitalDialysisTimes int64 `gorm:"column:pre_hospital_dialysis_times" json:"pre_hospital_dialysis_times" form:"pre_hospital_dialysis_times"`
-	HospitalFirstDialysisDate int64 `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
-	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" form:"patient_complains"`
-	PresentHistory string `gorm:"column:present_history" json:"present_history" form:"present_history"`
-	PastHistory string `gorm:"column:past_history" json:"past_history" form:"past_history"`
-	Temperature float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
-	Pulse int64 `gorm:"column:pulse" json:"pulse" form:"pulse"`
-	Respiratory int64 `gorm:"column:respiratory" json:"respiratory" form:"respiratory"`
-	Sbp int64 `gorm:"column:sbp" json:"sbp" form:"sbp"`
-	Dbp int64 `gorm:"column:dbp" json:"dbp" form:"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"`
-	Nation string `gorm:"column:nation" json:"nation" form:"nation"`
-	NativePlace string `gorm:"column:native_place" json:"native_place" form:"native_place"`
-	Age int64 `gorm:"column:age" json:"age" form:"age"`
+	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"`
+	Avatar                       string  `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType                  int64   `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	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"`
+	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"`
+	PredialysisCondition         string  `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
+	PreHospitalDialysisFrequency string  `gorm:"column:pre_hospital_dialysis_frequency" json:"pre_hospital_dialysis_frequency" form:"pre_hospital_dialysis_frequency"`
+	PreHospitalDialysisTimes     int64   `gorm:"column:pre_hospital_dialysis_times" json:"pre_hospital_dialysis_times" form:"pre_hospital_dialysis_times"`
+	HospitalFirstDialysisDate    int64   `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	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" form:"patient_complains"`
+	PresentHistory               string  `gorm:"column:present_history" json:"present_history" form:"present_history"`
+	PastHistory                  string  `gorm:"column:past_history" json:"past_history" form:"past_history"`
+	Temperature                  float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
+	Pulse                        int64   `gorm:"column:pulse" json:"pulse" form:"pulse"`
+	Respiratory                  int64   `gorm:"column:respiratory" json:"respiratory" form:"respiratory"`
+	Sbp                          int64   `gorm:"column:sbp" json:"sbp" form:"sbp"`
+	Dbp                          int64   `gorm:"column:dbp" json:"dbp" form:"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"`
+	Nation                       string  `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace                  string  `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	Age                          int64   `gorm:"column:age" json:"age" form:"age"`
 }
 
 func (XtPatients) TableName() string {
 	return "xt_patients"
 }
 
-
 type XtDialysisPrescription 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"`
-	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Dialyzer int64 `gorm:"column:dialyzer" json:"dialyzer" form:"dialyzer"`
-	MachineType string `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
-	DewaterAmount float64 `gorm:"column:dewater_amount" json:"dewater_amount" form:"dewater_amount"`
-	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
-	PrescriptionDewatering float64 `gorm:"column:prescription_dewatering" json:"prescription_dewatering" form:"prescription_dewatering"`
-	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"`
-	ModeId int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	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"`
-	DialysisDuration float64 `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
-	ReplacementTotal float64 `gorm:"column:replacement_total" json:"replacement_total" form:"replacement_total"`
-	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"`
-	DryWeight float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
-	VascularAccessMode int64 `gorm:"column:vascular_access_mode" json:"vascular_access_mode" form:"vascular_access_mode"`
-	VascularAccess int64 `gorm:"column:vascular_access" json:"vascular_access" form:"vascular_access"`
-	BloodFlowVolume float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
-	DialysateFlow float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	DisplaceLiqui float64 `gorm:"column:displace_liqui" json:"displace_liqui" form:"displace_liqui"`
-	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"`
-	Glucose float64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
-	DialysateTemperature float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature" form:"dialysate_temperature"`
-	Conductivity float64 `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
-	PrescriptionDoctor int64 `gorm:"column:prescription_doctor" json:"prescription_doctor" form:"prescription_doctor"`
-	Creater int64 `gorm:"column:creater" json:"creater" form:"creater"`
-	Modifier int64 `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Remark string `gorm:"column:remark" json:"remark" form:"remark"`
-	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"`
-	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	RecordId int64 `gorm:"column:record_id" json:"record_id" form:"record_id"`
-	TargetUltrafiltration float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
-	DialysateFormulation int64 `gorm:"column:dialysate_formulation" json:"dialysate_formulation" form:"dialysate_formulation"`
-	BodyFluid int64 `gorm:"column:body_fluid" json:"body_fluid" form:"body_fluid"`
-	SpecialMedicine int64 `gorm:"column:special_medicine" json:"special_medicine" form:"special_medicine"`
-	SpecialMedicineOther string `gorm:"column:special_medicine_other" json:"special_medicine_other" form:"special_medicine_other"`
-	DisplaceLiquiPart int64 `gorm:"column:displace_liqui_part" json:"displace_liqui_part" form:"displace_liqui_part"`
-	BloodAccess int64 `gorm:"column:blood_access" json:"blood_access" form:"blood_access"`
-	DisplaceLiquiValue float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
-	Ultrafiltration float64 `gorm:"column:ultrafiltration" json:"ultrafiltration" form:"ultrafiltration"`
-	BodyFluidOther string `gorm:"column:body_fluid_other" json:"body_fluid_other" form:"body_fluid_other"`
-	Niprocart int64 `gorm:"column:niprocart" json:"niprocart" form:"niprocart"`
-	Jms int64 `gorm:"column:jms" json:"jms" form:"jms"`
-	FistulaNeedleSet int64 `gorm:"column:fistula_needle_set" json:"fistula_needle_set" form:"fistula_needle_set"`
-	FistulaNeedleSet16 int64 `gorm:"column:fistula_needle_set_16" json:"fistula_needle_set_16" form:"fistula_needle_set_16"`
-	Hemoperfusion int64 `gorm:"column:hemoperfusion" json:"hemoperfusion" form:"hemoperfusion"`
-	DialyserSterilised int64 `gorm:"column:dialyser_sterilised" json:"dialyser_sterilised" form:"dialyser_sterilised"`
-	Filtryzer int64 `gorm:"column:filtryzer" json:"filtryzer" form:"filtryzer"`
-	TargetKtv float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
-	Dialyzers int64 `gorm:"column:dialyzers" json:"dialyzers" form:"dialyzers"`
-	Injector int64 `gorm:"column:injector" json:"injector" form:"injector"`
-	Bloodlines int64 `gorm:"column:bloodlines" json:"bloodlines" form:"bloodlines"`
-	TubingHemodialysis int64 `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis" form:"tubing_hemodialysis"`
-	Package int64 `gorm:"column:package" json:"package" form:"package"`
-	ALiquid int64 `gorm:"column:a_liquid" json:"a_liquid" form:"a_liquid"`
+	ID                         int64   `gorm:"column:id" json:"id" form:"id"`
+	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"`
+	Dialyzer                   int64   `gorm:"column:dialyzer" json:"dialyzer" form:"dialyzer"`
+	MachineType                string  `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
+	DewaterAmount              float64 `gorm:"column:dewater_amount" json:"dewater_amount" form:"dewater_amount"`
+	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+	PrescriptionDewatering     float64 `gorm:"column:prescription_dewatering" json:"prescription_dewatering" form:"prescription_dewatering"`
+	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"`
+	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	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"`
+	DialysisDuration           float64 `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
+	ReplacementTotal           float64 `gorm:"column:replacement_total" json:"replacement_total" form:"replacement_total"`
+	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"`
+	DryWeight                  float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	VascularAccessMode         int64   `gorm:"column:vascular_access_mode" json:"vascular_access_mode" form:"vascular_access_mode"`
+	VascularAccess             int64   `gorm:"column:vascular_access" json:"vascular_access" form:"vascular_access"`
+	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	DialysateFlow              float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	DisplaceLiqui              float64 `gorm:"column:displace_liqui" json:"displace_liqui" form:"displace_liqui"`
+	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"`
+	Glucose                    float64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
+	DialysateTemperature       float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature" form:"dialysate_temperature"`
+	Conductivity               float64 `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
+	PrescriptionDoctor         int64   `gorm:"column:prescription_doctor" json:"prescription_doctor" form:"prescription_doctor"`
+	Creater                    int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier                   int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Remark                     string  `gorm:"column:remark" json:"remark" form:"remark"`
+	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"`
+	RecordDate                 int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	RecordId                   int64   `gorm:"column:record_id" json:"record_id" form:"record_id"`
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
+	DialysateFormulation       int64   `gorm:"column:dialysate_formulation" json:"dialysate_formulation" form:"dialysate_formulation"`
+	BodyFluid                  int64   `gorm:"column:body_fluid" json:"body_fluid" form:"body_fluid"`
+	SpecialMedicine            int64   `gorm:"column:special_medicine" json:"special_medicine" form:"special_medicine"`
+	SpecialMedicineOther       string  `gorm:"column:special_medicine_other" json:"special_medicine_other" form:"special_medicine_other"`
+	DisplaceLiquiPart          int64   `gorm:"column:displace_liqui_part" json:"displace_liqui_part" form:"displace_liqui_part"`
+	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access" form:"blood_access"`
+	DisplaceLiquiValue         float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
+	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration" form:"ultrafiltration"`
+	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other" form:"body_fluid_other"`
+	Niprocart                  int64   `gorm:"column:niprocart" json:"niprocart" form:"niprocart"`
+	Jms                        int64   `gorm:"column:jms" json:"jms" form:"jms"`
+	FistulaNeedleSet           int64   `gorm:"column:fistula_needle_set" json:"fistula_needle_set" form:"fistula_needle_set"`
+	FistulaNeedleSet16         int64   `gorm:"column:fistula_needle_set_16" json:"fistula_needle_set_16" form:"fistula_needle_set_16"`
+	Hemoperfusion              int64   `gorm:"column:hemoperfusion" json:"hemoperfusion" form:"hemoperfusion"`
+	DialyserSterilised         int64   `gorm:"column:dialyser_sterilised" json:"dialyser_sterilised" form:"dialyser_sterilised"`
+	Filtryzer                  int64   `gorm:"column:filtryzer" json:"filtryzer" form:"filtryzer"`
+	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
+	Dialyzers                  int64   `gorm:"column:dialyzers" json:"dialyzers" form:"dialyzers"`
+	Injector                   int64   `gorm:"column:injector" json:"injector" form:"injector"`
+	Bloodlines                 int64   `gorm:"column:bloodlines" json:"bloodlines" form:"bloodlines"`
+	TubingHemodialysis         int64   `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis" form:"tubing_hemodialysis"`
+	Package                    int64   `gorm:"column:package" json:"package" form:"package"`
+	ALiquid                    int64   `gorm:"column:a_liquid" json:"a_liquid" form:"a_liquid"`
 }
 
 func (XtDialysisPrescription) TableName() string {
@@ -154,109 +153,107 @@ func (XtDialysisPrescription) TableName() string {
 }
 
 type XtReceiveTreatmentAsses struct {
-	ID int64 `gorm:"column:id" json:"id" form:"id"`
-	Way int64 `gorm:"column:way" json:"way" form:"way"`
-	Consciousness int64 `gorm:"column:consciousness" json:"consciousness" form:"consciousness"`
-	Appetite int64 `gorm:"column:appetite" json:"appetite" form:"appetite"`
-	Condition int64 `gorm:"column:condition" json:"condition" form:"condition"`
-	Creater int64 `gorm:"column:creater" json:"creater" form:"creater"`
-	Posture int64 `gorm:"column:posture" json:"posture" form:"posture"`
-	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdateTime int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
-	RecordId int64 `gorm:"column:record_id" json:"record_id" form:"record_id"`
-	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Modifier int64 `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Status int64 `gorm:"column:status" json:"status" form:"status"`
-	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"`
-	SickCondition int64 `gorm:"column:sick_condition" json:"sick_condition" form:"sick_condition"`
-	SickConditionOther string `gorm:"column:sick_condition_other" json:"sick_condition_other" form:"sick_condition_other"`
-	DangerLevel int64 `gorm:"column:danger_level" json:"danger_level" form:"danger_level"`
-	Intake int64 `gorm:"column:intake" json:"intake" form:"intake"`
-	Nutrition int64 `gorm:"column:nutrition" json:"nutrition" form:"nutrition"`
-	PsychologicalAssessment int64 `gorm:"column:psychological_assessment" json:"psychological_assessment" form:"psychological_assessment"`
+	ID                           int64  `gorm:"column:id" json:"id" form:"id"`
+	Way                          int64  `gorm:"column:way" json:"way" form:"way"`
+	Consciousness                int64  `gorm:"column:consciousness" json:"consciousness" form:"consciousness"`
+	Appetite                     int64  `gorm:"column:appetite" json:"appetite" form:"appetite"`
+	Condition                    int64  `gorm:"column:condition" json:"condition" form:"condition"`
+	Creater                      int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Posture                      int64  `gorm:"column:posture" json:"posture" form:"posture"`
+	CreatedTime                  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdateTime                   int64  `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	RecordId                     int64  `gorm:"column:record_id" json:"record_id" form:"record_id"`
+	RecordDate                   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Modifier                     int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Status                       int64  `gorm:"column:status" json:"status" form:"status"`
+	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"`
+	SickCondition                int64  `gorm:"column:sick_condition" json:"sick_condition" form:"sick_condition"`
+	SickConditionOther           string `gorm:"column:sick_condition_other" json:"sick_condition_other" form:"sick_condition_other"`
+	DangerLevel                  int64  `gorm:"column:danger_level" json:"danger_level" form:"danger_level"`
+	Intake                       int64  `gorm:"column:intake" json:"intake" form:"intake"`
+	Nutrition                    int64  `gorm:"column:nutrition" json:"nutrition" form:"nutrition"`
+	PsychologicalAssessment      int64  `gorm:"column:psychological_assessment" json:"psychological_assessment" form:"psychological_assessment"`
 	PsychologicalAssessmentOther string `gorm:"column:psychological_assessment_other" json:"psychological_assessment_other" form:"psychological_assessment_other"`
-	IsPrecaution int64 `gorm:"column:is_precaution" json:"is_precaution" form:"is_precaution"`
-	Score string `gorm:"column:score" json:"score" form:"score"`
-	Precaution int64 `gorm:"column:precaution" json:"precaution" form:"precaution"`
-	PrecautionOther string `gorm:"column:precaution_other" json:"precaution_other" form:"precaution_other"`
-	PsychologicalOther string `gorm:"column:psychological_other" json:"psychological_other" form:"psychological_other"`
+	IsPrecaution                 int64  `gorm:"column:is_precaution" json:"is_precaution" form:"is_precaution"`
+	Score                        string `gorm:"column:score" json:"score" form:"score"`
+	Precaution                   int64  `gorm:"column:precaution" json:"precaution" form:"precaution"`
+	PrecautionOther              string `gorm:"column:precaution_other" json:"precaution_other" form:"precaution_other"`
+	PsychologicalOther           string `gorm:"column:psychological_other" json:"psychological_other" form:"psychological_other"`
 }
 
 func (XtReceiveTreatmentAsses) TableName() string {
 	return "xt_receive_treatement_asses"
 }
 
-
 type XtAssessmentBeforeDislysis 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"`
-	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	AssessmentDate int64 `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
-	DialysisOrderId int64 `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
-	Temperature float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
-	PulseFrequency float64 `gorm:"column:pulse_frequency" json:"pulse_frequency" form:"pulse_frequency"`
-	BreathingRate float64 `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
-	SystolicBloodPressure float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
-	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
-	BloodPressureType int64 `gorm:"column:blood_pressure_type" json:"blood_pressure_type" form:"blood_pressure_type"`
-	DryWeight float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
-	WeightAfterLastTransparency float64 `gorm:"column:weight_after_last_transparency" json:"weight_after_last_transparency" form:"weight_after_last_transparency"`
-	WeighingWay string `gorm:"column:weighing_way" json:"weighing_way" form:"weighing_way"`
-	WeighingBefore float64 `gorm:"column:weighing_before" json:"weighing_before" form:"weighing_before"`
-	AdditionalWeight float64 `gorm:"column:additional_weight" json:"additional_weight" form:"additional_weight"`
-	WeightBefore float64 `gorm:"column:weight_before" json:"weight_before" form:"weight_before"`
-	WeightGain float64 `gorm:"column:weight_gain" json:"weight_gain" form:"weight_gain"`
-	PreloadedDewatering float64 `gorm:"column:preloaded_dewatering" json:"preloaded_dewatering" form:"preloaded_dewatering"`
-	UltrafiltrationAmount float64 `gorm:"column:ultrafiltration_amount" json:"ultrafiltration_amount" form:"ultrafiltration_amount"`
-	DialysisInterphase string `gorm:"column:dialysis_interphase" json:"dialysis_interphase" form:"dialysis_interphase"`
-	LastPostDialysis string `gorm:"column:last_post_dialysis" json:"last_post_dialysis" form:"last_post_dialysis"`
-	SymptomBeforeDialysis string `gorm:"column:symptom_before_dialysis" json:"symptom_before_dialysis" form:"symptom_before_dialysis"`
-	InternalFistula string `gorm:"column:internal_fistula" json:"internal_fistula" form:"internal_fistula"`
-	InternalFistulaSkin string `gorm:"column:internal_fistula_skin" json:"internal_fistula_skin" form:"internal_fistula_skin"`
-	CatheterBend int64 `gorm:"column:catheter_bend" json:"catheter_bend" form:"catheter_bend"`
-	Catheter string `gorm:"column:catheter" json:"catheter" form:"catheter"`
-	Complication string `gorm:"column:complication" json:"complication" form:"complication"`
-	Evaluator int64 `gorm:"column:evaluator" json:"evaluator" form:"evaluator"`
-	Creater int64 `gorm:"column:creater" json:"creater" form:"creater"`
-	Remark string `gorm:"column:remark" json:"remark" form:"remark"`
-	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"`
-	Modifier int64 `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	BloodAccessPartId int64 `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
-	BloodAccessPartOperaId int64 `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id" form:"blood_access_part_opera_id"`
-	IsHemorrhage int64 `gorm:"column:is_hemorrhage" json:"is_hemorrhage" form:"is_hemorrhage"`
-	Hemorrhage string `gorm:"column:hemorrhage" json:"hemorrhage" form:"hemorrhage"`
-	HemorrhageOther string `gorm:"column:hemorrhage_other" json:"hemorrhage_other" form:"hemorrhage_other"`
-	PunctureMethod string `gorm:"column:puncture_method" json:"puncture_method" form:"puncture_method"`
-	BloodAccessInternalFistula string `gorm:"column:blood_access_internal_fistula" json:"blood_access_internal_fistula" form:"blood_access_internal_fistula"`
-	InternalFistulaOther string `gorm:"column:internal_fistula_other" json:"internal_fistula_other" form:"internal_fistula_other"`
-	BloodAccessNoise int64 `gorm:"column:blood_access_noise" json:"blood_access_noise" form:"blood_access_noise"`
-	PunctureWay int64 `gorm:"column:puncture_way" json:"puncture_way" form:"puncture_way"`
-	VenousCatheterization int64 `gorm:"column:venous_catheterization" json:"venous_catheterization" form:"venous_catheterization"`
-	VenousCatheterizationPart int64 `gorm:"column:venous_catheterization_part" json:"venous_catheterization_part" form:"venous_catheterization_part"`
-	VenousCatheterizationPartOther string `gorm:"column:venous_catheterization_part_other" json:"venous_catheterization_part_other" form:"venous_catheterization_part_other"`
-	DuctusArantii string `gorm:"column:ductus_arantii" json:"ductus_arantii" form:"ductus_arantii"`
-	EmergencyTreatment int64 `gorm:"column:emergency_treatment" json:"emergency_treatment" form:"emergency_treatment"`
-	EmergencyTreatmentOther string `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other" form:"emergency_treatment_other"`
-	DialysisCount int64 `gorm:"column:dialysis_count" json:"dialysis_count" form:"dialysis_count"`
-	AssessmentDoctor int64 `gorm:"column:assessment_doctor" json:"assessment_doctor" form:"assessment_doctor"`
-	AssessmentTime int64 `gorm:"column:assessment_time" json:"assessment_time" form:"assessment_time"`
-	MachineType string `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
-	IsInfect int64 `gorm:"column:is_infect" json:"is_infect" form:"is_infect"`
-	Exposed float64 `gorm:"column:exposed" json:"exposed" form:"exposed"`
-	Skin int64 `gorm:"column:skin" json:"skin" form:"skin"`
-	SkinOther string `gorm:"column:skin_other" json:"skin_other" form:"skin_other"`
-	InfectOther string `gorm:"column:infect_other" json:"infect_other" form:"infect_other"`
-	DuctusArantiiOther string `gorm:"column:ductus_arantii_other" json:"ductus_arantii_other" form:"ductus_arantii_other"`
+	ID                             int64   `gorm:"column:id" json:"id" form:"id"`
+	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"`
+	AssessmentDate                 int64   `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
+	DialysisOrderId                int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	Temperature                    float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
+	PulseFrequency                 float64 `gorm:"column:pulse_frequency" json:"pulse_frequency" form:"pulse_frequency"`
+	BreathingRate                  float64 `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
+	SystolicBloodPressure          float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
+	DiastolicBloodPressure         float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
+	BloodPressureType              int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type" form:"blood_pressure_type"`
+	DryWeight                      float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	WeightAfterLastTransparency    float64 `gorm:"column:weight_after_last_transparency" json:"weight_after_last_transparency" form:"weight_after_last_transparency"`
+	WeighingWay                    string  `gorm:"column:weighing_way" json:"weighing_way" form:"weighing_way"`
+	WeighingBefore                 float64 `gorm:"column:weighing_before" json:"weighing_before" form:"weighing_before"`
+	AdditionalWeight               float64 `gorm:"column:additional_weight" json:"additional_weight" form:"additional_weight"`
+	WeightBefore                   float64 `gorm:"column:weight_before" json:"weight_before" form:"weight_before"`
+	WeightGain                     float64 `gorm:"column:weight_gain" json:"weight_gain" form:"weight_gain"`
+	PreloadedDewatering            float64 `gorm:"column:preloaded_dewatering" json:"preloaded_dewatering" form:"preloaded_dewatering"`
+	UltrafiltrationAmount          float64 `gorm:"column:ultrafiltration_amount" json:"ultrafiltration_amount" form:"ultrafiltration_amount"`
+	DialysisInterphase             string  `gorm:"column:dialysis_interphase" json:"dialysis_interphase" form:"dialysis_interphase"`
+	LastPostDialysis               string  `gorm:"column:last_post_dialysis" json:"last_post_dialysis" form:"last_post_dialysis"`
+	SymptomBeforeDialysis          string  `gorm:"column:symptom_before_dialysis" json:"symptom_before_dialysis" form:"symptom_before_dialysis"`
+	InternalFistula                string  `gorm:"column:internal_fistula" json:"internal_fistula" form:"internal_fistula"`
+	InternalFistulaSkin            string  `gorm:"column:internal_fistula_skin" json:"internal_fistula_skin" form:"internal_fistula_skin"`
+	CatheterBend                   int64   `gorm:"column:catheter_bend" json:"catheter_bend" form:"catheter_bend"`
+	Catheter                       string  `gorm:"column:catheter" json:"catheter" form:"catheter"`
+	Complication                   string  `gorm:"column:complication" json:"complication" form:"complication"`
+	Evaluator                      int64   `gorm:"column:evaluator" json:"evaluator" form:"evaluator"`
+	Creater                        int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Remark                         string  `gorm:"column:remark" json:"remark" form:"remark"`
+	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"`
+	Modifier                       int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	BloodAccessPartId              int64   `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	BloodAccessPartOperaId         int64   `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id" form:"blood_access_part_opera_id"`
+	IsHemorrhage                   int64   `gorm:"column:is_hemorrhage" json:"is_hemorrhage" form:"is_hemorrhage"`
+	Hemorrhage                     string  `gorm:"column:hemorrhage" json:"hemorrhage" form:"hemorrhage"`
+	HemorrhageOther                string  `gorm:"column:hemorrhage_other" json:"hemorrhage_other" form:"hemorrhage_other"`
+	PunctureMethod                 string  `gorm:"column:puncture_method" json:"puncture_method" form:"puncture_method"`
+	BloodAccessInternalFistula     string  `gorm:"column:blood_access_internal_fistula" json:"blood_access_internal_fistula" form:"blood_access_internal_fistula"`
+	InternalFistulaOther           string  `gorm:"column:internal_fistula_other" json:"internal_fistula_other" form:"internal_fistula_other"`
+	BloodAccessNoise               int64   `gorm:"column:blood_access_noise" json:"blood_access_noise" form:"blood_access_noise"`
+	PunctureWay                    int64   `gorm:"column:puncture_way" json:"puncture_way" form:"puncture_way"`
+	VenousCatheterization          int64   `gorm:"column:venous_catheterization" json:"venous_catheterization" form:"venous_catheterization"`
+	VenousCatheterizationPart      int64   `gorm:"column:venous_catheterization_part" json:"venous_catheterization_part" form:"venous_catheterization_part"`
+	VenousCatheterizationPartOther string  `gorm:"column:venous_catheterization_part_other" json:"venous_catheterization_part_other" form:"venous_catheterization_part_other"`
+	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii" form:"ductus_arantii"`
+	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment" form:"emergency_treatment"`
+	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other" form:"emergency_treatment_other"`
+	DialysisCount                  int64   `gorm:"column:dialysis_count" json:"dialysis_count" form:"dialysis_count"`
+	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor" form:"assessment_doctor"`
+	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time" form:"assessment_time"`
+	MachineType                    string  `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
+	IsInfect                       int64   `gorm:"column:is_infect" json:"is_infect" form:"is_infect"`
+	Exposed                        float64 `gorm:"column:exposed" json:"exposed" form:"exposed"`
+	Skin                           int64   `gorm:"column:skin" json:"skin" form:"skin"`
+	SkinOther                      string  `gorm:"column:skin_other" json:"skin_other" form:"skin_other"`
+	InfectOther                    string  `gorm:"column:infect_other" json:"infect_other" form:"infect_other"`
+	DuctusArantiiOther             string  `gorm:"column:ductus_arantii_other" json:"ductus_arantii_other" form:"ductus_arantii_other"`
 }
 
 func (XtAssessmentBeforeDislysis) TableName() string {
 	return "xt_assessment_before_dislysis"
 }
 
-
 type DoctorAdvice struct {
 	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
 	GroupNo               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
@@ -331,26 +328,26 @@ func (DoubleCheck) TableName() string {
 }
 
 type DialysisOrder struct {
-	ID             int64        `gorm:"column:id" json:"id"`
-	DialysisDate   int64        `gorm:"column:dialysis_date" json:"dialysis_date"`
-	UserOrgId      int64        `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId      int64        `gorm:"column:patient_id" json:"patient_id"`
-	PrescriptionId int64        `gorm:"column:prescription_id" json:"prescription_id"`
-	Stage          int64        `gorm:"column:stage" json:"stage"`
-	Remark         string       `gorm:"column:remark" json:"remark"`
-	BedID          int64        `gorm:"column:bed_id" json:"bed_id"`
-	StartNurse     int64        `gorm:"column:start_nurse" json:"start_nurse"`
-	FinishNurse    int64        `gorm:"column:finish_nurse" json:"finish_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"`
-	StartTime      int64        `gorm:"column:start_time" json:"start_time"`
-	EndTime        int64        `gorm:"column:end_time" json:"end_time"`
-	PunctureNurse  int64        `gorm:"column:puncture_nurse" json:"puncture_nurse"`
-	Creator        int64        `gorm:"column:creator" json:"creator"`
-	Modifier       int64        `gorm:"column:modifier" json:"modifier"`
-	FinishCreator  int64        `gorm:"column:finish_creator" json:"finish_creator"`
-	FinishModifier int64        `gorm:"column:finish_modifier" json:"finish_modifier"`
+	ID             int64  `gorm:"column:id" json:"id"`
+	DialysisDate   int64  `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id"`
+	PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id"`
+	Stage          int64  `gorm:"column:stage" json:"stage"`
+	Remark         string `gorm:"column:remark" json:"remark"`
+	BedID          int64  `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse     int64  `gorm:"column:start_nurse" json:"start_nurse"`
+	FinishNurse    int64  `gorm:"column:finish_nurse" json:"finish_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"`
+	StartTime      int64  `gorm:"column:start_time" json:"start_time"`
+	EndTime        int64  `gorm:"column:end_time" json:"end_time"`
+	PunctureNurse  int64  `gorm:"column:puncture_nurse" json:"puncture_nurse"`
+	Creator        int64  `gorm:"column:creator" json:"creator"`
+	Modifier       int64  `gorm:"column:modifier" json:"modifier"`
+	FinishCreator  int64  `gorm:"column:finish_creator" json:"finish_creator"`
+	FinishModifier int64  `gorm:"column:finish_modifier" json:"finish_modifier"`
 }
 
 func (DialysisOrder) TableName() string {
@@ -358,41 +355,41 @@ func (DialysisOrder) TableName() string {
 }
 
 type SgjUserOrg struct {
-	ID int64 `gorm:"column:id" json:"id" form:"id"`
-	Creator int64 `gorm:"column:creator" json:"creator" form:"creator"`
-	OrgName string `gorm:"column:org_name" json:"org_name" form:"org_name"`
-	OrgShortName string `gorm:"column:org_short_name" json:"org_short_name" form:"org_short_name"`
-	OrgLogo string `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
-	OrgIntroduction string `gorm:"column:org_introduction" json:"org_introduction" form:"org_introduction"`
-	Illness string `gorm:"column:illness" json:"illness" form:"illness"`
-	Province int64 `gorm:"column:province" json:"province" form:"province"`
-	City int64 `gorm:"column:city" json:"city" form:"city"`
-	District int64 `gorm:"column:district" json:"district" form:"district"`
-	Address string `gorm:"column:address" json:"address" form:"address"`
-	Longitude string `gorm:"column:longitude" json:"longitude" form:"longitude"`
-	Latitude string `gorm:"column:latitude" json:"latitude" form:"latitude"`
-	OrgType int64 `gorm:"column:org_type" json:"org_type" form:"org_type"`
-	Comments int64 `gorm:"column:comments" json:"comments" form:"comments"`
-	Evaluate float64 `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
-	Gallery string `gorm:"column:gallery" json:"gallery" form:"gallery"`
-	BusinessWeek string `gorm:"column:business_week" json:"business_week" form:"business_week"`
-	BusinessTime string `gorm:"column:business_time" json:"business_time" form:"business_time"`
-	ContactName string `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
-	Telephone string `gorm:"column:telephone" json:"telephone" form:"telephone"`
-	Claim int64 `gorm:"column:claim" json:"claim" form:"claim"`
-	OperatingState int64 `gorm:"column:operating_state" json:"operating_state" form:"operating_state"`
-	Status int64 `gorm:"column:status" json:"status" form:"status"`
-	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Source int64 `gorm:"column:source" json:"source" form:"source"`
-	Ttype int64 `gorm:"column:ttype" json:"ttype" form:"ttype"`
-	Ttid int64 `gorm:"column:ttid" json:"ttid" form:"ttid"`
-	Tuid int64 `gorm:"column:tuid" json:"tuid" form:"tuid"`
-	Reason string `gorm:"column:reason" json:"reason" form:"reason"`
-	Level int64 `gorm:"column:level" json:"level" form:"level"`
-	Website string `gorm:"column:website" json:"website" form:"website"`
-	Import int64 `gorm:"column:import" json:"import" form:"import"`
-	Sortno int64 `gorm:"column:sortno" json:"sortno" form:"sortno"`
+	ID              int64   `gorm:"column:id" json:"id" form:"id"`
+	Creator         int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	OrgName         string  `gorm:"column:org_name" json:"org_name" form:"org_name"`
+	OrgShortName    string  `gorm:"column:org_short_name" json:"org_short_name" form:"org_short_name"`
+	OrgLogo         string  `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
+	OrgIntroduction string  `gorm:"column:org_introduction" json:"org_introduction" form:"org_introduction"`
+	Illness         string  `gorm:"column:illness" json:"illness" form:"illness"`
+	Province        int64   `gorm:"column:province" json:"province" form:"province"`
+	City            int64   `gorm:"column:city" json:"city" form:"city"`
+	District        int64   `gorm:"column:district" json:"district" form:"district"`
+	Address         string  `gorm:"column:address" json:"address" form:"address"`
+	Longitude       string  `gorm:"column:longitude" json:"longitude" form:"longitude"`
+	Latitude        string  `gorm:"column:latitude" json:"latitude" form:"latitude"`
+	OrgType         int64   `gorm:"column:org_type" json:"org_type" form:"org_type"`
+	Comments        int64   `gorm:"column:comments" json:"comments" form:"comments"`
+	Evaluate        float64 `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Gallery         string  `gorm:"column:gallery" json:"gallery" form:"gallery"`
+	BusinessWeek    string  `gorm:"column:business_week" json:"business_week" form:"business_week"`
+	BusinessTime    string  `gorm:"column:business_time" json:"business_time" form:"business_time"`
+	ContactName     string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+	Telephone       string  `gorm:"column:telephone" json:"telephone" form:"telephone"`
+	Claim           int64   `gorm:"column:claim" json:"claim" form:"claim"`
+	OperatingState  int64   `gorm:"column:operating_state" json:"operating_state" form:"operating_state"`
+	Status          int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime           int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Source          int64   `gorm:"column:source" json:"source" form:"source"`
+	Ttype           int64   `gorm:"column:ttype" json:"ttype" form:"ttype"`
+	Ttid            int64   `gorm:"column:ttid" json:"ttid" form:"ttid"`
+	Tuid            int64   `gorm:"column:tuid" json:"tuid" form:"tuid"`
+	Reason          string  `gorm:"column:reason" json:"reason" form:"reason"`
+	Level           int64   `gorm:"column:level" json:"level" form:"level"`
+	Website         string  `gorm:"column:website" json:"website" form:"website"`
+	Import          int64   `gorm:"column:import" json:"import" form:"import"`
+	Sortno          int64   `gorm:"column:sortno" json:"sortno" form:"sortno"`
 	//XtPatients  []XtPatients `gorm:"ForeignKey:UserOrgId"`
 }
 
@@ -444,66 +441,66 @@ func (MonitoringRecord) TableName() string {
 }
 
 type XtAssessmentAfterDislysis 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"`
-	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	AssessmentDate int64 `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
-	DialysisOrderId int64 `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
-	Temperature float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
-	PulseFrequency float64 `gorm:"column:pulse_frequency" json:"pulse_frequency" form:"pulse_frequency"`
-	BreathingRate float64 `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
-	SystolicBloodPressure float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
-	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
-	BloodPressureType int64 `gorm:"column:blood_pressure_type" json:"blood_pressure_type" form:"blood_pressure_type"`
-	ActualUltrafiltration float64 `gorm:"column:actual_ultrafiltration" json:"actual_ultrafiltration" form:"actual_ultrafiltration"`
-	ActualDisplacement float64 `gorm:"column:actual_displacement" json:"actual_displacement" form:"actual_displacement"`
-	ActualTreatmentHour int64 `gorm:"column:actual_treatment_hour" json:"actual_treatment_hour" form:"actual_treatment_hour"`
-	ActualTreatmentMinute int64 `gorm:"column:actual_treatment_minute" json:"actual_treatment_minute" form:"actual_treatment_minute"`
-	WeighingWay string `gorm:"column:weighing_way" json:"weighing_way" form:"weighing_way"`
-	WeightAfter float64 `gorm:"column:weight_after" json:"weight_after" form:"weight_after"`
-	WeightLoss float64 `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
-	Cruor string `gorm:"column:cruor" json:"cruor" form:"cruor"`
-	SymptomAfterDialysis string `gorm:"column:symptom_after_dialysis" json:"symptom_after_dialysis" form:"symptom_after_dialysis"`
-	InternalFistula string `gorm:"column:internal_fistula" json:"internal_fistula" form:"internal_fistula"`
-	Catheter string `gorm:"column:catheter" json:"catheter" form:"catheter"`
-	Complication string `gorm:"column:complication" json:"complication" form:"complication"`
-	Evaluator int64 `gorm:"column:evaluator" json:"evaluator" form:"evaluator"`
-	Remark string `gorm:"column:remark" json:"remark" form:"remark"`
-	DialysisIntakes int64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes" form:"dialysis_intakes"`
-	DialysisIntakesFeed int64 `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed" form:"dialysis_intakes_feed"`
-	DialysisIntakesTransfusion int64 `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion" form:"dialysis_intakes_transfusion"`
-	DialysisIntakesBloodTransfusion int64 `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion" form:"dialysis_intakes_blood_transfusion"`
-	DialysisIntakesWashpipe int64 `gorm:"column:dialysis_intakes_washpipe" json:"dialysis_intakes_washpipe" form:"dialysis_intakes_washpipe"`
-	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"`
-	Creater int64 `gorm:"column:creater" json:"creater" form:"creater"`
-	Modifier int64 `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	BloodAccessPartId int64 `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
-	BloodAccessPartOperaId int64 `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id" form:"blood_access_part_opera_id"`
-	PuncturePointOozingBlood int64 `gorm:"column:puncture_point_oozing_blood" json:"puncture_point_oozing_blood" form:"puncture_point_oozing_blood"`
-	PuncturePointHaematoma int64 `gorm:"column:puncture_point_haematoma" json:"puncture_point_haematoma" form:"puncture_point_haematoma"`
-	InternalFistulaTremorAc int64 `gorm:"column:internal_fistula_tremor_ac" json:"internal_fistula_tremor_ac" form:"internal_fistula_tremor_ac"`
-	PatientGose int64 `gorm:"column:patient_gose" json:"patient_gose" form:"patient_gose"`
-	InpatientDepartment string `gorm:"column:inpatient_department" json:"inpatient_department" form:"inpatient_department"`
-	ObservationContent string `gorm:"column:observation_content" json:"observation_content" form:"observation_content"`
-	ObservationContentOther string `gorm:"column:observation_content_other" json:"observation_content_other" form:"observation_content_other"`
-	DryWeight float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
-	DialysisProcess int64 `gorm:"column:dialysis_process" json:"dialysis_process" form:"dialysis_process"`
-	InAdvanceMinute float64 `gorm:"column:in_advance_minute" json:"in_advance_minute" form:"in_advance_minute"`
-	InAdvanceReason string `gorm:"column:in_advance_reason" json:"in_advance_reason" form:"in_advance_reason"`
-	HemostasisMinute int64 `gorm:"column:hemostasis_minute" json:"hemostasis_minute" form:"hemostasis_minute"`
-	HemostasisOpera int64 `gorm:"column:hemostasis_opera" json:"hemostasis_opera" form:"hemostasis_opera"`
-	TremorNoise int64 `gorm:"column:tremor_noise" json:"tremor_noise" form:"tremor_noise"`
-	DisequilibriumSyndrome int64 `gorm:"column:disequilibrium_syndrome" json:"disequilibrium_syndrome" form:"disequilibrium_syndrome"`
-	DisequilibriumSyndromeOption string `gorm:"column:disequilibrium_syndrome_option" json:"disequilibrium_syndrome_option" form:"disequilibrium_syndrome_option"`
-	ArterialTube int64 `gorm:"column:arterial_tube" json:"arterial_tube" form:"arterial_tube"`
-	IntravenousTube int64 `gorm:"column:intravenous_tube" json:"intravenous_tube" form:"intravenous_tube"`
-	Dialyzer int64 `gorm:"column:dialyzer" json:"dialyzer" form:"dialyzer"`
-	InAdvanceReasonOther string `gorm:"column:in_advance_reason_other" json:"in_advance_reason_other" form:"in_advance_reason_other"`
-	AssessmentDoctor int64 `gorm:"column:assessment_doctor" json:"assessment_doctor" form:"assessment_doctor"`
-	AssessmentTime int64 `gorm:"column:assessment_time" json:"assessment_time" form:"assessment_time"`
-	IsEat int64 `gorm:"column:is_eat" json:"is_eat" form:"is_eat"`
+	ID                              int64   `gorm:"column:id" json:"id" form:"id"`
+	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"`
+	AssessmentDate                  int64   `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
+	DialysisOrderId                 int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	Temperature                     float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
+	PulseFrequency                  float64 `gorm:"column:pulse_frequency" json:"pulse_frequency" form:"pulse_frequency"`
+	BreathingRate                   float64 `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
+	SystolicBloodPressure           float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
+	DiastolicBloodPressure          float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
+	BloodPressureType               int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type" form:"blood_pressure_type"`
+	ActualUltrafiltration           float64 `gorm:"column:actual_ultrafiltration" json:"actual_ultrafiltration" form:"actual_ultrafiltration"`
+	ActualDisplacement              float64 `gorm:"column:actual_displacement" json:"actual_displacement" form:"actual_displacement"`
+	ActualTreatmentHour             int64   `gorm:"column:actual_treatment_hour" json:"actual_treatment_hour" form:"actual_treatment_hour"`
+	ActualTreatmentMinute           int64   `gorm:"column:actual_treatment_minute" json:"actual_treatment_minute" form:"actual_treatment_minute"`
+	WeighingWay                     string  `gorm:"column:weighing_way" json:"weighing_way" form:"weighing_way"`
+	WeightAfter                     float64 `gorm:"column:weight_after" json:"weight_after" form:"weight_after"`
+	WeightLoss                      float64 `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
+	Cruor                           string  `gorm:"column:cruor" json:"cruor" form:"cruor"`
+	SymptomAfterDialysis            string  `gorm:"column:symptom_after_dialysis" json:"symptom_after_dialysis" form:"symptom_after_dialysis"`
+	InternalFistula                 string  `gorm:"column:internal_fistula" json:"internal_fistula" form:"internal_fistula"`
+	Catheter                        string  `gorm:"column:catheter" json:"catheter" form:"catheter"`
+	Complication                    string  `gorm:"column:complication" json:"complication" form:"complication"`
+	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator" form:"evaluator"`
+	Remark                          string  `gorm:"column:remark" json:"remark" form:"remark"`
+	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes" form:"dialysis_intakes"`
+	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed" form:"dialysis_intakes_feed"`
+	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion" form:"dialysis_intakes_transfusion"`
+	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion" form:"dialysis_intakes_blood_transfusion"`
+	DialysisIntakesWashpipe         int64   `gorm:"column:dialysis_intakes_washpipe" json:"dialysis_intakes_washpipe" form:"dialysis_intakes_washpipe"`
+	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"`
+	Creater                         int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier                        int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	BloodAccessPartId               int64   `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	BloodAccessPartOperaId          int64   `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id" form:"blood_access_part_opera_id"`
+	PuncturePointOozingBlood        int64   `gorm:"column:puncture_point_oozing_blood" json:"puncture_point_oozing_blood" form:"puncture_point_oozing_blood"`
+	PuncturePointHaematoma          int64   `gorm:"column:puncture_point_haematoma" json:"puncture_point_haematoma" form:"puncture_point_haematoma"`
+	InternalFistulaTremorAc         int64   `gorm:"column:internal_fistula_tremor_ac" json:"internal_fistula_tremor_ac" form:"internal_fistula_tremor_ac"`
+	PatientGose                     int64   `gorm:"column:patient_gose" json:"patient_gose" form:"patient_gose"`
+	InpatientDepartment             string  `gorm:"column:inpatient_department" json:"inpatient_department" form:"inpatient_department"`
+	ObservationContent              string  `gorm:"column:observation_content" json:"observation_content" form:"observation_content"`
+	ObservationContentOther         string  `gorm:"column:observation_content_other" json:"observation_content_other" form:"observation_content_other"`
+	DryWeight                       float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	DialysisProcess                 int64   `gorm:"column:dialysis_process" json:"dialysis_process" form:"dialysis_process"`
+	InAdvanceMinute                 float64 `gorm:"column:in_advance_minute" json:"in_advance_minute" form:"in_advance_minute"`
+	InAdvanceReason                 string  `gorm:"column:in_advance_reason" json:"in_advance_reason" form:"in_advance_reason"`
+	HemostasisMinute                int64   `gorm:"column:hemostasis_minute" json:"hemostasis_minute" form:"hemostasis_minute"`
+	HemostasisOpera                 int64   `gorm:"column:hemostasis_opera" json:"hemostasis_opera" form:"hemostasis_opera"`
+	TremorNoise                     int64   `gorm:"column:tremor_noise" json:"tremor_noise" form:"tremor_noise"`
+	DisequilibriumSyndrome          int64   `gorm:"column:disequilibrium_syndrome" json:"disequilibrium_syndrome" form:"disequilibrium_syndrome"`
+	DisequilibriumSyndromeOption    string  `gorm:"column:disequilibrium_syndrome_option" json:"disequilibrium_syndrome_option" form:"disequilibrium_syndrome_option"`
+	ArterialTube                    int64   `gorm:"column:arterial_tube" json:"arterial_tube" form:"arterial_tube"`
+	IntravenousTube                 int64   `gorm:"column:intravenous_tube" json:"intravenous_tube" form:"intravenous_tube"`
+	Dialyzer                        int64   `gorm:"column:dialyzer" json:"dialyzer" form:"dialyzer"`
+	InAdvanceReasonOther            string  `gorm:"column:in_advance_reason_other" json:"in_advance_reason_other" form:"in_advance_reason_other"`
+	AssessmentDoctor                int64   `gorm:"column:assessment_doctor" json:"assessment_doctor" form:"assessment_doctor"`
+	AssessmentTime                  int64   `gorm:"column:assessment_time" json:"assessment_time" form:"assessment_time"`
+	IsEat                           int64   `gorm:"column:is_eat" json:"is_eat" form:"is_eat"`
 }
 
 func (XtAssessmentAfterDislysis) TableName() string {
@@ -511,25 +508,25 @@ func (XtAssessmentAfterDislysis) TableName() string {
 }
 
 type PatientInfo struct {
-	ID  int64
-	OrgName string
-	Name string
-    Ctime string
-    Address string
+	ID          int64
+	OrgName     string
+	AdminName   string
+	Ctime       string
+	Address     string
 	ContactName string
-
-
+	OrgType     int64
+	Namepath    string
 }
 
 type SgjUserAdminLoginLog struct {
-	ID int64 `gorm:"column:id" json:"id" form:"id"`
-	AdminUserId int64 `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	OrgId int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	AppId int64 `gorm:"column:app_id" json:"app_id" form:"app_id"`
-	Ip string `gorm:"column:ip" json:"ip" form:"ip"`
-	OperateType int64 `gorm:"column:operate_type" json:"operate_type" form:"operate_type"`
-	AppType int64 `gorm:"column:app_type" json:"app_type" form:"app_type"`
-	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId       int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	Ip          string `gorm:"column:ip" json:"ip" form:"ip"`
+	OperateType int64  `gorm:"column:operate_type" json:"operate_type" form:"operate_type"`
+	AppType     int64  `gorm:"column:app_type" json:"app_type" form:"app_type"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
 }
 
 func (SgjUserAdminLoginLog) TableName() string {
@@ -541,12 +538,12 @@ type Logout struct {
 }
 
 type SgjOrgFollow struct {
-	ID int64 `gorm:"column:id" json:"id" form:"id"`
-	OrgId int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ID          int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId       int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	AdminUserId int64 `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime       int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status      int64 `gorm:"column:status" json:"status" form:"status"`
 }
 
 func (SgjOrgFollow) TableName() string {
@@ -554,16 +551,16 @@ func (SgjOrgFollow) TableName() string {
 }
 
 type SgjAdmin struct {
-	ID int64 `gorm:"column:id" json:"id" form:"id"`
-	Account string `gorm:"column:account" json:"account" form:"account"`
-	Pwd string `gorm:"column:pwd" json:"pwd" form:"pwd"`
-	Status int64 `gorm:"column:status" json:"status" form:"status"`
-	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	IsSuperAdmin int64 `gorm:"column:is_super_admin" json:"is_super_admin" form:"is_super_admin"`
-	Name string `gorm:"column:name" json:"name" form:"name"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	Account      string `gorm:"column:account" json:"account" form:"account"`
+	Pwd          string `gorm:"column:pwd" json:"pwd" form:"pwd"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	IsSuperAdmin int64  `gorm:"column:is_super_admin" json:"is_super_admin" form:"is_super_admin"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
 }
+
 func (SgjAdmin) TableName() string {
 	return "sgj_admin"
 }
-

service/admin_service.go

@@ -340,7 +340,10 @@ func UpdateAdmin(admin *admin_models.AdminAccount) (err error) {
 
 func DeleteAdmin(id int64) (err error) {
 	err = readUserDb.Model(&admin_models.AdminAccount{}).Where("id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
+	err = readUserDb.Model(&models.OrgFollow{}).Where("admin_user_id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
+
 	return
+
 }
 
 func FindAllOrg() (org []*models.Org, err error) {

service/function_service.go

@@ -1,180 +1,264 @@
 package service
 
 import (
+	"XT_Admin_Api/models/admin_models"
 	"XT_Admin_Api/models/function_models"
-	"fmt"
 )
 
 //病人管理
-func GetTodayInfo(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
-
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id left join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ?  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	fmt.Println("rows是什么", rows)
-	defer rows.Close()
-	if rows.Next() {
-		rows.Scan(&total)
+func GetTodayInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath   from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JOIN sgj_user_district as d On d.id = u.city left JoIN sgj_admin as a On a.id = f.admin_user_id AND  a.status = 1 left join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1   GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
+	} else {
+		err = readUserDb.Raw("select *, a.name as admin_name, d.namepath as namepath  from sgj_users.sgj_user_org as u  join sgj_org_follow as f On f.org_id = u.id AND f.status = 1 AND f.admin_user_id = ? left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1  left JOIN sgj_user_district as d On d.id = u.city left join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1   GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 	}
-	fmt.Println("&total是什么", total)
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//fmt.Println("rows是什么", rows)
+	//defer rows.Close()
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
+	//fmt.Println("&total是什么", total)
 	return patientinfo, total, err
 }
 
 //透析处方
-func GetTodayDialysisPatientsInfo(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
+func GetTodayDialysisPatientsInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+
+	//offset := (page - 1) * limit
+
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select * , a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
+
+	} else {
 
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id left join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	defer rows.Close()
+		err = readUserDb.Raw("select * , a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  join sgj_org_follow as f On f.org_id = u.id  AND f.admin_user_id = ?  AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 
-	if rows.Next() {
-		rows.Scan(&total)
 	}
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
 
 	return patientinfo, total, err
 }
 
 //接诊评估
-func GetTodayReceivePatientsInfo(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
+func GetTodayReceivePatientsInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u  left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id left join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	defer rows.Close()
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  left join sgj_org_follow as f On f.org_id = u.id  AND f.status = 1 left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
+
+	} else {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city   join sgj_org_follow as f On f.org_id = u.id  AND f.status = 1  AND f.admin_user_id = ? left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 
-	if rows.Next() {
-		rows.Scan(&total)
 	}
 
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
+
 	return patientinfo, total, err
 }
 
 // 透前评估
-func GetTodayBeforDislysisInfo(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id left join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	defer rows.Close()
-
-	if rows.Next() {
-		rows.Scan(&total)
+func GetTodayBeforDislysisInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id left AND f.status = 1  JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
+
+	} else {
+
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  join sgj_org_follow as f On f.org_id = u.id  AND  f.admin_user_id = ? AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?  AND u.import <> 1 GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
+
 	}
 
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
+
 	return patientinfo, total, err
 }
 
 //零食医嘱
-func GetTodayDoctorsOrderInfo(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
+func GetTodayDoctorsOrderInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+
+	//offset := (page - 1) * limit
+
+	if admin.IsSuperAdmin == 1 {
+
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id  AND f.status = 1 left JoIN sgj_admin as a On a.id = f.admin_user_id  AND a.status = 1 join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?  AND u.import <> 1 GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
+
+	} else {
 
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	defer rows.Close()
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  join sgj_org_follow as f On f.org_id = u.id AND f.admin_user_id = ? AND f.status = 1    left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 
-	if rows.Next() {
-		rows.Scan(&total)
 	}
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
 
 	return patientinfo, total, err
 }
 
 //双人核对
-func GetTodayDoubleCheckInfo(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
+func GetTodayDoubleCheckInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_double_check as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_double_check as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	defer rows.Close()
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_double_check as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
+
+	} else {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  join sgj_org_follow as f On f.org_id = u.id AND f.admin_user_id = ?  AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_double_check as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 
-	if rows.Next() {
-		rows.Scan(&total)
 	}
 
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_double_check as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
+
 	return patientinfo, total, err
 }
 
 //透析上机
-func GetTodayDialysisMachinek(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
+func GetTodayDialysisMachinek(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id  AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
+
+	} else {
 
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id left join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	defer rows.Close()
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u  left JOIN sgj_user_district as d On d.id = u.city join sgj_org_follow as f On f.org_id = u.id AND f.admin_user_id = ? AND f.status = 1    left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 
-	if rows.Next() {
-		rows.Scan(&total)
 	}
 
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
+
 	return patientinfo, total, err
 }
 
 //透析检测
-func GetTodayDialysisExamination(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
+func GetTodayDialysisExamination(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	defer rows.Close()
+	} else {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city join sgj_org_follow as f On f.org_id = u.id  AND f.admin_user_id = ? AND f.status = 1   left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 
-	if rows.Next() {
-		rows.Scan(&total)
 	}
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
 
 	return patientinfo, total, err
 }
 
 //透析下机
-func GetTodayBeforOrpenetration(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
+func GetTodayBeforOrpenetration(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	defer rows.Close()
+	} else {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  join sgj_org_follow as f On f.org_id = u.id AND  f.admin_user_id = ?  AND f.status = 1 left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 
-	if rows.Next() {
-		rows.Scan(&total)
 	}
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
 
 	return patientinfo, total, err
 }
 
 //透后评估
-func GetTodayPostAssessment(to int64, ctime int64, page int64, limit int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
-	defer rows.Close()
-
-	if rows.Next() {
-		rows.Scan(&total)
+func GetTodayPostAssessment(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id  AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
+
+	} else {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u  left JOIN sgj_user_district as d On d.id = u.city join sgj_org_follow as f On f.org_id = u.id AND f.admin_user_id = ? AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
+
 	}
 
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
+
 	return patientinfo, total, err
 }
 
-func GetTodayEntrylist(to int64, ctime int64, limit int64, page int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u  join sgj_xt.xt_warehouse as x on x.org_id = u.id  LEFT JOIN  sgj_users.sgj_org_follow as f ON f.org_id = u.id  LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id  where x.ctime >= ? AND x.ctime<= ? GROUP BY x.org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse as x on x.org_id = u.id where x.ctime >= ? AND x.ctime <= ?", to, ctime).Rows()
-	defer rows.Close()
+func GetTodayEntrylist(to int64, ctime int64, limit int64, page int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  join sgj_xt.xt_warehouse as x on x.org_id = u.id   LEFT JOIN  sgj_users.sgj_org_follow as f ON f.org_id = u.id AND f.status = 1   LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id AND a.status = 1  where x.ctime >= ? AND x.ctime<= ? AND u.import <> 1  GROUP BY x.org_id", to, ctime).Scan(&patientinfo).Error
+
+	} else {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  join sgj_xt.xt_warehouse as x on x.org_id = u.id  JOIN  sgj_users.sgj_org_follow as f ON f.org_id = u.id AND f.admin_user_id = ? AND f.status = 1   LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id AND a.status = 1  where x.ctime >= ? AND x.ctime<= ? AND u.import <> 1  GROUP BY x.org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 
-	if rows.Next() {
-		rows.Scan(&total)
 	}
 
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse as x on x.org_id = u.id where x.ctime >= ? AND x.ctime <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
+
 	return patientinfo, total, err
 }
 
-func GetTodayExitlist(to int64, ctime int64, limit int64, page int64) (patientinfo []function_models.PatientInfo, total int64, err error) {
-	offset := (page - 1) * limit
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u  join sgj_xt.xt_warehouse_out as x on x.org_id = u.id  LEFT JOIN  sgj_users.sgj_org_follow as f ON f.org_id = u.id  LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id  where x.ctime >= ? AND x.ctime<= ? GROUP BY x.org_id", to, ctime).Scan(&patientinfo).Error
-	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse_out as x on x.org_id = u.id where x.ctime >= ? AND x.ctime <= ?", to, ctime).Rows()
-	defer rows.Close()
+func GetTodayExitlist(to int64, ctime int64, limit int64, page int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
+	//offset := (page - 1) * limit
+	if admin.IsSuperAdmin == 1 {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u  left JOIN sgj_user_district as d On d.id = u.city join sgj_xt.xt_warehouse_out as x on x.org_id = u.id  LEFT JOIN  sgj_users.sgj_org_follow as f ON f.org_id = u.id  AND f.status = 1  LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id AND a.status = 1   where x.ctime >= ? AND x.ctime<= ? AND u.import <> 1  GROUP BY x.org_id", to, ctime).Scan(&patientinfo).Error
+
+	} else {
+		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  join sgj_xt.xt_warehouse_out as x on x.org_id = u.id   JOIN  sgj_users.sgj_org_follow as f ON f.org_id = u.id  AND f.admin_user_id = ? AND f.status = 1    LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id  AND a.status = 1  where x.ctime >= ? AND x.ctime<= ? AND u.import <> 1  GROUP BY x.org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
 
-	if rows.Next() {
-		rows.Scan(&total)
 	}
 
+	//rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse_out as x on x.org_id = u.id where x.ctime >= ? AND x.ctime <= ?", to, ctime).Rows()
+	//defer rows.Close()
+	//
+	//if rows.Next() {
+	//	rows.Scan(&total)
+	//}
+
 	return patientinfo, total, err
 }

service/org_service.go

@@ -10,7 +10,6 @@ import (
 )
 
 func GetAllOrgList(active_status int64, depth_active_status int64, start_time int64, end_time int64, province int64, city int64, district int64, follow int64, keyword string, page int64, limit int64, is_super_admin int64) (list []*models.Org, err error, total int64) {
-	fmt.Println("--------- ")
 
 	fmt.Println(follow)
 	offset := (page - 1) * limit
@@ -83,12 +82,12 @@ func GetAllOrgList(active_status int64, depth_active_status int64, start_time in
 		}
 
 	}
-	if is_super_admin == 1 {
-		db = db.Where("sgj_user_org.status = 1 AND sgj_user_org.import <> 1").Group("sgj_user_org.id")
-
-	} else {
-		db = db.Where("sgj_user_org.status = 1 AND sgj_user_org.import <> 1 AND DATE_SUB(CURDATE(), INTERVAL 15 DAY) <= date(from_unixtime(sgj_user_org.ctime))").Group("sgj_user_org.id")
-	}
+	//if is_super_admin == 1 {
+	db = db.Where("sgj_user_org.status = 1 AND sgj_user_org.import <> 1").Group("sgj_user_org.id")
+	//
+	//} else {
+	//	db = db.Where("sgj_user_org.status = 1 AND sgj_user_org.import <> 1 AND DATE_SUB(CURDATE(), INTERVAL 15 DAY) <= date(from_unixtime(sgj_user_org.ctime))").Group("sgj_user_org.id")
+	//}
 
 	db = db.Count(&total)
 	err = db.Preload("OrgFollow", func(db *gorm.DB) *gorm.DB {
@@ -689,3 +688,15 @@ func GetAllValidDeviceNumbers(orgID int64) ([]*DeviceNumberViewModel, error) {
 	}
 	return vms, nil
 }
+
+func GetFollowOrgList(follow int64) (list []*models.Org, err error) {
+
+	err = readUserDb.Model(&models.Org{}).Where("NOT EXISTS (Select * FROM sgj_org_follow Where sgj_org_follow.org_id = sgj_user_org.id AND sgj_org_follow.status = 1) AND import <> 1 AND DATE_SUB(CURDATE(), INTERVAL 15 DAY) <= date(from_unixtime(sgj_user_org.ctime)) AND status = 1").Preload("OrgFollow", func(db *gorm.DB) *gorm.DB {
+		return db.Model(&models.OrgFollow{}).Where("status = 1").Preload("AdminAccount", "status = 1")
+	}).Preload("AdminUserLoginLog", func(db *gorm.DB) *gorm.DB {
+		return db.Model(&models.AdminUserLoginLog{}).Where("id = (SELECT max(id))")
+	}).Preload("Citys").Order("ctime desc").Scan(&list).Error
+
+	return
+
+}