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

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

 	fmt.Print("结束时间", endtime)
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
+	fmt.Println("病人ID", newPatientInfo.BloodId)
 	advice, total, err := service.GetNewDoctorAdvice(newPatientInfo.BloodId, doctor_type, startime, endtime, limit, page, orgid)
+	one, t, date, err := service.GetNewDoctorAdviceOne(newPatientInfo.BloodId, page, orgid)
+	fmt.Print(one, t, date, err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 		"advice": advice,
 		"total":  total,
 		"doctor": doctor,
+		"one":    one,
 	})
 }
 
 	return
 }
 
+func (this *NewDialysisApiController) DeletePatient() {
+	id, _ := this.GetInt64("id")
+	err := service.DeletePatient(id)
+	fmt.Println("错误是什么", err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
 func (this *NewDialysisApiController) UpdatedPatient() {
 
 	adminInfo := this.GetMobileAdminUserInfo()
 		"patient": patient,
 	})
 }
+
+func (this *NewDialysisApiController) SaveName() {
+	id := this.GetString("id")
+	ids, _ := strconv.ParseInt(id, 10, 64)
+	fmt.Println("id", ids)
+	name := this.GetString("name")
+	fmt.Println("name", name)
+	role := models.SgjUserAdminRole{
+		UserName: name,
+	}
+	err := service.SaveName(ids, &role)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role": role,
+	})
+}
+
+func (this *NewDialysisApiController) GetAllOrganization() {
+
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+}
+
+func (this *NewDialysisApiController) GetMyOrganazition() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	role, _ := service.GetAdminUserId(id)
+	organaziton, err := service.GetMyOrganaziton(role.AdminUserId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"organaziton": organaziton,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

 	beego.Router("/m/api/patient/getinspectiondetail", &NewDialysisApiController{}, "Get:GetInspectionDetail")
 	beego.Router("/m/api/patient/savefeed", &NewDialysisApiController{}, "Get:SaveFeed")
 	beego.Router("/m/api/patient/deletechild", &NewDialysisApiController{}, "Delete:DeleteChild")
+	beego.Router("/m/api/patient/deletePatient", &NewDialysisApiController{}, "Delete:DeletePatient")
 	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/getmemberpatient", &NewDialysisApiController{}, "Get:GetMemberPatient")
 	beego.Router("/m/api/patient/getslowpatient", &NewDialysisApiController{}, "Get:GetSlowPatient")
 	beego.Router("/m/api/patient/getbloodpatient", &NewDialysisApiController{}, "Get:GetBloodPatient")
+	beego.Router("/m/api/patient/savename", &NewDialysisApiController{}, "Get:SaveName")
+	beego.Router("/m/api/patient/getallorganization", &NewDialysisApiController{}, "Get:GetAllOrganization")
+	beego.Router("/m/api/patient/getmyorganazition", &NewDialysisApiController{}, "Get:GetMyOrganazition")
 }

models/device_models.go

 	return "xt_device_info_wte"
 }
 
+type DeviceZones struct {
+	ID         int64  `gorm:"column:id" json:"id"`
+	OrgID      int64  `gorm:"column:org_id" json:"-"`
+	Name       string `json:"name"`
+	Type       int    `json:"type"`
+	Status     int8   `json:"-"`
+	CreateTime int64  `gorm:"column:ctime" json:"-"`
+	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+	Number     string `gorm:"column:number" json:"number" form:"number"`
+}
+
 type DeviceZone struct {
 	ID         int64  `gorm:"column:id" json:"id"`
 	OrgID      int64  `gorm:"column:org_id" json:"-"`
 	return "xt_device_zone"
 }
 
+type DeviceGroups struct {
+	ID         int64  `gorm:"column:id" json:"id"`
+	OrgID      int64  `gorm:"column:org_id" json:"-"`
+	Name       string `json:"name"`
+	Status     int8   `json:"-"`
+	CreateTime int64  `gorm:"column:ctime" json:"-"`
+	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+	Number     string `gorm:"column:number" json:"number" form:"number"`
+}
+
 type DeviceGroup struct {
 	ID         int64  `gorm:"column:id" json:"id"`
 	OrgID      int64  `gorm:"column:org_id" json:"-"`

models/inspection_models.go

 	ProjectId int64
 }
 
+type UserDoctorAdvicesCount struct {
+	PatientId int64
+	Count     int64
+}
+
 type InspectionReferenceMap struct {
 	ProjectName         string                `gorm:"-" json:"project_name" form:"project_name"`
 	Project             string                `gorm:"-" json:"project" form:"project"`
 	InspectDate int64
 }
 
+type AdviceDate struct {
+	RecordDate int64
+}
+
 type XtPatientFeedback struct {
 	ID          int64  `gorm:"column:id" json:"id" form:"id"`
 	ProblemType int64  `gorm:"column:problem_type" json:"problem_type" form:"problem_type"`

models/org_models.go

 func (Illness) TableName() string {
 	return "sgj_user_illness"
 }
+
+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"`
+	IsSuperAdmin    int64   `gorm:"column:is_super_admin" json:"is_super_admin" form:"is_super_admin"`
+}
+
+func (SgjUserOrg) TableName() string {
+	return "sgj_user_org"
+}

