历史排班

controllers/dialysis_api_controller.go

 		Chaptalization:             chaptalization,
 	}
 
+	if prescription.Anticoagulant == 0 {
+		prescription.Anticoagulant = 3
+	}
 	//查询最近透析准备表里是否存在 透析器 灌流器
 
 	//splitStr := strings.Split(dialysis_dialyszers, ",")
 		Chaptalization:             chaptalization,
 	}
 
+	if solution.Anticoagulant == 0 {
+		solution.Anticoagulant = 3
+	}
 	//针对河间咸得
 	if adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10090 || adminUserInfo.CurrentOrgId == 3877 {
 

controllers/doctor_schedule_api_controller.go

 func (this *DoctorScheduleApiController) GetScheduleListTotal() {
 
 	start_time, _ := this.GetInt64("start_time")
-	fmt.Println(start_time)
+
 	end_time, _ := this.GetInt64("end_time")
-	fmt.Println("end_time", end_time)
+
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	//统计班次

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

 	//fmt.Println("end_time",end_time)
 	start_time_one := this.GetString("start_time_one")
 	end_time_one := this.GetString("end_time_one")
-	fmt.Println("start_time_one--------", len(start_time_one))
-	fmt.Println("end_time_one-------", end_time_one)
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
 	if len(start_time_one) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
-		fmt.Println("err-----------", err)
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
 		endTime = theTime.Unix()
 	}
-	fmt.Println("starti_time233232323232", startTime)
-	fmt.Println("end_time2323223232323", endTime)
+
 	staffList, err := service.GetStaffScheduleList(orgId, startTime, endTime)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 			ErrLog:      string(byterequest),
 			Source:      "手机端删除排班",
 			Module:      5,
-			AdminUserId: this.GetAdminUserInfo().AdminUser.Id,
+			AdminUserId: this.GetMobileAdminUserInfo().AdminUser.Id,
 		}
 		service.CreateScheduleLog(xtScheduleLog)
 		redis := service.RedisClient()
 }
 
 func (this *StaffScheduleApiController) UpdateBloodScheduleMode() {
+
 	id, _ := this.GetInt64("id")
 	mode_id, _ := this.GetInt64("mode_id")
 	schedule := models.XtSchedule{
 	}
 	service.UpdatedScheduleMode(schedule, id)
 
-	orgId := this.GetAdminUserInfo().CurrentOrgId
+	orgId := this.GetMobileAdminUserInfo().Org.Id
 	//记录日志
 	byterequest, _ := json.Marshal(schedule)
 	scheduleLog := models.XtScheduleLog{
 		ErrLog:      string(byterequest),
 		Source:      "手机端修改排班模式",
 		Module:      5,
-		AdminUserId: this.GetAdminUserInfo().AdminUser.Id,
+		AdminUserId: this.GetMobileAdminUserInfo().AdminUser.Id,
 	}
 
 	service.CreateScheduleLog(scheduleLog)

controllers/patient_api_controller.go

 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+
+	start_time := c.GetString("start_time")
+
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	patient_address := c.GetString("patient_address")
+
 	adminUserInfo := c.GetAdminUserInfo()
 
 	patient, _ := service.FindPatientById(adminUserInfo.CurrentOrgId, id)
 		return
 	}
 	lapsetoType := int64(patientBody["lapseto_type"].(float64))
-	if lapsetoType <= 0 || lapsetoType > 3 {
-		utils.ErrorLog("lapsetoType <= 0 || lapsetoType > 3")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	lapseto.LapsetoType = lapsetoType
 
-	timeLayout := "2006-01-02 15:04:05"
-	loc, _ := time.LoadLocation("Local")
+	lapseto.LapsetoType = lapsetoType
 
 	if patientBody["lapseto_time"] == nil || reflect.TypeOf(patientBody["lapseto_time"]).String() != "string" {
 		utils.ErrorLog("lapseto_time")
 		return
 	}
 	lapsetoTime, _ := patientBody["lapseto_time"].(string)
-	if len(lapsetoTime) == 0 {
-		utils.ErrorLog("len(lapsetoTime) == 0")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
-		return
-	}
+	//if len(lapsetoTime) == 0 {
+	//	utils.ErrorLog("len(lapsetoTime) == 0")
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
+	//	return
+	//}
 
 	out_reason, _ := patientBody["out_reason"].(string)
 
 	//}
 
 	lapsetoTimeUnix, err := time.ParseInLocation(timeLayout, lapsetoTime, loc)
-	if err != nil {
-		utils.ErrorLog("lapsetoTimeUnix")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
-		return
-	}
+	//if err != nil {
+	//	utils.ErrorLog("lapsetoTimeUnix")
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
+	//	return
+	//}
 	lapseto.LapsetoTime = lapsetoTimeUnix.Unix()
 	lapseto.UpdatedTime = time.Now().Unix()
 	lapseto.CreatedTime = time.Now().Unix()
 	patient.Lapseto = lapseto.LapsetoType
 	patient.OutReason = out_reason
 	patient.DeathTime = lapsetoTimeUnix.Unix()
+
+	patient.PatientStartTime = startTime
+	patient.PatientEndTime = endTime
+	patient.PatientAddress = patient_address
+
 	//if patient.Lapseto == 1 {
 	//	patientTotal := service.GetLapsetoPatientCount(adminUserInfo.CurrentOrgId, 1)
 	//	subscibes := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
 		service.UpdateScheduleItemByPatientId(id)
 	}
 
