更新代码

controllers/data_api_controller.go

@@ -220,11 +220,14 @@ func (c *DataApiController) UpdateChildConfig() {
 	dataconfig.CreatedTime = time.Now().Format("2006-01-02 15:04:05")
 	dataconfig.UpdatedTime = time.Now().Format("2006-01-02 15:04:05")
 	dataconfig.Remark = string(dataBody["remark"].(string))
-	if dataBody["order"] != nil {
-		dataconfig.Order = int64(dataBody["order"].(float64))
-	} else {
-		dataconfig.Order = 0
-	}
+	dataconfig.Order = int64(dataBody["orders"].(float64))
+	fmt.Println("dataconfitg------", dataconfig.Order)
+	//if dataBody["orders"] != nil {
+	//	dataconfig.Order = int64(dataBody["orders"].(float64))
+	//	fmt.Println("dataconfig",dataconfig.Order)
+	//} else {
+	//	dataconfig.Order = 0
+	//}
 	configOrgId := int64(dataBody["org_id"].(float64))
 
 	// 验证关键字段的值是否重复

controllers/gobal_config_api_controller.go

@@ -952,6 +952,7 @@ func (c *GobalConfigApiController) GetOrgs() {
 	var orgs []*models.Org
 	adminUser, err := service.GetHomeData(adminUserInfo.AdminUser.Id)
 	creator, err := service.GetCreator(id, orgId)
+	admin, err := service.GetSuperAdmin(id)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -970,6 +971,7 @@ func (c *GobalConfigApiController) GetOrgs() {
 		"orgs":      orgs,
 		"adminUser": adminUser,
 		"creator":   creator,
+		"admin":     admin,
 	})
 
 }

controllers/manage_api_controller.go

