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

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1315,6 +1315,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 		//查询号透析号是否相同
 		thisPatientother, _ := service.FindPatientByDialysisNoOne(orgid, dialysis, id)
 		if thisPatientother.ID > 0 && thisPatientother.ID != patient.BloodId {
+			fmt.Println("进来没有---------------------------------")
 			returnData := make(map[string]interface{}, 0)
 			returnData["msg"] = "透析号码已存在"
 			this.ServeSuccessJSON(returnData)
@@ -1777,6 +1778,8 @@ func (this *NewDialysisApiController) GetRoleName() {
 	appid := this.GetMobileAdminUserInfo().App.Id
 	fmt.Println("appid", appid)
 	name, err := service.GetRoleName(id, orgid, appid)
+	//获取管理员
+	admin, err := service.GetAdmin(id)
 	positionName, err := service.GetPositionName(id, orgid, appid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1785,6 +1788,7 @@ func (this *NewDialysisApiController) GetRoleName() {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"name":         name,
 		"positionName": positionName,
+		"admin":        admin,
 	})
 }
 
@@ -2309,7 +2313,9 @@ func (this *NewDialysisApiController) UpdatedBed() {
 func (this *NewDialysisApiController) GetMyOrgInformation() {
 	creator, _ := this.GetInt64("creator")
 	fmt.Println("cretor", creator)
-	information, err := service.GetMyOrgInformation(creator)
+	adminInfo := this.GetMobileAdminUserInfo()
+	appId := adminInfo.App.Id
+	information, err := service.GetMyOrgInformation(creator, appId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

service/orginfo_service.go

@@ -154,7 +154,7 @@ func createOrgApp(tx *gorm.DB, superAdminRole *models.Role, userName string, app
 		UserName:    userName,
 		Intro:       "",
 		UserType:    1,
-		UserTitle:   1,
+		UserTitle:   0,
 		Status:      1,
 		CreateTime:  now,
 		ModifyTime:  now,

service/patientmanage_service.go

@@ -432,7 +432,10 @@ func FindPatientByDialysisNoOne(orgID int64, dialysisNo string, id int64) (patie
 }
 
 func FindPatientByMobileOne(mobile string, orgID int64, id int64) (patient models.XtPatientsNew, err error) {
-	err = readDb.Model(&models.Patients{}).Where("phone=? and user_org_id=? and status=1 and id<>?", mobile, orgID, id).First(&patient).Error
+	//err = readDb.Model(&models.Patients{}).Where(" status=1 and user_org_id=? and   phone=? and id<>?", orgID, mobile, id).First(&patient).Error
+	//return
+	db := readDb.Table("xt_patients_new as x")
+	err = db.Not("phone = ?", mobile).Where("user_org_id = ? and id = ? and status =1", orgID, id).Find(&patient).Error
 	return
 }
 
@@ -1315,6 +1318,12 @@ func GetPositionName(adminid int64, orgid int64, appid int64) (models.App_Role,
 	return role, err
 }
 
+func GetAdmin(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 GetPosition(id int64) (models.SgjUserAdminRole, error) {
 	roles := models.SgjUserAdminRole{}
 	err = UserReadDB().Model(&roles).Where("id=? and status = 1", id).Find(&roles).Error
@@ -1328,9 +1337,9 @@ func GetPositionOne(id int64) (models.SgjUserAdmin, error) {
 	return admin, err
 }
 
-func GetMyOrgInformation(id int64) (models.SgjUserAdminRole, error) {
+func GetMyOrgInformation(id int64, appid int64) (models.SgjUserAdminRole, error) {
 	admin := models.SgjUserAdminRole{}
-	err := UserReadDB().Model(&admin).Where("admin_user_id=? and status = 1", id).Find(&admin).Error
+	err := UserReadDB().Model(&admin).Where("admin_user_id=? and  app_id = ? and status = 1", id, appid).First(&admin).Error
 	return admin, err
 }