+	allergic := models.XtPatientAllergic{
+		UserOrgId:      adminUserInfo.CurrentOrgId,
+		PatientId:      patient.ID,
+		StartTime:      patient.PatientStartTime,
+		EndTime:        patient.PatientEndTime,
+		PatientSource:  patient.Lapseto,
+		PatientAddress: patient.PatientAddress,
+		Remake:         patient.Remark,
+		Status:         1,
+		Ctime:          time.Now().Unix(),
+	}
+	if lapseto.LapsetoType == 2 || lapseto.LapsetoType == 3 {
+		allergic.StartTime = lapseto.LapsetoTime
+		allergic.EndTime = lapseto.LapsetoTime
+	}
+
+	service.CreateAllergic(allergic)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeEditLapsetoFail)
 		return

controllers/self_drug_api_congtroller.go

 	}
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	list, total, err := service.GetGoodPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
+	storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
 	for _, item := range list {
 
 		//获取期初结余数量
 		}
 
 		//获取期间增加
-		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range goodWarehouseInfoList {
 			item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
 		}
 
 		//获取本期增加
-		WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+		WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range WarehouseInfoFlowList {
 			item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
 		}
 		//获取本期减少
-		reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+		reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range reduceWarehouseInfoList {
 			item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
 		}
 
 		//获取期中减少退库
-		lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+		lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range lowInfo {
 			item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
 		}
 		//
-		outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+		outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
 		for _, it := range outInfo {
 			item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 		}
 		}
 
 		//期中盘盈
-		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range profit {
 			item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
 		}
 		//期中盘亏