@@ -1058,14 +1058,14 @@ func (this *MachineApiController) SaveInformation() {
 	//fmt.Println("透析时长", dialysis_time)
 
 	//hyperfiletration := dataBody["hyperfiltratio"].(string)
-	hyperfiltratios := int64(dataBody["hyperfiltratio"].(float64))
-	hyperfiletration := strconv.FormatInt(hyperfiltratios, 10)
-	//fmt.Println("实际超滤量", hyperfiletration)
+	hyperfiletration := dataBody["hyperfiltratio"].(float64)
+	//hyperfiletration := strconv.FormatInt(hyperfiltratios, 10)
+	fmt.Println("实际超滤量", hyperfiletration)
 
 	//weight_loss := dataBody["weight_loss"].(string)
-	weightloss := int64(dataBody["weight_loss"].(float64))
-	weight_loss := strconv.FormatInt(weightloss, 10)
-	//fmt.Println("体重减少", weight_loss)
+	weight_loss := dataBody["weight_loss"].(float64)
+	//weight_loss := strconv.FormatInt(weightloss, 10)
+	fmt.Println("体重减少", weight_loss)
 
 	warining_value := dataBody["warning_value"].(string)
 	fmt.Println("预警值", warining_value)
@@ -2303,9 +2303,9 @@ func (this *MachineApiController) UpdateForm() {
 	dialysis_time := dataBody["dialysis_time"].(string)
 	fmt.Println("透析时长", dialysis_time)
 
-	hyperfiletration := dataBody["hyperfiltratio"].(string)
+	hyperfiletration := dataBody["hyperfiltratio"].(float64)
 	fmt.Println("实际超滤量", hyperfiletration)
-	weight_loss := dataBody["weight_loss"].(string)
+	weight_loss := dataBody["weight_loss"].(float64)
 	fmt.Println("体重减少", weight_loss)
 	warining_value := dataBody["warning_value"].(string)
 	fmt.Println("预警值", warining_value)
@@ -2470,7 +2470,7 @@ func (this *MachineApiController) QueryInfo() {
 	fmt.Println("page", page)
 	adminUser := this.GetAdminUserInfo()
 	orgId := adminUser.CurrentOrgId
-	infor, total, err := service.QueryInfo(zone, bed, startdate, endtimes, orgId, limit, page)
+	infor, total, err := service.QueryInfo(bed, startdate, endtimes, orgId, limit, page)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询:（"+err.Error()+"）")
 		return
@@ -2553,7 +2553,7 @@ func (this *MachineApiController) GetBedForm() {
 	fmt.Println("id", id)
 	addmacher, err := service.GetZoneForm(id)
 	bed, err := service.GetZoneId(addmacher.BedId, orgId)
-
+	fmt.Println("bed--------------------", bed.ZoneID)
 	number, err := service.GetBedForm(bed.ZoneID)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询:（"+err.Error()+"）")

models/device_models.go

@@ -459,103 +459,103 @@ type DeviceInformationss struct {
 }
 
 type DeviceInformations struct {
-	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
-	Date                  int64  `gorm:"column:date" json:"date" form:"date"`
-	Class                 int64  `gorm:"column:class" json:"class" form:"class"`
-	Zone                  int64  `gorm:"column:zone" json:"zone" form:"zone"`
-	BedNumber             int64  `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
-	PatientId             int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Contagion             string `gorm:"column:contagion" json:"contagion" form:"contagion"`
-	DialysisMode          int64  `gorm:"column:dialysis_mode" json:"dialysis_mode" form:"dialysis_mode"`
-	StartTime             int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	EndTime               int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
-	DialysisHour          string `gorm:"column:dialysis_hour" json:"dialysis_hour" form:"dialysis_hour"`
-	Hyperfiltratio        string `gorm:"column:hyperfiltratio" json:"hyperfiltratio" form:"hyperfiltratio"`
-	WeightLoss            string `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
-	WarningValue          string `gorm:"column:warning_value" json:"warning_value" form:"warning_value"`
-	UserTotal             string `gorm:"column:user_total" json:"user_total" form:"user_total"`
-	Move                  int64  `gorm:"column:move" json:"move" form:"move"`
-	FailureStage          int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
-	FaultDescription      string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
-	CodeInformation       string `gorm:"column:code_information" json:"code_information" form:"code_information"`
-	DisinfectType         int64  `gorm:"column:disinfect_type" json:"disinfect_type" form:"disinfect_type"`
-	DisinfectantType      int64  `gorm:"column:disinfectant_type" json:"disinfectant_type" form:"disinfectant_type"`
-	Disinfection          int64  `gorm:"column:disinfection" json:"disinfection" form:"disinfection"`
-	MachineRun            int64  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
-	FluidPath             int64  `gorm:"column:fluid_path" json:"fluid_path" form:"fluid_path"`
-	Disinfectant          int64  `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
-	DisinfectionStatus    int64  `gorm:"column:disinfection_status" json:"disinfection_status" form:"disinfection_status"`
-	DisinfectionResidue   int64  `gorm:"column:disinfection_residue" json:"disinfection_residue" form:"disinfection_residue"`
-	LongTime              string `gorm:"column:long_time" json:"long_time" form:"long_time"`
-	DisinfecStartime      int64  `gorm:"column:disinfec_startime" json:"disinfec_startime" form:"disinfec_startime"`
-	DisinfecEndtime       int64  `gorm:"column:disinfec_endtime" json:"disinfec_endtime" form:"disinfec_endtime"`
-	DialysisChecked       int64  `gorm:"column:dialysis_checked" json:"dialysis_checked" form:"dialysis_checked"`
-	DialysisName          int64  `gorm:"column:dialysis_name" json:"dialysis_name" form:"dialysis_name"`
-	Norms                 string `gorm:"column:norms" json:"norms" form:"norms"`
-	DialysisConcentration int64  `gorm:"column:dialysis_concentration" json:"dialysis_concentration" form:"dialysis_concentration"`
-	GermChecked           int64  `gorm:"column:germ_checked" json:"germ_checked" form:"germ_checked"`
-	GermName              int64  `gorm:"column:germ_name" json:"germ_name" form:"germ_name"`
-	GermNumber            string `gorm:"column:germ_number" json:"germ_number" form:"germ_number"`
-	Clean                 int64  `gorm:"column:clean" json:"clean" form:"clean"`
-	SignName              int64  `gorm:"column:sign_name" json:"sign_name" form:"sign_name"`
-	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"`
-	UserOrgId             int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	EquimentId            int64  `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
-	Bed                   string `gorm:"column:bed" json:"bed" form:"bed"`
-	Name                  string `gorm:"column:name" json:"name" form:"name"`
-	UserName              string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	AdminUserId           int64  `gorm:"column:admin_user_id" json:"admin_user_id"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	Date                  int64   `gorm:"column:date" json:"date" form:"date"`
+	Class                 int64   `gorm:"column:class" json:"class" form:"class"`
+	Zone                  int64   `gorm:"column:zone" json:"zone" form:"zone"`
+	BedNumber             int64   `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Contagion             string  `gorm:"column:contagion" json:"contagion" form:"contagion"`
+	DialysisMode          int64   `gorm:"column:dialysis_mode" json:"dialysis_mode" form:"dialysis_mode"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime               int64   `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	DialysisHour          string  `gorm:"column:dialysis_hour" json:"dialysis_hour" form:"dialysis_hour"`
+	Hyperfiltratio        float64 `gorm:"column:hyperfiltratio" json:"hyperfiltratio" form:"hyperfiltratio"`
+	WeightLoss            float64 `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
+	WarningValue          string  `gorm:"column:warning_value" json:"warning_value" form:"warning_value"`
+	UserTotal             string  `gorm:"column:user_total" json:"user_total" form:"user_total"`
+	Move                  int64   `gorm:"column:move" json:"move" form:"move"`
+	FailureStage          int64   `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
+	FaultDescription      string  `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	CodeInformation       string  `gorm:"column:code_information" json:"code_information" form:"code_information"`
+	DisinfectType         int64   `gorm:"column:disinfect_type" json:"disinfect_type" form:"disinfect_type"`
+	DisinfectantType      int64   `gorm:"column:disinfectant_type" json:"disinfectant_type" form:"disinfectant_type"`
+	Disinfection          int64   `gorm:"column:disinfection" json:"disinfection" form:"disinfection"`
+	MachineRun            int64   `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
+	FluidPath             int64   `gorm:"column:fluid_path" json:"fluid_path" form:"fluid_path"`
+	Disinfectant          int64   `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
+	DisinfectionStatus    int64   `gorm:"column:disinfection_status" json:"disinfection_status" form:"disinfection_status"`
+	DisinfectionResidue   int64   `gorm:"column:disinfection_residue" json:"disinfection_residue" form:"disinfection_residue"`
+	LongTime              string  `gorm:"column:long_time" json:"long_time" form:"long_time"`
+	DisinfecStartime      int64   `gorm:"column:disinfec_startime" json:"disinfec_startime" form:"disinfec_startime"`
+	DisinfecEndtime       int64   `gorm:"column:disinfec_endtime" json:"disinfec_endtime" form:"disinfec_endtime"`
+	DialysisChecked       int64   `gorm:"column:dialysis_checked" json:"dialysis_checked" form:"dialysis_checked"`
+	DialysisName          int64   `gorm:"column:dialysis_name" json:"dialysis_name" form:"dialysis_name"`
+	Norms                 string  `gorm:"column:norms" json:"norms" form:"norms"`
+	DialysisConcentration int64   `gorm:"column:dialysis_concentration" json:"dialysis_concentration" form:"dialysis_concentration"`
+	GermChecked           int64   `gorm:"column:germ_checked" json:"germ_checked" form:"germ_checked"`
+	GermName              int64   `gorm:"column:germ_name" json:"germ_name" form:"germ_name"`
+	GermNumber            string  `gorm:"column:germ_number" json:"germ_number" form:"germ_number"`
+	Clean                 int64   `gorm:"column:clean" json:"clean" form:"clean"`
+	SignName              int64   `gorm:"column:sign_name" json:"sign_name" form:"sign_name"`
+	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"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	EquimentId            int64   `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
+	Bed                   string  `gorm:"column:bed" json:"bed" form:"bed"`
+	Name                  string  `gorm:"column:name" json:"name" form:"name"`
+	UserName              string  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	AdminUserId           int64   `gorm:"column:admin_user_id" json:"admin_user_id"`
 }
 
 type DeviceInformation struct {
-	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
-	Date                  int64  `gorm:"column:date" json:"date" form:"date"`
-	Class                 int64  `gorm:"column:class" json:"class" form:"class"`
-	Zone                  int64  `gorm:"column:zone" json:"zone" form:"zone"`
-	BedNumber             int64  `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
-	PatientId             int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Contagion             string `gorm:"column:contagion" json:"contagion" form:"contagion"`
-	DialysisMode          int64  `gorm:"column:dialysis_mode" json:"dialysis_mode" form:"dialysis_mode"`
-	StartTime             int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	EndTime               int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
-	DialysisHour          string `gorm:"column:dialysis_hour" json:"dialysis_hour" form:"dialysis_hour"`
-	Hyperfiltratio        string `gorm:"column:hyperfiltratio" json:"hyperfiltratio" form:"hyperfiltratio"`
-	WeightLoss            string `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
-	WarningValue          string `gorm:"column:warning_value" json:"warning_value" form:"warning_value"`
-	UserTotal             string `gorm:"column:user_total" json:"user_total" form:"user_total"`
-	Move                  int64  `gorm:"column:move" json:"move" form:"move"`
-	FailureStage          int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
-	FaultDescription      string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
-	CodeInformation       string `gorm:"column:code_information" json:"code_information" form:"code_information"`
-	DisinfectType         int64  `gorm:"column:disinfect_type" json:"disinfect_type" form:"disinfect_type"`
-	DisinfectantType      int64  `gorm:"column:disinfectant_type" json:"disinfectant_type" form:"disinfectant_type"`
-	Disinfection          int64  `gorm:"column:disinfection" json:"disinfection" form:"disinfection"`
-	MachineRun            int64  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
-	FluidPath             int64  `gorm:"column:fluid_path" json:"fluid_path" form:"fluid_path"`
-	Disinfectant          int64  `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
-	DisinfectionStatus    int64  `gorm:"column:disinfection_status" json:"disinfection_status" form:"disinfection_status"`
-	DisinfectionResidue   int64  `gorm:"column:disinfection_residue" json:"disinfection_residue" form:"disinfection_residue"`
-	LongTime              string `gorm:"column:long_time" json:"long_time" form:"long_time"`
-	DisinfecStartime      int64  `gorm:"column:disinfec_startime" json:"disinfec_startime" form:"disinfec_startime"`
-	DisinfecEndtime       int64  `gorm:"column:disinfec_endtime" json:"disinfec_endtime" form:"disinfec_endtime"`
-	DialysisChecked       int64  `gorm:"column:dialysis_checked" json:"dialysis_checked" form:"dialysis_checked"`
-	DialysisName          int64  `gorm:"column:dialysis_name" json:"dialysis_name" form:"dialysis_name"`
-	Norms                 string `gorm:"column:norms" json:"norms" form:"norms"`
-	DialysisConcentration int64  `gorm:"column:dialysis_concentration" json:"dialysis_concentration" form:"dialysis_concentration"`
-	GermChecked           int64  `gorm:"column:germ_checked" json:"germ_checked" form:"germ_checked"`
-	GermName              int64  `gorm:"column:germ_name" json:"germ_name" form:"germ_name"`
-	GermNumber            string `gorm:"column:germ_number" json:"germ_number" form:"germ_number"`
-	Clean                 int64  `gorm:"column:clean" json:"clean" form:"clean"`
-	SignName              int64  `gorm:"column:sign_name" json:"sign_name" form:"sign_name"`
-	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"`
-	UserOrgId             int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	EquimentId            int64  `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
-	Bed                   string `gorm:"column:bed" json:"bed" form:"bed"`
-	Stime                 int64  `gorm:"column:stime" json:"stime" form:"stime"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	Date                  int64   `gorm:"column:date" json:"date" form:"date"`
+	Class                 int64   `gorm:"column:class" json:"class" form:"class"`
+	Zone                  int64   `gorm:"column:zone" json:"zone" form:"zone"`
+	BedNumber             int64   `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Contagion             string  `gorm:"column:contagion" json:"contagion" form:"contagion"`
+	DialysisMode          int64   `gorm:"column:dialysis_mode" json:"dialysis_mode" form:"dialysis_mode"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime               int64   `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	DialysisHour          string  `gorm:"column:dialysis_hour" json:"dialysis_hour" form:"dialysis_hour"`
+	Hyperfiltratio        float64 `gorm:"column:hyperfiltratio" json:"hyperfiltratio" form:"hyperfiltratio"`
+	WeightLoss            float64 `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
+	WarningValue          string  `gorm:"column:warning_value" json:"warning_value" form:"warning_value"`
+	UserTotal             string  `gorm:"column:user_total" json:"user_total" form:"user_total"`
+	Move                  int64   `gorm:"column:move" json:"move" form:"move"`
+	FailureStage          int64   `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
+	FaultDescription      string  `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	CodeInformation       string  `gorm:"column:code_information" json:"code_information" form:"code_information"`
+	DisinfectType         int64   `gorm:"column:disinfect_type" json:"disinfect_type" form:"disinfect_type"`
+	DisinfectantType      int64   `gorm:"column:disinfectant_type" json:"disinfectant_type" form:"disinfectant_type"`
+	Disinfection          int64   `gorm:"column:disinfection" json:"disinfection" form:"disinfection"`
+	MachineRun            int64   `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
+	FluidPath             int64   `gorm:"column:fluid_path" json:"fluid_path" form:"fluid_path"`
+	Disinfectant          int64   `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
+	DisinfectionStatus    int64   `gorm:"column:disinfection_status" json:"disinfection_status" form:"disinfection_status"`
+	DisinfectionResidue   int64   `gorm:"column:disinfection_residue" json:"disinfection_residue" form:"disinfection_residue"`
+	LongTime              string  `gorm:"column:long_time" json:"long_time" form:"long_time"`
+	DisinfecStartime      int64   `gorm:"column:disinfec_startime" json:"disinfec_startime" form:"disinfec_startime"`
+	DisinfecEndtime       int64   `gorm:"column:disinfec_endtime" json:"disinfec_endtime" form:"disinfec_endtime"`
+	DialysisChecked       int64   `gorm:"column:dialysis_checked" json:"dialysis_checked" form:"dialysis_checked"`
+	DialysisName          int64   `gorm:"column:dialysis_name" json:"dialysis_name" form:"dialysis_name"`
+	Norms                 string  `gorm:"column:norms" json:"norms" form:"norms"`
+	DialysisConcentration int64   `gorm:"column:dialysis_concentration" json:"dialysis_concentration" form:"dialysis_concentration"`
+	GermChecked           int64   `gorm:"column:germ_checked" json:"germ_checked" form:"germ_checked"`
+	GermName              int64   `gorm:"column:germ_name" json:"germ_name" form:"germ_name"`
+	GermNumber            string  `gorm:"column:germ_number" json:"germ_number" form:"germ_number"`
+	Clean                 int64   `gorm:"column:clean" json:"clean" form:"clean"`
+	SignName              int64   `gorm:"column:sign_name" json:"sign_name" form:"sign_name"`
+	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"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	EquimentId            int64   `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
+	Bed                   string  `gorm:"column:bed" json:"bed" form:"bed"`
+	Stime                 int64   `gorm:"column:stime" json:"stime" form:"stime"`
 }
 
 func (DeviceInformation) TableName() string {
@@ -737,7 +737,7 @@ type DeviceRepairs struct {
 	BedId            int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
 	EquitmentId      int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	CodeInformation  string `gorm:"column:code_information" json:"code_information" form:"code_information"`
-	BedNumber        string `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	Number           string `gorm:"column:number" json:"bed_number" form:"number"`
 }
 
 type DeviceRepair struct {

service/auto_create_week_disinfection.go

@@ -138,8 +138,8 @@ func AutoCreateWeekDisinfectionJob() {
 							StartTime:             it.StartTime,
 							EndTime:               it.EndTime,
 							Contagion:             con,
-							WeightLoss:            strconv.FormatFloat(dislysis.WeightLoss, 'f', -1, 64),
-							Hyperfiltratio:        strconv.FormatFloat(dislysis.ActualUltrafiltration, 'f', -1, 64),
+							WeightLoss:            dislysis.WeightLoss,
+							Hyperfiltratio:        dislysis.ActualUltrafiltration,
 							DialysisHour:          strconv.FormatInt(dislysis.ActualTreatmentHour, 10),
 							MachineRun:            1,
 						}

service/auto_create_week_plan.go

@@ -122,8 +122,8 @@ func AutoCreateWeekPlanJob() {
 							StartTime:             it.StartTime,
 							EndTime:               it.EndTime,
 							Contagion:             con,
-							WeightLoss:            strconv.FormatFloat(dislysis.WeightLoss, 'f', -1, 64),
-							Hyperfiltratio:        strconv.FormatFloat(dislysis.ActualUltrafiltration, 'f', -1, 64),
+							WeightLoss:            dislysis.WeightLoss,
+							Hyperfiltratio:        dislysis.ActualUltrafiltration,
 							DialysisHour:          strconv.FormatInt(dislysis.ActualTreatmentHour, 10),
 							MachineRun:            1,
 						}

service/data.go

@@ -141,7 +141,7 @@ func FindConfigByTitleForUpdate(module string, title string, org_id int64, id in
 }
 
 func UpdateChildConfig(dataconfig *models.Dataconfig) (err error) {
-	err = readDb.Model(&models.Dataconfig{}).Where("id =?", dataconfig.ID).Update(map[string]interface{}{"name": dataconfig.Name, "update_time": dataconfig.UpdatedTime, "remark": dataconfig.Remark}).Error
+	err = readDb.Model(&models.Dataconfig{}).Where("id =?", dataconfig.ID).Update(map[string]interface{}{"name": dataconfig.Name, "update_time": dataconfig.UpdatedTime, "remark": dataconfig.Remark, "orders": dataconfig.Order}).Error
 	return
 }
 

service/home_service.go

@@ -20,6 +20,12 @@ func GetCreator(id int64, orgid int64) (models.SgjUserAdminRole, error) {
 	return role, err
 }
 
+func GetSuperAdmin(id int64) (models.SgjUserAdmin, error) {
+	admin := models.SgjUserAdmin{}
+	err := UserReadDB().Model(&admin).Where("id=? and status =1", id).Find(&admin).Error
+	return admin, err
+}
+
 func GetAllApp(org_id int64) (apps []*models.OrgApp, err error) {
 	err = readUserDb.Model(&models.OrgApp{}).Where("status = 1 AND pid > 0 AND org_id = ?", org_id).Order("number asc").Find(&apps).Error
 	return

service/manage_service.go

@@ -639,13 +639,13 @@ func CreateRepair(repair *models.DeviceRepair) error {
 func GetAllRepair(orgid int64, limit int64, page int64) (repair []*models.DeviceRepairs, total int64, err error) {
 
 	db := UserReadDB().Table("xt_device_repair as r").Where("r.status = ?", 1)
-	table := XTReadDB().Table("xt_device_addmacher as x")
+	table := XTReadDB().Table("xt_device_number as x")
 	offset := (page - 1) * limit
 	fmt.Print("table", table)
 	if orgid > 0 {
 		db = db.Where("r.user_org_id = ?", orgid)
 	}
-	err = db.Count(&total).Select("r.id,r.guarantee_date,r.start_time,r.arrive_time,r.finish_time,r.total_distance,r.failure_stage,r.fault_description,r.cause_analysis,r.treatment_process,r.images,r.exclude,r.reason,r.ctime,r.mtime,r.status,r.user_org_id,r.bed_id,r.equitment_id,r.code_information,x.bed_number").Joins("Left join xt_device_addmacher as x on x.id = r.equitment_id").Offset(offset).Limit(limit).Scan(&repair).Error
+	err = db.Count(&total).Select("r.id,r.guarantee_date,r.start_time,r.arrive_time,r.finish_time,r.total_distance,r.failure_stage,r.fault_description,r.cause_analysis,r.treatment_process,r.images,r.exclude,r.reason,r.ctime,r.mtime,r.status,r.user_org_id,r.bed_id,r.equitment_id,r.code_information,x.number").Joins("Left join sgj_xt.xt_device_number as x on x.id = r.bed_id").Offset(offset).Limit(limit).Scan(&repair).Error
 
 	//	err = UserReadDB().Where("user_org_id = ? AND status = 1", orgid).Find(&repair).Error
 	return repair, total, err
@@ -699,7 +699,7 @@ func GetRepair(bedid int64, start int64, end int64, orgid int64) (repair []*mode
 		db = db.Where("r.guarantee_date <= ?", end)
 	}
 	//err = db.Model(&repair).Find(&repair).Error
-	err = db.Select("r.id,r.guarantee_date,r.start_time,r.arrive_time,r.finish_time,r.total_distance,r.failure_stage,r.fault_description,r.cause_analysis,r.treatment_process,r.images,r.exclude,r.reason,r.ctime,r.mtime,r.status,r.user_org_id,r.bed_id,r.equitment_id,r.code_information,x.bed_number").Joins("Left join xt_device_addmacher as x on x.id = r.equitment_id").Scan(&repair).Error
+	err = db.Select("r.id,r.guarantee_date,r.start_time,r.arrive_time,r.finish_time,r.total_distance,r.failure_stage,r.fault_description,r.cause_analysis,r.treatment_process,r.images,r.exclude,r.reason,r.ctime,r.mtime,r.status,r.user_org_id,r.bed_id,r.equitment_id,r.code_information,x.number").Joins("Left join sgj_xt.xt_device_number as x on x.id = r.bed_id").Scan(&repair).Error
 
 	return repair, err
 }
@@ -757,7 +757,7 @@ func UpadateForm(id int64, orgid int64, infor *models.DeviceInformation) error {
 	return err
 }
 
-func QueryInfo(zone int64, bed int64, start int64, end int64, orgId int64, limit int64, page int64) (infor []*models.DeviceInformations, total int64, err error) {
+func QueryInfo(bed int64, start int64, end int64, orgId int64, limit int64, page int64) (infor []*models.DeviceInformations, total int64, err error) {
 	db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
 	table := XTReadDB().Table("xt_patients as p")
 	fmt.Println("table", table)
@@ -766,9 +766,9 @@ func QueryInfo(zone int64, bed int64, start int64, end int64, orgId int64, limit
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	if zone > 0 {
-		db = db.Where("x.zone = ?", zone)
-	}
+	//if zone > 0 {
+	//	db = db.Where("x.zone = ?", zone)
+	//}
 	if bed > 0 {
 		db = db.Where("x.bed_number = ?", bed)
 	}

service/mobile_dialysis_service.go

@@ -118,6 +118,7 @@ type MSchedualPatientVMList struct {
 	Birthday    int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
 	Age         int64  `gorm:"column:age" json:"age"`
 	Name        string `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo    string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
 }
 
 func (MSchedualPatientVMList) TableName() string {

service/schedule_service.go

@@ -238,7 +238,7 @@ func GetWeekDaySchedule(orgID int64, scheduleDate int64, scheduleDates *time.Tim
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1").Order("id desc")
+			return db.Where("status = 1").Order("id asc")
 		}).
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		Where("s.user_org_id=? and s.schedule_date = ? and s.status=1", orgID, scheduleDate).

service/user_service.go

@@ -48,7 +48,10 @@ func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses [
 }
 
 func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
-	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	fmt.Println("orgid", orgId)
+	fmt.Println("appid", appid)
+	//	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }