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

.gitignore

@@ -1,5 +0,0 @@
-.svn
-.git
-XT.ext
-/*.exe
-/*.exe~

controllers/dialysis_api_controller.go

@@ -4308,11 +4308,12 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//获取医嘱内容
 	doctor, err := service.FindDoctor(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
 	DoctorName, err := service.FindDoctorName(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
-	//fmt.Print("err---------------------------------",err)
+	fmt.Print("err-----------------------------------------------------------------", err)
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	doctorAdevieInfo, err := service.FindDoctorAdviceByInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//获取上次的透后体重
-	assessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	//	assessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	assessmentAfterDislysis, _ := service.MobileGetLast(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//获取透析次数
 	_, total, err := service.GetTotalDialysisCout(adminUserInfo.CurrentOrgId, patientInfo.ID)
 

controllers/inspection_api_controller.go

@@ -432,7 +432,7 @@ func (c *InspectionApiController) GetPatientInspections() {
 
 	date := ""
 	if len(inspections) > 0 {
-		date = time.Unix(dateTime, 0).Format("2006-01-02")
+		date = time.Unix(dateTime, 0).Format("2006-01-02 15:04")
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -23,6 +23,8 @@ func (this *MobileBaseAPIController) Prepare() {
 	// beego.Trace("============================================================")
 }
 
+//
+
 func (this *MobileBaseAPIController) GetMobileAdminUserInfo() *MobileAdminUserInfo {
 	userInfo := this.GetSession("mobile_admin_user_info")
 	if userInfo == nil {

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1772,14 +1772,24 @@ func (this *NewDialysisApiController) GetOrgName() {
 func (this *NewDialysisApiController) GetRoleName() {
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
-	orgid := this.GetMobileAdminUserInfo().Org.Id
+	orgid, _ := this.GetInt64("orgid")
 	fmt.Println("orgid", orgid)
-	appid := this.GetMobileAdminUserInfo().App.Id
-	fmt.Println("appid", appid)
-	name, err := service.GetRoleName(id, orgid, appid)
+	//跟剧机构ID获取APPID
+	app, _ := service.GetAppId(orgid)
+	name, err := service.GetRoleName(id, orgid, app.Id)
 	//获取管理员
 	admin, err := service.GetAdmin(id)
-	positionName, err := service.GetPositionName(id, orgid, appid)
+	positionName, err := service.GetPositionName(id, orgid, app.Id)
+	role_ids := strings.Split(positionName.RoleIds, ",")
+	var names = ""
+	for _, item := range role_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		role, _ := service.GetRole(id)
+		if len(role.RoleName) != 0 {
+			names = role.RoleName + "," + names
+		}
+	}
+	fmt.Println("role_ids--------------", role_ids)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1788,6 +1798,7 @@ func (this *NewDialysisApiController) GetRoleName() {
 		"name":         name,
 		"positionName": positionName,
 		"admin":        admin,
+		"names":        names,
 	})
 }
 
@@ -2382,3 +2393,15 @@ func (this *NewDialysisApiController) GetCurrentOrg() {
 		"signToken": signToken,
 	})
 }
+
+func (this *NewDialysisApiController) GetMyMobile() {
+	id, _ := this.GetInt64("id")
+	mobile, err := service.GetMyMobile(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"mobile": mobile,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -148,4 +148,5 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/savenametwo", &NewDialysisApiController{}, "Get:SaveNameTwo")
 	beego.Router("/m/api/patient/getcurrentorg", &NewDialysisApiController{}, "Get:GetCurrentOrg")
 	beego.Router("/m/api/patient/getmyinformationfour", &NewDialysisApiController{}, "Get:GetMyInformationFour")
+	beego.Router("/m/api/org/getMyMobile", &NewDialysisApiController{}, "Get:GetMyMobile")
 }

models/dialysis.go

@@ -804,22 +804,23 @@ func (GobalTemplate) TableName() string {
 }
 
 type SgjUserAdminRole struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	OrgId       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	AppId       int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
-	RoleId      int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
-	UserName    string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	Avatar      string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	UserType    int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
-	UserTitle   int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
-	Intro       string `gorm:"column:intro" json:"intro" form:"intro"`
-	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"`
-	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"`
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	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"`
+	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"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
 }
 
 func (SgjUserAdminRole) TableName() string {

service/inspection_service.go

@@ -8,7 +8,13 @@ import (
 )
 
 func GetInspectionReference(orgId int64) (reference []*models.InspectionReference, err error) {
-	err = readDb.Model(&models.InspectionReference{}).Where("(org_id=0 OR org_id=?) and status=1", orgId).Order("project_id").Find(&reference).Error
+	var count int
+	err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Count(&count).Error
+	if count > 0 {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Order("project_id").Find(&reference).Error
+	} else {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1").Order("project_id").Find(&reference).Error
+	}
 	return
 }
 

service/manage_service.go

@@ -416,6 +416,12 @@ func GetOrgName(orgid int64) (models.Org, error) {
 	return org, err
 }
 
+func GetMyMobile(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 CreateCulture(culture *models.DeviceCulture) error {
 
 	err := writeUserDb.Create(&culture).Error

service/mobile_dialysis_service.go

@@ -557,6 +557,11 @@ func MobileGetLastTimeAssessmentAfterDislysis(orgID int64, patientID int64, maxD
 	}
 	return &record, nil
 }
+func MobileGetLast(orgID int64, patientID int64, maxDate int64) (models.AssessmentAfterDislysis, error) {
+	dislysis := models.AssessmentAfterDislysis{}
+	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&dislysis).Error
+	return dislysis, err
+}
 
 // 治疗小结
 func MobileGetTreatmentSummary(orgID int64, patientID int64, recordDate int64) (*models.TreatmentSummary, error) {

service/patientmanage_service.go

@@ -1310,6 +1310,12 @@ func CreateLoginLod(log *models.SgjUserAdminLoginLog) error {
 	return err
 }
 
+func GetAppId(orgid int64) (models.OrgApp, error) {
+	app := models.OrgApp{}
+	err := UserReadDB().Model(&app).Where("org_id = ? and status = 1 and app_type = 3", orgid).Find(&app).Error
+	return app, err
+}
+
 func GetRoleName(adminid int64, orgid int64, appid int64) (models.Roles, error) {
 
 	role := models.Roles{}
@@ -1317,6 +1323,12 @@ func GetRoleName(adminid int64, orgid int64, appid int64) (models.Roles, error)
 	return role, err
 }
 
+func GetRole(id int64) (models.Role, error) {
+	role := models.Role{}
+	err := UserReadDB().Model(&role).Where("id = ? and status =1", id).Find(&role).Error
+	return role, err
+}
+
 func GetPositionName(adminid int64, orgid int64, appid int64) (models.App_Role, error) {
 
 	role := models.App_Role{}