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

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1549,7 +1549,6 @@ func (this *NewDialysisApiController) GetMyInformation() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 
 	roleInfo := adminUserInfo.AppRole
-	fmt.Print("aa")
 	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)
 
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -1606,8 +1605,11 @@ func (this *NewDialysisApiController) SaveFeed() {
 	fmt.Print("phone", phone)
 	times, _ := this.GetInt64("time")
 	fmt.Print("time", times)
+	adminuserid, _ := this.GetInt64("admin_user_id")
+	fmt.Println("admin", adminuserid)
 	adminUser := this.GetMobileAdminUserInfo()
 	orgid := adminUser.Org.Id
+	appid := adminUser.App.Id
 	feedback := models.XtPatientFeedback{
 		ProblemType: question,
 		Title:       title,
@@ -1617,6 +1619,8 @@ func (this *NewDialysisApiController) SaveFeed() {
 		UserOrgId:   orgid,
 		Ctime:       time.Now().Unix(),
 		Status:      1,
+		AdminUserId: adminuserid,
+		AppId:       appid,
 	}
 	err := service.CreateFeedBack(&feedback)
 	if err != nil {
@@ -1640,3 +1644,293 @@ func (this *NewDialysisApiController) DeleteInspection() {
 	this.ServeSuccessJSON(returnData)
 	return
 }
+
+func (this *NewDialysisApiController) DeleteChildInspection() {
+	admininfo := this.GetMobileAdminUserInfo()
+	orgid := admininfo.Org.Id
+	name := this.GetString("name")
+	fmt.Println("name", name)
+	date, _ := this.GetInt64("date")
+	fmt.Println("date", date)
+	err := service.DeleteChildInspection(name, date, orgid)
+	fmt.Println("删除失败", err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "手机号码已存在"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *NewDialysisApiController) SaveMessage() {
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	appid := this.GetMobileAdminUserInfo().App.Id
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	message := this.GetString("message")
+	fmt.Println("message", message)
+	role := models.App_Role{
+		Message: message,
+	}
+	err := service.SaveMessage(orgid, appid, id, &role)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role": role,
+	})
+}
+
+func (this *NewDialysisApiController) SaveSex() {
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	appid := this.GetMobileAdminUserInfo().App.Id
+	sex, _ := this.GetInt64("sex")
+	fmt.Println("sex", sex)
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	role := models.App_Role{
+		Sex: sex,
+	}
+	err := service.SaveSex(id, orgid, appid, &role)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role": role,
+	})
+}
+
+func (this *NewDialysisApiController) SaveBirthday() {
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	appid := this.GetMobileAdminUserInfo().App.Id
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	id := dataBody["id"].(string)
+	ids, err := strconv.ParseInt(id, 10, 64)
+	fmt.Print("id", id)
+	birthday := dataBody["birth"].(string)
+	timeLayout := "2006-01-02 15:04:05"
+	theTime, err := utils.ParseTimeStringToTime(timeLayout, birthday+" 00:00:00")
+	birth := theTime.Unix()
+	role := models.App_Role{
+		Birthday: birth,
+	}
+	err = service.SaveBirthday(ids, orgid, appid, &role)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role": role,
+	})
+}
+
+func (this *NewDialysisApiController) GetOrgName() {
+
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	name, err := service.GetOrgName(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"name": name,
+	})
+}
+
+func (this *NewDialysisApiController) GetRoleName() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	fmt.Println("orgid", orgid)
+	appid := this.GetMobileAdminUserInfo().App.Id
+	fmt.Println("appid", appid)
+	name, err := service.GetRoleName(id, orgid, appid)
+	positionName, err := service.GetPositionName(id, orgid, appid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"name":         name,
+		"positionName": positionName,
+	})
+}
+
+func (this *NewDialysisApiController) SavePartition() {
+	adminInfo := this.GetMobileAdminUserInfo()
+	name := this.GetString("name")
+	fmt.Println("分区名称", name)
+	zonetype, _ := this.GetInt64("type")
+	fmt.Println("分区型号", zonetype)
+	strInt64 := strconv.FormatInt(zonetype, 10)
+	typeid, _ := strconv.Atoi(strInt64)
+	zone := models.DeviceZone{
+		Name:       name,
+		Type:       typeid,
+		OrgID:      adminInfo.Org.Id,
+		Status:     1,
+		CreateTime: time.Now().Unix(),
+	}
+	err := service.CreatedZone(&zone)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"zone": zone,
+	})
+}
+
+func (this *NewDialysisApiController) GetAllZone() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	zone, total, err := service.GetAllZone(orgid, page, limit)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"zone":  zone,
+		"total": total,
+	})
+}
+
+func (this *NewDialysisApiController) DeleteZone() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteZoneById(id)
+	fmt.Println("删除失败", err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "删除失败"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *NewDialysisApiController) SaveGroup() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	name := this.GetString("name")
+	fmt.Println("name", name)
+	group := models.DeviceGroup{
+		Name:       name,
+		Status:     1,
+		CreateTime: time.Now().Unix(),
+		OrgID:      orgid,
+	}
+	err := service.SaveGroup(&group)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"group": group,
+	})
+}
+
+func (this *NewDialysisApiController) GetAllGroup() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	page, _ := this.GetInt64("page")
+	fmt.Println("page", page)
+	limit, _ := this.GetInt64("limit")
+	fmt.Println("limit", limit)
+	group, total, err := service.GetAllGroup(orgid, page, limit)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"group": group,
+		"total": total,
+	})
+}
+
+func (this *NewDialysisApiController) DeleteGroup() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	err := service.DeleteGroup(id)
+	fmt.Println("删除失败", err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "删除失败"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *NewDialysisApiController) GetAllGroupOne() {
+	admininfo := this.GetMobileAdminUserInfo()
+	orgid := admininfo.Org.Id
+	zone, _ := service.GetAllZoneOne(orgid)
+	group, err := service.GetAllGroupOne(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"zone":  zone,
+		"group": group,
+	})
+}
+
+func (this *NewDialysisApiController) SaveBed() {
+	adminuser := this.GetMobileAdminUserInfo()
+	orgid := adminuser.Org.Id
+	name := this.GetString("name")
+	fmt.Println("name", name)
+	zone, _ := this.GetInt64("zone")
+	fmt.Print("zone", zone)
+	group, _ := this.GetInt64("group")
+	fmt.Println("group", group)
+	number := models.DeviceNumber{
+		Number:     name,
+		ZoneID:     zone,
+		GroupID:    group,
+		OrgID:      orgid,
+		Status:     1,
+		CreateTime: time.Now().Unix(),
+	}
+	err := service.CreateNumber(&number)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"number": number,
+	})
+}
+
+func (this *NewDialysisApiController) GetAllNumber() {
+	admininfo := this.GetMobileAdminUserInfo()
+	orgid := admininfo.Org.Id
+	page, _ := this.GetInt64("page")
+	fmt.Print("page", page)
+	limit, _ := this.GetInt64("limit")
+	fmt.Println("limit", limit)
+	number, total, err := service.GetAllNumber(page, limit, orgid)
+	zone, _ := service.GetAllZoneOne(orgid)
+	group, _ := service.GetAllGroupOne(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"number": number,
+		"total":  total,
+		"zone":   zone,
+		"group":  group,
+	})
+}
+
+func (this *NewDialysisApiController) DeleteBed() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	err := service.DeleteBed(id)
+	fmt.Println("删除失败", err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "删除失败"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -105,4 +105,20 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/savefeed", &NewDialysisApiController{}, "Get:SaveFeed")
 	beego.Router("/m/api/patient/deletechild", &NewDialysisApiController{}, "Delete:DeleteChild")
 	beego.Router("/m/api/patient/deleteinspection", &NewDialysisApiController{}, "Delete:DeleteInspection")
+	beego.Router("/m/api/patient/deletechildinspection", &NewDialysisApiController{}, "Delete:DeleteChildInspection")
+	beego.Router("/m/api/patient/savemessage", &NewDialysisApiController{}, "Get:SaveMessage")
+	beego.Router("/m/api/patient/savesex", &NewDialysisApiController{}, "Get:SaveSex")
+	beego.Router("/m/api/patient/savebirthday", &NewDialysisApiController{}, "Post:SaveBirthday")
+	beego.Router("/m/api/patient/getorgname", &NewDialysisApiController{}, "Get:GetOrgName")
+	beego.Router("/m/api/patient/getrolename", &NewDialysisApiController{}, "Get:GetRoleName")
+	beego.Router("/m/api/patient/savepartition", &NewDialysisApiController{}, "Get:SavePartition")
+	beego.Router("/m/api/patient/getallzone", &NewDialysisApiController{}, "Get:GetAllZone")
+	beego.Router("/m/api/patient/deletezone", &NewDialysisApiController{}, "Delete:DeleteZone")
+	beego.Router("/m/api/patient/savegroup", &NewDialysisApiController{}, "Get:SaveGroup")
+	beego.Router("/m/api/patient/getallgroup", &NewDialysisApiController{}, "Get:GetAllGroup")
+	beego.Router("/m/api/patient/deletegroup", &NewDialysisApiController{}, "Delete:DeleteGroup")
+	beego.Router("m/api/patient/getallgroupone", &NewDialysisApiController{}, "Get:GetAllGroupOne")
+	beego.Router("/m/api/patient/savebed", &NewDialysisApiController{}, "Get:SaveBed")
+	beego.Router("/m/api/patient/getallnumber", &NewDialysisApiController{}, "Get:GetAllNumber")
+	beego.Router("/m/api/patient/deletebed", &NewDialysisApiController{}, "Delete:DeleteBed")
 }

