Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2546,7 +2546,6 @@ func (this *NewDialysisApiController) GetRolePosition() {
 
 func (this *NewDialysisApiController) GetOrgs() {
 	adminInfo := this.GetMobileAdminUserInfo()
-	fmt.Println("a---------")
 	orgs, err := service.GetOrgs(adminInfo.AdminUser.Id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

models/inspection_models.go

@@ -43,25 +43,25 @@ type Inspections struct {
 }
 
 type InspectionReference struct {
-	ID int64 `gorm:"column:id" json:"id" form:"id"`
-	OrgId int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	Project string `gorm:"column:project" json:"project" form:"project"`
-	ProjectId int64 `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	ItemName string `gorm:"column:item_name" json:"item_name" form:"item_name"`
-	ItemId string `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	SysItemId int64 `gorm:"column:sys_item_id" json:"sys_item_id" form:"sys_item_id"`
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectName      string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Project          string `gorm:"column:project" json:"project" form:"project"`
+	ProjectId        int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemName         string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ItemId           string `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	SysItemId        int64  `gorm:"column:sys_item_id" json:"sys_item_id" form:"sys_item_id"`
 	ItemNameAddition string `gorm:"column:item_name_addition" json:"item_name_addition" form:"item_name_addition"`
-	Item string `gorm:"column:item" json:"item" form:"item"`
-	RangeType int64 `gorm:"column:range_type" json:"range_type" form:"range_type"`
-	RangeMin string `gorm:"column:range_min" json:"range_min" form:"range_min"`
-	RangeMax string `gorm:"column:range_max" json:"range_max" form:"range_max"`
-	RangeValue string `gorm:"column:range_value" json:"range_value" form:"range_value"`
-	RangeOptions string `gorm:"column:range_options" json:"range_options" form:"range_options"`
-	Unit string `gorm:"column:unit" json:"unit" form:"unit"`
-	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"`
+	Item             string `gorm:"column:item" json:"item" form:"item"`
+	RangeType        int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeMin         string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	RangeMax         string `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangeValue       string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	RangeOptions     string `gorm:"column:range_options" json:"range_options" form:"range_options"`
+	Unit             string `gorm:"column:unit" json:"unit" form:"unit"`
+	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"`
 }
 
 func (InspectionReference) TableName() string {

service/manage_service.go

@@ -1108,7 +1108,7 @@ func GetMobile(id int64) (models.SgjUserAdmin, error) {
 func GetOrgs(id int64) (roles []*models.SgjUserAdminRole, err error) {
 
 	db := UserReadDB().Table("sgj_user_admin_role as s").Where("s.status = 1")
-	err = db.Group("s.org_id").Select("s.id,s.admin_user_id,s.org_id,s.app_id,s.role_id,s.user_name,s.avatar,s.user_type,s.user_title,s.intro,s.user_title_name,s.role_ids,s.message,s.sex,s.birthday,x.org_name,x.org_logo,x.creator").Where("s.admin_user_id = ?", id).Joins("left join sgj_user_org as x on x.id = s.org_id").Scan(&roles).Error
+	err = db.Group("s.org_id").Select("s.admin_user_id,s.org_id,s.app_id,s.role_id,s.user_name,s.avatar,s.user_type,s.user_title,s.intro,s.user_title_name,s.role_ids,s.message,s.sex,s.birthday,x.org_name,x.org_logo,x.creator,x.id").Where("s.admin_user_id = ?", id).Joins("left join sgj_user_org as x on x.id = s.org_id").Scan(&roles).Error
 
 	return roles, err
 }

service/patientmanage_service.go

@@ -1034,11 +1034,12 @@ func GetInspectionDetail(patientid int64, date int64, orgid int64, projectid int
 	if orgid > 0 {
 
 		db = db.Where("x.org_id = ?", orgid)
+
 	}
 	if projectid > 0 {
 		db = db.Where("x.project_id = ?", projectid)
 	}
-	err = db.Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on r.id = x.item_id ").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id ").Scan(&inspection).Error
 	return inspection, err
 }