Browse Source

历史排班

28169 9 months ago
parent
commit
e7db9078d9
2 changed files with 8 additions and 2 deletions
  1. 2 2
      controllers/base_api_controller.go
  2. 6 0
      controllers/pharmacy_controller.go

+ 2 - 2
controllers/base_api_controller.go View File

327
 		userAdmin.ModifyTime = 1530786071
327
 		userAdmin.ModifyTime = 1530786071
328
 		var subscibe models.ServeSubscibe
328
 		var subscibe models.ServeSubscibe
329
 		subscibe.ID = 11
329
 		subscibe.ID = 11
330
-		subscibe.OrgId = 10265 //机构id小英10344或4
330
+		subscibe.OrgId = 10164 //机构id小英10344或4
331
 		subscibe.PeriodStart = 1538035409
331
 		subscibe.PeriodStart = 1538035409
332
 		subscibe.PeriodEnd = 1569571409
332
 		subscibe.PeriodEnd = 1569571409
333
 		subscibe.State = 1
333
 		subscibe.State = 1
337
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
337
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
338
 		subscibes[4] = &subscibe
338
 		subscibes[4] = &subscibe
339
 		var adminUserInfo service.AdminUserInfo
339
 		var adminUserInfo service.AdminUserInfo
340
-		adminUserInfo.CurrentOrgId = 10265 //机构id小英9675或4
340
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
341
 		adminUserInfo.CurrentAppId = 12123 //4
341
 		adminUserInfo.CurrentAppId = 12123 //4
342
 		adminUserInfo.AdminUser = &userAdmin
342
 		adminUserInfo.AdminUser = &userAdmin
343
 		adminUserInfo.Subscibes = subscibes
343
 		adminUserInfo.Subscibes = subscibes

+ 6 - 0
controllers/pharmacy_controller.go View File

331
 	order, _ := service.GetMobiledialysiOrder(orgid, patient_id, stime)
331
 	order, _ := service.GetMobiledialysiOrder(orgid, patient_id, stime)
332
 	numberList, _ := service.GetAllBedNumberList(orgid)
332
 	numberList, _ := service.GetAllBedNumberList(orgid)
333
 	zoneList, _ := service.GetAllZoneByList(orgid)
333
 	zoneList, _ := service.GetAllZoneByList(orgid)
334
+
335
+	appId := this.GetAdminUserInfo().CurrentAppId
336
+	adminUserES, _ := service.GetAllAdminUserES(orgid, appId)
337
+	allDoctor, _ := service.GetAllDoctor(orgid, appId)
334
 	if err != nil {
338
 	if err != nil {
335
 		utils.ErrorLog(err.Error())
339
 		utils.ErrorLog(err.Error())
336
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
340
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
343
 	return_value["order"] = order
347
 	return_value["order"] = order
344
 	return_value["numberList"] = numberList
348
 	return_value["numberList"] = numberList
345
 	return_value["zoneList"] = zoneList
349
 	return_value["zoneList"] = zoneList
350
+	return_value["adminUserES"] = adminUserES
351
+	return_value["doctors"] = allDoctor
346
 
352
 
347
 	//if is_medicine == 1{发药时间先不展示
353
 	//if is_medicine == 1{发药时间先不展示
348
 	//	return_value["time"] = time
354
 	//	return_value["time"] = time