历史排班

controllers/base_api_controller.go

@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10265 //机构id小英10344或4
+		subscibe.OrgId = 10164 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10265 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/pharmacy_controller.go

@@ -331,6 +331,10 @@ func (this *PharmacyController) GetPharmacyContent() {
 	order, _ := service.GetMobiledialysiOrder(orgid, patient_id, stime)
 	numberList, _ := service.GetAllBedNumberList(orgid)
 	zoneList, _ := service.GetAllZoneByList(orgid)
+
+	appId := this.GetAdminUserInfo().CurrentAppId
+	adminUserES, _ := service.GetAllAdminUserES(orgid, appId)
+	allDoctor, _ := service.GetAllDoctor(orgid, appId)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -343,6 +347,8 @@ func (this *PharmacyController) GetPharmacyContent() {
 	return_value["order"] = order
 	return_value["numberList"] = numberList
 	return_value["zoneList"] = zoneList
+	return_value["adminUserES"] = adminUserES
+	return_value["doctors"] = allDoctor
 
 	//if is_medicine == 1{发药时间先不展示
 	//	return_value["time"] = time