-		losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+		losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range losses {
 			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 		}
 	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 
 	if orgId == 10265 {
+		storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
+
 		list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
 
 		for _, item := range list {
 
 			//获取期初结余
-			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
+			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
 
 			item.GoodStartFlowInfo = low
 
 			//获取期末结余
-			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
+			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime, storeConfig.StorehouseOutInfo)
 
 			item.GoodEndFlowInfo = flow
 
 			//获取期间增加
-			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range goodWarehouseInfoList {
 				item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
 			}
 
 			//获取本期增加
-			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range WarehouseInfoFlowList {
 				item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
 			}
 			//获取本期减少
-			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range reduceWarehouseInfoList {
 				item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
 			}
 
 			//获取期中减少退库
-			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range lowInfo {
 				item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
 			}
 			//
-			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
 			for _, it := range outInfo {
 				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 			}
 
 			//期中盘盈
-			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range profit {
 				item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
 			}
 			//期中盘亏
-			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range losses {
 				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 			}
 
 	if orgId != 10265 {
 		list, total, err := service.GetGoodNewPurchaseStockQueryOne(good_type, keyword, page, limit, orgId, ids, goodIds)
-
+		storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
 		for _, item := range list {
 
 			//获取期初结余
-			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
+			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
 
 			item.GoodStartFlowInfo = low
 
 			//获取期末结余
-			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
+			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime, storeConfig.StorehouseOutInfo)
 
 			item.GoodEndFlowInfo = flow
 
 			//获取期间增加
-			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
 			for _, it := range goodWarehouseInfoList {
 				item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
 			}
 
 			//获取本期增加
-			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
 			for _, it := range WarehouseInfoFlowList {
 				item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
 			}
 			//获取本期减少
-			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range reduceWarehouseInfoList {
 				item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
 			}
 
 			//获取期中减少退库
-			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range lowInfo {
 				item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
 			}
 			//
-			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
 			for _, it := range outInfo {
 				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 			}
 
 			//期中盘盈
-			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range profit {
 				item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
 			}
 			//期中盘亏
-			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range losses {
 				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 			}

models/new_stock_models.go

 	IsRead              int64              `gorm:"column:is_read" json:"is_read" form:"is_read"`
 	OverCount           int64              `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	Ctime               int64              `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	StorehouseId        int64              `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	WarehousingInfo     NewWarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingId" json:"xt_warehouse_info"`
 }
 

models/stock_models.go

 	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
 	WarehousingUnit  string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
 	PackingPrice     float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (StartWarehousingInfo) TableName() string {

service/patient_service.go

 
 func CreateAllergic(allergic models.XtPatientAllergic) error {
 
-	err := XTWriteDB().Model(&allergic).Create(&allergic).Error
+	err := XTWriteDB().Create(&allergic).Error
 
 	return err
 }
 
 func EditPatientLapseto(patient *models.Patients, lapseto *models.PatientLapseto) (err error) {
 	utx := writeDb.Begin()
-	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto": patient.Lapseto, "out_reason": patient.OutReason, "death_time": patient.DeathTime}).Error
+	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto": patient.Lapseto, "out_reason": patient.OutReason, "death_time": patient.DeathTime, "patient_start_time": patient.PatientStartTime, "patient_end_time": patient.PatientEndTime, "patient_address": patient.PatientAddress}).Error
 	//err = utx.Model(&models.PatientLapseto{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto_type": patient.Lapseto, "lapseto_time": time.Now().Unix(), "updated_time": time.Now().Unix()}).Error
 	if err != nil {
 		utx.Rollback()

service/schedule_service.go

 
 func CreateScheduleLog(log models.XtScheduleLog) error {
 
-	err := XTWriteDB().Create(log).Error
+	err := XTWriteDB().Create(&log).Error
 
 	return err
 }

service/self_drug_service.go

 	return info, err
 }
 
-func GetAddGoodWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.StartWarehousingInfo, err error) {
+func GetAddGoodWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (info []*models.StartWarehousingInfo, err error) {
 	db := XTReadDB().Model(&info).Where("status = 1 and is_check =1")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
 	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
 	err = db.Find(&info).Error
 	return info, err
 }
 
-func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.VmStockFlowTwenty, err error) {
-	db := XTReadDB().Model(&info).Where("status = 1 and consumable_type =1")
+func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (info []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&info).Where("status = 1 and (consumable_type =1 or consumable_type = 13)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
 	}
 	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id =?", storehouse_id)
+	}
 	err = db.Find(&info).Error
 	return info, err
 }
 
-func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type= 15)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
 	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
 	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
 	return outinfo, err
 }
 
-func GetStartEndCancelFLowInfo(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func GetStartEndCancelFLowInfo(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 7)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
 	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id =?", storehouse_id)
+	}
 	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
 	return outinfo, err
 }
 	return info, err
 }
 
-func FindeWarehouseOutInfo(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func FindeWarehouseOutInfo(good_id int64, orgid int64, startime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type = 15)")
 	if good_id > 0 {
 	if startime > 0 {
 		db = db.Where("ctime <?", startime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id= ?", storehouse_id)
+	}
 	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
 	return outinfo, err
 }
 	return outinfo, err
 }
 
-func FindeEndStokInventoryProfit(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func FindeEndStokInventoryProfit(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 10)")
 	if good_id > 0 {
 	if endtime < 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
 	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
 	return outinfo, err
 }
 
-func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 11)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
 	if endtime < 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
 	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
 	return outinfo, err
 }
 	return goodinfo, total, err
 }
 
-func GetStartLastFLow(goodid int64, orgid int64, startime int64) (models.VmStockFlowTwenty, error) {
+func GetStartLastFLow(goodid int64, orgid int64, startime int64, storehouse_id int64) (models.VmStockFlowTwenty, error) {
 
 	flwo := models.VmStockFlowTwenty{}
-	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime < ?", goodid, orgid, startime).Last(&flwo).Error
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime < ? and storehouse_id = ?", goodid, orgid, startime, storehouse_id).Last(&flwo).Error
 	return flwo, err
 }
 
-func GetEndLastFlow(goodid int64, orgid int64, endtime int64) (models.VmStockFlowTwenty, error) {
+func GetEndLastFlow(goodid int64, orgid int64, endtime int64, storehouse_id int64) (models.VmStockFlowTwenty, error) {
 	flwo := models.VmStockFlowTwenty{}
-	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime <= ?", goodid, orgid, endtime).Last(&flwo).Error
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime <= ? and storehouse_id= ?", goodid, orgid, endtime, storehouse_id).Last(&flwo).Error
 	return flwo, err
 }