提交

controllers/dialysis_api_controller.go

 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-
+	fmt.Println("丰管业配置", data.SealingFluidDispose)
 	assessment, _ := service.FindAssessmentAfterDislysisById(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 	assessment.DialysisOrderId = data.DialysisOrderId
 	assessment.Evaluator = adminUserInfo.AdminUser.Id
 	dialysis_interphase := c.GetString("dialysis_interphase")
 	symptom_before_dialysis := c.GetString("symptom_before_dialysis")
 	bloodAccessPartOperaId, _ := c.GetInt64("blood_access_part_opera_id", 0)
-	bloodAccessPartId, _ := c.GetInt64("blood_access_part_id", 0)
+	//bloodAccessPartId, _ := c.GetInt64("blood_access_part_id", 0)
+	bloodAccessPartId := c.GetString("blood_access_part_id")
 	internalFistula := c.GetString("internal_fistula")
 	internal_fistula_skin := c.GetString("internal_fistula_skin")
 	catheter := c.GetString("catheter")

controllers/mobile_api_controllers/dialysis_api_controller.go

 	dialysis_during, _ := c.GetInt64("dialysis_during", 0)
 	stroke_volume, _ := c.GetInt64("stroke_volume", 0)
 	blood_flow, _ := c.GetInt64("blood_flow", 0)
-	sealing_fluid_dispose, _ := c.GetInt64("sealing_fluid_dispose", 0)
+	//sealing_fluid_dispose, _ := c.GetInt64("sealing_fluid_dispose", 0)
+	sealing_fluid_dispose := c.GetString("sealing_fluid_dispose")
 	sealing_fluid_special := c.GetString("sealing_fluid_special")
 	dosage_of_anticoagulants, _ := c.GetFloat("dosage_of_anticoagulants")
 	supine_systolic_blood_pressure := c.GetString("supine_systolic_blood_pressure")

controllers/mobile_api_controllers/patient_api_controller.go

 		evaluation.MachineType = machine_type
 	}
 
-	if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "float64" {
-		blood_access_part_id := int64(dataBody["blood_access_part_id"].(float64))
+	if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "string" {
+		blood_access_part_id := dataBody["blood_access_part_id"].(string)
 		evaluation.BloodAccessPartId = blood_access_part_id
 	}
+	//if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "float64" {
+	//	blood_access_part_id := int64(dataBody["blood_access_part_id"].(float64))
+	//	evaluation.BloodAccessPartId = blood_access_part_id
+	//}
 	if dataBody["blood_access_part_opera_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_opera_id"]).String() == "float64" {
 		blood_access_part_opera_id := int64(dataBody["blood_access_part_opera_id"].(float64))
 		evaluation.BloodAccessPartOperaId = blood_access_part_opera_id

controllers/new_mobile_api_controllers/new_role_api_controller.go

 	userTitle := this.GetString("title")
 	user_type, _ := this.GetInt("user_type", 0)
 	user_title, _ := this.GetInt("user_title", 0)
-
+	sort, _ := this.GetInt64("sort")
 	if len(mobile) == 0 || len(name) == 0 || len(role_ids) <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 		return
 	} else {
 		if adminUser == nil { //新增账号和用户
-			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.Org.Id, adminUserInfo.App.Id, mobile, name, userTitle, role_ids, user_type, user_title)
+			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.Org.Id, adminUserInfo.App.Id, mobile, name, userTitle, role_ids, user_type, user_title, sort)
 			if createErr != nil {
 				//beego.Error("创建管理员失败:", createErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)

models/dialysis.go

 	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time"`
 	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time"`
 	Modifier                    int64   `gorm:"column:modifier" json:"modifier"`
-	BloodAccessPartId           int64   `gorm:"column:blood_access_part_id" json:"blood_access_part_id"`
+	BloodAccessPartId           string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id"`
 	BloodAccessPartOperaId      int64   `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id"`
 	IsHemorrhage                int64   `gorm:"column:is_hemorrhage" json:"is_hemorrhage"`
 	Hemorrhage                  string  `gorm:"column:hemorrhage" json:"hemorrhage"`
 	StrokeVolume                    int64   `gorm:"column:stroke_volume" json:"stroke_volume" form:"stroke_volume"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 	BloodFlow                       int64   `gorm:"column:blood_flow" json:"blood_flow" form:"blood_flow"`
-	SealingFluidDispose             int64   `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
+	SealingFluidDispose             string  `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
 	SealingFluidSpecial             string  `gorm:"column:sealing_fluid_special" json:"sealing_fluid_special" form:"sealing_fluid_special"`
 	DosageOfAnticoagulants          float64 `gorm:"column:dosage_of_anticoagulants" json:"dosage_of_anticoagulants" form:"dosage_of_anticoagulants"`
 	SupineSystolicBloodPressure     string  `gorm:"column:supine_systolic_blood_pressure" json:"supine_systolic_blood_pressure" form:"supine_systolic_blood_pressure"`

models/role_models.go

 	Message         string `gorm:"column:message" json:"message" form:"message"`
 	Sex             int64  `gorm:"column:sex" json:"sex" form:"sex"`
 	Birthday        int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Sort            int64  `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (App_Role) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

 	Creater                        int64   `gorm:"column:creater" json:"creater"`
 	Remark                         string  `gorm:"column:remark" json:"remark"`
 	Modifier                       int64   `gorm:"column:modifier" json:"modifier"`
-	BloodAccessPartId              int64   `gorm:"column:blood_access_part_id" json:"blood_access_part_id"`
+	BloodAccessPartId              string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id"`
 	BloodAccessPartOperaId         int64   `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id"`
 	IsHemorrhage                   int64   `gorm:"column:is_hemorrhage" json:"is_hemorrhage"`
 	Hemorrhage                     string  `gorm:"column:hemorrhage" json:"hemorrhage"`
 	DialysisDuring                  int64   `gorm:"column:dialysis_during" json:"dialysis_during" form:"dialysis_during"`
 	StrokeVolume                    int64   `gorm:"column:stroke_volume" json:"stroke_volume" form:"stroke_volume"`
 	BloodFlow                       int64   `gorm:"column:blood_flow" json:"blood_flow" form:"blood_flow"`
-	SealingFluidDispose             int64   `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
+	SealingFluidDispose             string  `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
 	SealingFluidSpecial             string  `gorm:"column:sealing_fluid_special" json:"sealing_fluid_special" form:"sealing_fluid_special"`
 }
 

