11月8日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -191,6 +191,7 @@ func (this *DialysisAPIController) Scheduals() {
 			//获取今日所有的处方开的耗材
 			project, _ := service.GetAllHisProjectPrescription(orgID, date.Unix())
 
+			fmt.Println("orgID00000000000000000000000000000000", date.Unix())
 			//获取今日透析准备的数据
 			goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
 
@@ -204,7 +205,6 @@ func (this *DialysisAPIController) Scheduals() {
 					}
 				}
 			}
-
 			fmt.Println("goodlist888888888888888888888", goodList, err)
 			this.ServeSuccessJSON(map[string]interface{}{
 				"scheduals": scheduals,

controllers/patient_api_controller.go

@@ -4092,8 +4092,10 @@ func (c *PatientApiController) GetRemindPatientList() {
 	limit, _ := c.GetInt64("limit", 10)
 	adminUserInfo := c.GetAdminUserInfo()
 	total, patients, _ := service.GetAllWaitRemindPatient(adminUserInfo.CurrentOrgId, page, limit)
+	fmt.Println("机构ID2222222222222", c.GetAdminUserInfo().CurrentOrgId)
 
 	_, errcode := service.GetOrgFollowIsExist(c.GetAdminUserInfo().CurrentOrgId)
+	fmt.Println("机构ID2222222222222", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		information, err := service.GetAdminUserRoleInformation(0)
 		if err != nil {
@@ -4107,7 +4109,7 @@ func (c *PatientApiController) GetRemindPatientList() {
 			"information": information,
 		})
 	} else if errcode == nil {
-		information, err := service.GetAdminUserRoleInformation(0)
+		information, err := service.GetAdminUserRoleInformation(c.GetAdminUserInfo().CurrentOrgId)
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -4768,7 +4770,7 @@ func (c *PatientApiController) GetBanner() {
 			"information": information,
 		})
 	} else if errcodes == nil {
-		information, err := service.GetAdminUserRoleInformation(0)
+		information, err := service.GetAdminUserRoleInformation(orgId)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

service/dialysis_service.go

@@ -1656,6 +1656,9 @@ func GetAdminUserRoleInformation(orgid int64) (models.SgjOrgFollow, error) {
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}
+	if orgid == 0 {
+		db = db.Where("org_id = ?", 0)
+	}
 
 	err := db.Select("f.org_id,f.admin_user_id,a.name,a.phone,a.camera,a.wechat,a.qqchat,a.email,a.wechat_link").Joins("left join sgj_admin as a on a.id = f.admin_user_id").Scan(&follow).Error
 	return follow, err

service/mobile_dialysis_service.go

@@ -3599,7 +3599,7 @@ func MobileGetDialysisGoodsSeven(orgID int64, scheduleDate int64) (prepare []*mo
 		db = db.Where("p.user_org_id = ?", orgID)
 	}
 	if scheduleDate > 0 {
-		db = db.Where("p.record_date< ?", scheduleDate)
+		db = db.Where("p.record_date<= ?", scheduleDate)
 	}
 	err = db.Select("p.patient_id,p.good_id,Max(p.record_date) as record_date").Group("patient_id").Order("id desc").Find(&prepare).Error
 	return prepare, err
@@ -3607,7 +3607,7 @@ func MobileGetDialysisGoodsSeven(orgID int64, scheduleDate int64) (prepare []*mo
 
 func MobileGetDialysisGoodsSix(orgID int64, scheduleDate int64) (prepare []*models.DialysisBeforePrepare, err error) {
 
-	err = readDb.Where("user_org_id = ? AND status=1 AND record_date < ? AND count > 0", orgID, scheduleDate).Select("patient_id,good_id,record_date").Find(&prepare).Error
+	err = readDb.Where("user_org_id = ? AND status=1 AND record_date <= ? AND count > 0", orgID, scheduleDate).Select("patient_id,good_id,record_date").Find(&prepare).Error
 	return prepare, err
 }