service/inspection_service.go

 	return
 }
 
+func GetAdvices(orgid int64, patientid int64, recorddate int64) (advcie []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and status =1", patientid, orgid, recorddate).Find(&advcie).Error
+	return
+}
+
 func CreatePatientInspection(inspectins []models.Inspection) (err error) {
 	if len(inspectins) == 0 {
 		err = errors.New("Inspections Cant be nil.")

service/patientmanage_service.go

 
 }
 
+func GetNewDoctorAdviceOne(patientID int64, page int64, orgID int64) (doctoradvice []*models.DoctorAdvice, total int64, date int64, err error) {
+
+	var advicesCount models.UserDoctorAdvicesCount
+
+	err = XTReadDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and status =1", patientID, orgID).Select("count(distinct record_date) as count,patient_id").Scan(&advicesCount).Error
+
+	if err != nil {
+		return
+	}
+	total = advicesCount.Count
+	if total == 0 || page > total {
+		return
+	}
+
+	var Id models.AdviceDate
+
+	err = XTReadDB().Model(models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Select("record_date").Group("record_date").Order("created_time desc").Offset(page - 1).Limit(10).Scan(&Id).Error
+	if err != nil {
+		return
+	}
+
+	if Id.RecordDate == 0 {
+		return
+	}
+
+	date = Id.RecordDate
+	fmt.Println("结构是==============", Id.RecordDate)
+	doctoradvice, err = GetAdvices(orgID, patientID, Id.RecordDate)
+	if err != nil {
+		return
+	}
+	return
+
+}
+
 func GetDryWeight(patientid int64, startime int64, endtime int64, limit int64, page int64, orgId int64) (dryWeight []*models.XtPatientDryweight, total int64, err error) {
 	db := XTReadDB().Table("xt_patient_dryweight as x").Where("x.status = 1")
 	if orgId > 0 {
 	return err
 }
 
+func DeletePatient(id int64) error {
+
+	err = XTWriteDB().Model(models.DoctorAdvice{}).Where("id=? and parent_id = ?", id, id).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
 func GetNewPatient(id int64) (models.XtPatientsNew, error) {
 	patientsNew := models.XtPatientsNew{}
 	err := XTReadDB().Model(&patientsNew).Where("id=?", id).Find(&patientsNew).Error
 	return err
 }
 
-func GetAllZone(orgid int64, page int64, limit int64) (zone []*models.DeviceZone, total int64, err error) {
+func GetAllZone(orgid int64, page int64, limit int64) (zone []*models.DeviceZones, total int64, err error) {
 
 	db := XTReadDB().Table("xt_device_zone as x").Where("x.status =1")
+	table := XTReadDB().Table("xt_device_number as n")
+	fmt.Println("table", table)
 	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
+	err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Select("x.id,x.org_id,x.name,x.type,n.number").Joins("left join xt_device_number as n on n.zone_id = x.id").Scan(&zone).Error
 	return zone, total, err
 }
 
 	return err
 }
 
-func GetAllGroup(orgid int64, page int64, limit int64) (group []*models.DeviceGroup, total int64, err error) {
+func GetAllGroup(orgid int64, page int64, limit int64) (group []*models.DeviceGroups, total int64, err error) {
 	db := XTReadDB().Table("xt_device_group as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_device_number as n")
+	fmt.Println("table", table)
 	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
+	err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Select("x.id,x.org_id,x.name,x.status,x.ctime,x.mtime,n.number").Joins("left join xt_device_number as n on n.group_id = x.id").Scan(&group).Error
 	return group, total, err
 }
 
 	err = XTReadDB().Model(&patients).Where("user_org_id = ? AND blood_patients = ? AND status = 1", orgid, 1).Find(&patients).Error
 	return patients, err
 }
+
+func SaveName(id int64, role *models.SgjUserAdminRole) error {
+
+	err = UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id=?", id).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetAdminUserId(id int64) (models.SgjUserAdminRole, error) {
+
+	role := models.SgjUserAdminRole{}
+	err := UserReadDB().Where("id=? and status =1", id).Find(&role).Error
+	return role, err
+}
+
+func GetMyOrganaziton(id int64) (org []*models.SgjUserOrg, err error) {
+
+	db := UserReadDB().Table("sgj_user_org as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin as a")
+	fmt.Println("table", table)
+	err = db.Select("x.id,x.creator,x.org_name,x.org_short_name,x.org_logo,x.org_introduction,x.illness,x.province,x.city,x.district,x.address,x.longitude,x.latitude,x.org_type,x.comments,x.evaluate,x.gallery,x.business_week,x.business_time,x.contact_name,x.telephone,x.claim,x.operating_state,x.source,x.ttype,x.ttid,x.tuid,x.reason,x.level,x.website,x.import,x.sortno,a.is_super_admin").Joins("left join sgj_user_admin as a on a.id = x.creator").Where("x.creator = ?", id).Scan(&org).Error
+	return org, err
+}