XMLWAN преди 5 години
родител
ревизия
895c786bd0

+ 6 - 6
conf/app.conf Целия файл

148
 readmysqlport = 3306
148
 readmysqlport = 3306
149
 readmysqluser = root
149
 readmysqluser = root
150
 readmysqlpass = 1Q2W3e4r!@#$
150
 readmysqlpass = 1Q2W3e4r!@#$
151
-readmysqlname = test_xt
152
-//readmysqlname = sgj_xt
151
+//readmysqlname = test_xt
152
+readmysqlname = sgj_xt
153
 
153
 
154
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
154
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
155
 writemysqlport = 3306
155
 writemysqlport = 3306
156
 writemysqluser = root
156
 writemysqluser = root
157
 writemysqlpass = 1Q2W3e4r!@#$
157
 writemysqlpass = 1Q2W3e4r!@#$
158
-writemysqlname = test_xt
159
-//writemysqlname = sgj_xt
158
+//writemysqlname = test_xt
159
+writemysqlname = sgj_xt
160
 
160
 
161
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
161
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
162
 readuserport = 3306
162
 readuserport = 3306
163
 readuseruser = root
163
 readuseruser = root
164
 readuserpass = 1Q2W3e4r!@#$
164
 readuserpass = 1Q2W3e4r!@#$
165
-readusername = test_users
165
+readusername = sgj_users
166
 //readusername = test_users
166
 //readusername = test_users
167
 
167
 
168
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
168
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
169
 writeuserport = 3306
169
 writeuserport = 3306
170
 writeuseruser = root
170
 writeuseruser = root
171
 writeuserpass = 1Q2W3e4r!@#$
171
 writeuserpass = 1Q2W3e4r!@#$
172
-writeusername = test_users
172
+writeusername = sgj_users
173
 //writeusername = test_users
173
 //writeusername = test_users
174
 
174
 
175
 
175
 

+ 2 - 3
controllers/mobile_api_controllers/admin_user_api_controller.go Целия файл

