Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/base_api_controller.go

@@ -72,9 +72,10 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 16919
-		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 10489 //4，809
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 1 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -82,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10510 //机构id 10344
+		subscibe.OrgId = 10480 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10510 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 11211 //4
+		adminUserInfo.CurrentOrgId = 10480 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14    //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -317,9 +318,10 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 16919
-		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 16919 //4，809
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 1 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -327,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10510 //机构id小英10344或4或10666
+		subscibe.OrgId = 10480 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10510 //机构id小英10344或4或10666
-		adminUserInfo.CurrentAppId = 11211 //4
+		adminUserInfo.CurrentOrgId = 10480 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14    //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_record_api_controller.go

@@ -86,7 +86,6 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 	if orgID == 9671 || orgID == 9675 || orgID == 10164 || orgID == 9679 {
 		redis.Set(key, scheduals_json_str, time.Second*60)
 	}
-	fmt.Println("len2o2o2o2o2", len(scheduals_json_str))
 
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -429,7 +429,7 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 	}
 
 	//查询排班里面的空透析器
-	if orgid == 10375 || orgid == 10510 || orgid == 9538 {
+	if orgid == 10375 || orgid == 10510 || orgid == 9538 || orgid == 10610 {
 
 		schedulesFive, _ := service.GetMobileScheduleListByScheduleDateOne(orgid, startTime)
 

controllers/stock_in_api_controller.go

@@ -8029,12 +8029,22 @@ func (this *StockManagerApiController) GetInvetoryWarehouseInfoList() {
 	storehouse_id, _ := this.GetInt64("storehouse_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, _ := service.GetInvetoryWarehouseInfoList(orgId, storehouse_id)
+	var info []*models.WarehousingInfo
+	if orgId == 10571 {
+		for _, item := range list {
+			if strings.ContainsAny(item.GoodInfo.GoodStatus, "收费") {
+				info = append(info, item)
+			}
+		}
+	}
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"manufacturerList": manufacturerList,
 		"dealerList":       dealerList,
+		"info":             info,
 	})
 }