service/role_service.go

 	TitleName       string `gorm:"-" json:"title_name"`
 	IsSubSuperAdmin bool   `gorm:"-" json:"is_sub_super_admin"`
 	//mobile          string `gorm:"-" json:"mobile"`
+	Sort int `gorm:"sort" json:"sort"`
 }
 
 func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([]*AdminUserManageViewModel, int, error) {
 		page = 1
 	}
 	var viewModels []*AdminUserManageViewModel = make([]*AdminUserManageViewModel, 0)
-	rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status,u_a_r.avatar,u_a_r.role_ids FROM sgj_user_admin_role AS u_a_r  LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ?  ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? GROUP BY u_a_r.admin_user_id LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
+	rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status,u_a_r.avatar,u_a_r.role_ids,u_a_r.sort FROM sgj_user_admin_role AS u_a_r   LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ?  ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l  ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? GROUP BY u_a_r.admin_user_id order by u_a_r.sort LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
 	defer rows.Close()
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 	return user.IsSuperAdmin, nil
 }
 
-func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string, user_type int, user_title int) (*models.AdminUser, string, error) {
+func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string, user_type int, user_title int, sort int64) (*models.AdminUser, string, error) {
 	now := time.Now().Unix()
 	tx := writeUserDb.Begin()
 	var adminUser models.AdminUser
 		CreateTime:    now,
 		ModifyTime:    now,
 		RoleIds:       roleIds,
+		Sort:          sort,
 	}
 	if createApp_RoleErr := tx.Create(&app_role).Error; createApp_RoleErr != nil {
 		tx.Rollback()

service/statistics_service/index_models.go

 	DryWeight                 float64                   `gorm:"column:dry_weight" json:"dry_weight"`
 	WeighingBefore            float64                   `gorm:"column:weighing_before" json:"weighing_before"`
 	WeightBefore              float64                   `gorm:"column:weight_before" json:"weight_before"`
-	BloodAccessPartId         int64                     `gorm:"column:blood_access_part_id" json:"blood_access_part_id"`
+	BloodAccessPartId         string                    `gorm:"column:blood_access_part_id" json:"blood_access_part_id"`
 	VMAssessmentAfterDislysis VMAssessmentAfterDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,AssessmentDate" json:"after"`
 	VMPatients                VMPatients                `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
 	LastAfterWeight           float64                   `gorm:"-" json:"last_after_weight"`