18
 func (c *AdminUserApiController) GetAdminUserElectronicSignature() {
18
 func (c *AdminUserApiController) GetAdminUserElectronicSignature() {
19
 
19
 
20
 	adminUserInfo := c.GetMobileAdminUserInfo()
20
 	adminUserInfo := c.GetMobileAdminUserInfo()
21
-
22
-	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)
23
-
21
+	orgId, _ := service.GetCreatByOrgId(adminUserInfo.Org.Id)
22
+	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, orgId.Creator)
24
 	if es != nil {
23
 	if es != nil {
25
 		c.ServeSuccessJSON(map[string]interface{}{
24
 		c.ServeSuccessJSON(map[string]interface{}{
26
 			"state":                1,
25
 			"state":                1,

+ 18 - 5
controllers/new_mobile_api_controllers/new_dialysis_api_controller.go Целия файл

1701
 	fmt.Println("id", id)
1701
 	fmt.Println("id", id)
1702
 	message := this.GetString("message")
1702
 	message := this.GetString("message")
1703
 	fmt.Println("message", message)
1703
 	fmt.Println("message", message)
1704
+	orgid, _ := this.GetInt64("orgid")
1704
 	role := models.SgjUserAdminRole{
1705
 	role := models.SgjUserAdminRole{
1705
 		Message: message,
1706
 		Message: message,
1707
+		OrgId:   orgid,
1706
 	}
1708
 	}
1707
 	err := service.SaveMessage(id, &role)
1709
 	err := service.SaveMessage(id, &role)
1708
 	if err != nil {
1710
 	if err != nil {
1719
 	fmt.Println("sex", sex)
1721
 	fmt.Println("sex", sex)
1720
 	id, _ := this.GetInt64("id")
1722
 	id, _ := this.GetInt64("id")
1721
 	fmt.Println("id", id)
1723
 	fmt.Println("id", id)
1724
+	orgid, _ := this.GetInt64("orgid")
1722
 	role := models.SgjUserAdminRole{
1725
 	role := models.SgjUserAdminRole{
1723
-		Sex: sex,
1726
+		Sex:   sex,
1727
+		OrgId: orgid,
1724
 	}
1728
 	}
1725
 	err := service.SaveSex(id, &role)
1729
 	err := service.SaveSex(id, &role)
1726
 	if err != nil {
1730
 	if err != nil {
1743
 	timeLayout := "2006-01-02 15:04:05"
1747
 	timeLayout := "2006-01-02 15:04:05"
1744
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, birthday+" 00:00:00")
1748
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, birthday+" 00:00:00")
1745
 	birth := theTime.Unix()
1749
 	birth := theTime.Unix()
1750
+	orgid := dataBody["orgid"].(string)
1751
+	orgids, err := strconv.ParseInt(orgid, 10, 64)
1746
 	role := models.SgjUserAdminRole{
1752
 	role := models.SgjUserAdminRole{
1747
 		Birthday: birth,
1753
 		Birthday: birth,
1754
+		OrgId:    orgids,
1748
 	}
1755
 	}
1749
 	err = service.SaveBirthday(ids, &role)
1756
 	err = service.SaveBirthday(ids, &role)
1750
 	if err != nil {
1757
 	if err != nil {
2207
 
2214
 
2208
 func (this *NewDialysisApiController) GetMyInforName() {
2215
 func (this *NewDialysisApiController) GetMyInforName() {
2209
 	id, _ := this.GetInt64("id")
2216
 	id, _ := this.GetInt64("id")
2210
-	Username, err := service.GetAdminName(id)
2217
+	orgid, _ := this.GetInt64("orgid")
2218
+	Username, err := service.GetAdminName(id, orgid)
2211
 	if err != nil {
2219
 	if err != nil {
2212
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
2220
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
2213
 		return
2221
 		return
2219
 
2227
 
2220
 func (this *NewDialysisApiController) GetMyInformationFour() {
2228
 func (this *NewDialysisApiController) GetMyInformationFour() {
2221
 	adminUserInfo := this.GetMobileAdminUserInfo()
2229
 	adminUserInfo := this.GetMobileAdminUserInfo()
2222
-	creatId := adminUserInfo.AdminUser.Id
2223
-	fmt.Println("创建者ID", creatId)
2230
+	//creatId := adminUserInfo.AdminUser.Id
2231
+	//fmt.Println("创建者ID", creatId)
2224
 	orgid := adminUserInfo.Org.Id
2232
 	orgid := adminUserInfo.Org.Id
2233
+	//跟剧机构ID获取创建者ID
2225
 	fmt.Println("orgid", orgid)
2234
 	fmt.Println("orgid", orgid)
2226
-	Username, err := service.GetMyOrgInformationFour(creatId, orgid)
2235
+	OrgId, _ := service.GetCreatByOrgId(orgid)
2236
+	fmt.Println("创建者ID", OrgId.Creator)
2237
+
2238
+	fmt.Println("当前机构ID信息---------------------", orgid)
2239
+	Username, err := service.GetMyOrgInformationFour(OrgId.Creator, orgid)
2227
 	if err != nil {
2240
 	if err != nil {
2228
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
2241
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
2229
 		return
2242
 		return

+ 8 - 2
service/patientmanage_service.go Целия файл

1250
 	return role, err
1250
 	return role, err
1251
 }
1251
 }
1252
 
1252
 
1253
-func GetAdminName(id int64) (models.AdminUsers, error) {
1253
+func GetAdminName(id int64, orgid int64) (models.AdminUsers, error) {
1254
 	user := models.AdminUsers{}
1254
 	user := models.AdminUsers{}
1255
 	//err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
1255
 	//err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
1256
 	//return user, err
1256
 	//return user, err
1257
 	db := UserReadDB().Table("sgj_user_admin as x").Where("x.status = 1")
1257
 	db := UserReadDB().Table("sgj_user_admin as x").Where("x.status = 1")
1258
 	table := UserReadDB().Table("sgj_user_admin_role as r")
1258
 	table := UserReadDB().Table("sgj_user_admin_role as r")
1259
 	fmt.Println("table", table)
1259
 	fmt.Println("table", table)
1260
-	err := db.Group("x.id").Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id").Scan(&user).Error
1260
+	err := db.Group("x.id").Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id and r.org_id = ?", orgid).Scan(&user).Error
1261
 	return user, err
1261
 	return user, err
1262
 }
1262
 }
1263
 
1263
 
1264
+func GetCreatByOrgId(orgid int64) (models.SgjUserOrg, error) {
1265
+	org := models.SgjUserOrg{}
1266
+	err := UserReadDB().Model(&org).Where("id=? and status = 1", orgid).Find(&org).Error
1267
+	return org, err
1268
+}
1269
+
1264
 func GetMyOrgInformationFour(creator int64, orgid int64) (models.SgjUserAdminRole, error) {
1270
 func GetMyOrgInformationFour(creator int64, orgid int64) (models.SgjUserAdminRole, error) {
1265
 	role := models.SgjUserAdminRole{}
1271
 	role := models.SgjUserAdminRole{}
1266
 	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and status = 1", creator, orgid).Find(&role).Error
1272
 	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and status = 1", creator, orgid).Find(&role).Error