models/role_models.go

@@ -52,6 +52,9 @@ type App_Role struct {
 	UserTitleName string    `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
 	RoleIds       string    `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
 	AdminUser     AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:AdminUserId" json:"admin"`
+	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"`
 }
 
 func (App_Role) TableName() string {
@@ -95,3 +98,21 @@ type SgjUserRoleFuncPurview struct {
 func (SgjUserRoleFuncPurview) TableName() string {
 	return "sgj_user_role_func_purview"
 }
+
+type Roles struct {
+	Id           int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	RoleName     string `gorm:"column:role_name" json:"role_name"`
+	RoleIntro    string `gorm:"column:role_introduction" json:"intro"`
+	Creator      int64  `json:"-"`
+	OrgId        int64  `gorm:"column:org_id" json:"-"`
+	AppId        int64  `gorm:"column:app_id" json:"-"`
+	IsSuperAdmin bool   `gorm:"column:is_super_admin" json:"is_super_admin"`
+	Status       int8   `json:"status"`                // 状态 0.无效 1.有效 2.禁用
+	CreateTime   int64  `gorm:"column:ctime" json:"-"` // 创建时间
+	ModifyTime   int64  `gorm:"column:mtime" json:"-"` // 修改时间
+	StaffNumber  int64  `gorm:"-" json:"staff_number"`
+}
+
+func (Roles) TableName() string {
+	return "sgj_user_role"
+}

service/manage_service.go

@@ -1050,3 +1050,17 @@ func DeleteImages(id int64) error {
 	err := UserWriteDB().Model(&repair).Where("id=?", id).Update(map[string]interface{}{"images": "", "image_name": ""}).Error
 	return err
 }
+
+func GetRoleName(adminid int64, orgid int64, appid int64) (models.Roles, error) {
+
+	role := models.Roles{}
+	err := UserReadDB().Model(&role).Where("creator = ? and org_id = ? and app_id = ? and status =1", adminid, orgid, appid).Find(&role).Error
+	return role, err
+}
+
+func GetPositionName(adminid int64, orgid int64, appid int64) (models.App_Role, error) {
+
+	role := models.App_Role{}
+	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and app_id = ?", adminid, orgid, appid).Find(&role).Error
+	return role, err
+}

service/patientmanage_service.go

@@ -979,3 +979,103 @@ func DeleteInspection(date int64, orgid int64) error {
 	err := XTWriteDB().Model(models.Inspection{}).Where("inspect_date = ? and org_id = ?", date, orgid).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
 	return err
 }
+
+func DeleteChildInspection(name string, date int64, orgid int64) error {
+
+	err := XTWriteDB().Model(models.Inspection{}).Where("project_name = ? and inspect_date = ? and org_id = ?", name, date, orgid).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func SaveMessage(orgid int64, appid int64, id int64, role *models.App_Role) error {
+
+	err := UserWriteDB().Model(models.App_Role{}).Where("org_id = ? and app_id = ? and admin_user_id = ?", orgid, appid, id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func SaveSex(id int64, orgid int64, appid int64, role *models.App_Role) error {
+	err := UserWriteDB().Model(models.App_Role{}).Where("org_id = ? and app_id = ? and admin_user_id = ?", orgid, appid, id).Update(map[string]interface{}{"sex": role.Sex, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func SaveBirthday(id int64, orgid int64, appid int64, role *models.App_Role) error {
+	err := UserWriteDB().Model(models.App_Role{}).Where("org_id = ? and app_id = ? and admin_user_id = ?", orgid, appid, id).Update(map[string]interface{}{"birthday": role.Birthday, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func CreatedZone(zone *models.DeviceZone) error {
+
+	err := XTWriteDB().Model(&zone).Create(&zone).Error
+	return err
+}
+
+func GetAllZone(orgid int64, page int64, limit int64) (zone []*models.DeviceZone, total int64, err error) {
+
+	db := XTReadDB().Table("xt_device_zone as x").Where("x.status =1")
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	offset := (page - 1) * limit
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Select("x.id,x.org_id,x.name,x.type").Find(&zone).Error
+	return zone, total, err
+}
+
+func DeleteZoneById(id int64) error {
+
+	err := XTWriteDB().Model(models.DeviceZone{}).Where("id=?", id).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func SaveGroup(group *models.DeviceGroup) error {
+	err := XTWriteDB().Model(&group).Create(&group).Error
+	return err
+}
+
+func GetAllGroup(orgid int64, page int64, limit int64) (group []*models.DeviceGroup, total int64, err error) {
+	db := XTReadDB().Table("xt_device_group as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	offset := (page - 1) * limit
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Select("x.id,x.org_id,x.name,x.status,x.ctime,x.mtime").Find(&group).Error
+	return group, total, err
+}
+
+func DeleteGroup(id int64) error {
+	err := XTWriteDB().Model(models.DeviceGroup{}).Where("id=?", id).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func GetAllZoneOne(orgid int64) (zone []*models.DeviceZone, err error) {
+
+	err = XTReadDB().Model(&zone).Where("org_id = ?", orgid).Find(&zone).Error
+	return zone, err
+}
+
+func GetAllGroupOne(orgid int64) (group []*models.DeviceGroup, err error) {
+
+	err = XTReadDB().Model(&group).Where("org_id =?", orgid).Find(&group).Error
+	return group, err
+}
+
+func CreateNumber(number *models.DeviceNumber) error {
+
+	err := XTWriteDB().Model(&number).Create(&number).Error
+	return err
+}
+
+func GetAllNumber(page int64, limit int64, orgid int64) (number []*models.DeviceNumber, total int64, err error) {
+
+	db := XTReadDB().Table("xt_device_number as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	offset := (page - 1) * limit
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Select("x.id,x.org_id,x.number,x.group_id,x.zone_id,x.status").Find(&number).Error
+
+	return number, total, err
+}
+
+func DeleteBed(id int64) error {
+	err := XTWriteDB().Model(models.DeviceNumber{}).Where("id=?", id).Update(map[string]interface{}{"status": 0, "ctime": time.Now().Unix()}).Error
+	return err
+}