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

controllers/dialysis_api_controller.go

@@ -3208,6 +3208,11 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
+			if template.TemplateId == 43 { //adminInfo.CurrentOrgId == 9538
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			// 只针对方济医院
 			if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
@@ -3227,7 +3232,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 {
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 

controllers/dialysis_record_api_controller.go

@@ -570,6 +570,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 // @param nurse:int 上机护士
 // @param bed:int 上机床位号
 func (this *DialysisRecordAPIController) StartDialysis() {
+
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("date")
 	nurseID, _ := this.GetInt64("nurse")
@@ -583,6 +584,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
 	bedID, _ := this.GetInt64("bed")
+
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -737,7 +739,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-
+	fmt.Println("hhaaaaaaa888888888323232323232333232322333323232", adminUserInfo.CurrentOrgId)
 	dialysisRecord = &models.DialysisOrder{
 		DialysisDate:           recordDate.Unix(),
 		UserOrgId:              adminUserInfo.CurrentOrgId,
@@ -803,13 +805,22 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				}
 
 				//针对监利大垸医院
-				if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 9671 {
+				if adminUserInfo.CurrentOrgId == 10101 {
 
 					if evaluation.ID > 0 {
 						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 						fmt.Println("ultrafiltration_rate", ultrafiltration_rate)
 					}
 				}
+				fmt.Println("hhh233223323223232332233233223323223323232322332322323", adminUserInfo.CurrentOrgId)
+				//针对肇庆三鹤血液透析中心
+				if adminUserInfo.CurrentOrgId == 10215 || template.TemplateId == 43 {
+
+					if evaluation.ID > 0 {
+						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+						fmt.Println("hhhh2323323223322323323232", ultrafiltration_rate)
+					}
+				}
 			}
 		}
 		record := models.MonitoringRecord{

controllers/drug_stock_api_contorller.go

@@ -2981,6 +2981,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoPrint() {
 
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
+	fmt.Println("开始实际23323233322323", start_time)
 	order_type, _ := c.GetInt64("order_type")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -3049,8 +3050,8 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	if order_type == 2 {
-		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
-		//list, err := service.GetDrugOutOrderPrintList(startTime, endTime, orgId)
+		//list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
+		list, err := service.GetDrugOutOrderPrintList(startTime, endTime, orgId)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"list": list,

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -335,7 +335,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1493,7 +1493,7 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 
 	}
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 9671 {
 		evaluation, _ := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -1916,6 +1916,12 @@ func (this *DialysisAPIController) StartDialysis() {
 			//针对监利大垸医院
 			if template.TemplateId == 41 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin) * 1000)
+			}
+
+			//针对肇庆三鹤血液透析中心
+
+			if template.TemplateId == 43 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 				fmt.Println("hhhh232332322323232332", ultrafiltration_rate)
 			}
 
@@ -2476,10 +2482,12 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			}
 
 			if template.TemplateId == 41 {
-				fmt.Println("hhhhhhhhhh", prescription.TargetUltrafiltration)
-				fmt.Println("jj2332323322323", float64(totalMin))
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin) * 1000)
-				fmt.Println("ultrafiltration_rate000304293929329238328328328328238328328", ultrafiltration_rate)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
+			if template.TemplateId == 43 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 		}
@@ -2495,7 +2503,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume

controllers/mobile_api_controllers/patient_api_controller.go

@@ -972,12 +972,14 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 				}
 			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":    "ok",
-				"advice": advices,
-				"ids":    ids,
-			})
+			for _, item := range advices {
+				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+					"ids":    ids,
+				})
+			}
 
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/self_drug_api_congtroller.go

@@ -2016,18 +2016,25 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 	var minNumber int64
 	for _, item := range list {
 
-		//查询库存信息
+		//查询药品信息
 		drug, _ := service.GetDrugDetailByDrugId(item.DrugId)
 
 		//查询库存
-		info, _ := service.GetDrugWareInfoById(item.WarehouseInfoId)
+		info, _ := service.GetDrugWareInfoByIdTwo(item.WarehouseInfoId)
+		var max_count int64
+		var min_count int64
+		for _, it := range info {
+			max_count += it.StockMaxNumber
+			min_count += it.StockMinNumber
+		}
 
 		//获取最晚的库存数量
 		lastInfo, _ := service.GetLastDrugWarehouseInfo(item.DrugId)
 		firstInfo, _ := service.GetFirstDrugWarehouseInfo(item.DrugId)
-		stock_total = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+		stock_total = max_count*drug.MinNumber + min_count
 		proof_count = item.Count*drug.MinNumber + item.MinCount
-
+		fmt.Println("stock_total", stock_total)
+		fmt.Println("proof_count", proof_count)
 		//判断 如果库存数量 大于盘点库存，则出库
 		if stock_total > proof_count {
 			minNumber = (stock_total - proof_count) % drug.MinNumber
@@ -2057,11 +2064,12 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 				WarehouseOutTime:        ctime,
 				Type:                    1,
 			}
-
+			service.AddSigleDrugWarehouseOut(&warehouseOut)
+			warehouse, _ := service.GetLastDrugWarehouseOut(adminUserInfo.CurrentOrgId)
 			warehouseOutInfo := models.DrugWarehouseOutInfo{
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseOut.ID,
-				DrugId:                  firstInfo.DrugId,
+				WarehouseOutId:          warehouse.ID,
+				DrugId:                  item.DrugId,
 				Count:                   maxNumber,
 				Price:                   firstInfo.Price,
 				TotalPrice:              firstInfo.TotalPrice,
@@ -2086,7 +2094,7 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 			drugflow := models.DrugFlow{
 				WarehouseOutId:          warehouseOut.ID,
 				WarehouseOutOrderNumber: warehousing_out_order,
-				DrugId:                  firstInfo.DrugId,
+				DrugId:                  item.DrugId,
 				Number:                  firstInfo.Number,
 				ProductDate:             firstInfo.ProductDate,
 				ExpireDate:              firstInfo.ExpiryDate,
@@ -2104,18 +2112,43 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 				Creator:                 adminUserInfo.AdminUser.Id,
 				IsSys:                   0,
 			}
-
-			service.AddSigleDrugWarehouseOut(&warehouseOut)
 			service.CreateDrugWarehouseOutInfo(warehouseOutInfo)
 			service.CreateDrugFlowOne(drugflow)
 
+			//扣减当前批次号的库存
+			var total_count int64
+
+			//查询当前批次库存的数量
+			warehosueInfoList, _ := service.GetCurrentWarehosueInfo(item.WarehouseInfoId)
+			fmt.Println(warehosueInfoList)
+			for _, item := range warehosueInfoList {
+				total_count += item.StockMaxNumber*drug.MinNumber + item.StockMinNumber
+			}
+			//判断当前批次库存 和 需要出库的数据
+			//出库
+			if proof_count <= total_count {
+
+				//var total_count_one int64
+				//获取当前批次号的库存
+				//warehouseinfoOne, _ := service.GetCurrentWarehosueInfoOne(item.WarehouseInfoId)
+				//total_count_one = warehouseinfoOne.StockMaxNumber * drug.MinNumber + warehouseinfoOne.StockMinNumber
+
+			}
+			//报错提示
+			if proof_count > total_count {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg": "1",
+				})
+			}
 		}
 
 		//判断 如果库存数量 小于于盘点库存，则入库
+		fmt.Println("stock_total2332322323223", stock_total, proof_count)
 		if stock_total < proof_count {
 
 			maxNumber = (proof_count - stock_total) / drug.MinNumber
 			minNumber = (proof_count - stock_total) % drug.MinNumber
+			fmt.Println("min_number23233232323223322323", minNumber)
 			ctime := time.Now().Unix()
 
 			timeStr := time.Now().Format("2006-01-02")
@@ -2137,36 +2170,38 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 				WarehousingTime:  ctime,
 				Type:             1,
 			}
-
+			service.AddSigleDrugWarehouse(&warehousing)
+			warehouse, _ := service.GetLastDrugWarehouse(adminUserInfo.CurrentOrgId)
 			warehouseInfo := models.DrugWarehouseInfo{
-				WarehousingOrder: warehousing.WarehousingOrder,
-				WarehousingId:    warehousing.ID,
-				DrugId:           lastInfo.DrugId,
-				Number:           lastInfo.Number,
-				ProductDate:      lastInfo.ProductDate,
-				ExpiryDate:       lastInfo.ExpiryDate,
-				WarehousingCount: lastInfo.WarehousingCount,
-				Price:            lastInfo.Price,
-				TotalPrice:       lastInfo.TotalPrice,
-				Status:           1,
-				Ctime:            ctime,
-				Remark:           item.Remark,
-				OrgId:            adminUserInfo.CurrentOrgId,
-				Type:             1,
-				Manufacturer:     lastInfo.Manufacturer,
-				Dealer:           lastInfo.Dealer,
-				StockMaxNumber:   maxNumber,
-				StockMinNumber:   minNumber,
-				RetailTotalPrice: lastInfo.RetailTotalPrice,
-				BatchNumber:      lastInfo.BatchNumber,
-				MaxUnit:          drug.MaxUnit,
-				MinUnit:          drug.MinUnit,
+				WarehousingOrder:  warehousing.WarehousingOrder,
+				WarehousingId:     warehouse.ID,
+				DrugId:            item.DrugId,
+				Number:            lastInfo.Number,
+				ProductDate:       lastInfo.ProductDate,
+				ExpiryDate:        lastInfo.ExpiryDate,
+				WarehousingCount:  maxNumber,
+				Price:             lastInfo.Price,
+				TotalPrice:        lastInfo.TotalPrice,
+				Status:            1,
+				Ctime:             ctime,
+				Remark:            item.Remark,
+				OrgId:             adminUserInfo.CurrentOrgId,
+				Type:              1,
+				Manufacturer:      lastInfo.Manufacturer,
+				Dealer:            lastInfo.Dealer,
+				StockMaxNumber:    maxNumber,
+				StockMinNumber:    minNumber,
+				RetailTotalPrice:  lastInfo.RetailTotalPrice,
+				BatchNumber:       lastInfo.BatchNumber,
+				MaxUnit:           drug.MaxUnit,
+				MinUnit:           drug.MinUnit,
+				WarehousingInfoId: item.WarehouseInfoId,
 			}
 
 			drugflow := models.DrugFlow{
 				WarehousingOrder: warehousing.WarehousingOrder,
-				WarehousingId:    warehousing.ID,
-				DrugId:           lastInfo.DrugId,
+				WarehousingId:    warehouse.ID,
+				DrugId:           item.DrugId,
 				Number:           lastInfo.Number,
 				ProductDate:      lastInfo.ProductDate,
 				ExpireDate:       lastInfo.ExpiryDate,
@@ -2185,9 +2220,10 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 				Creator:          adminUserInfo.AdminUser.Id,
 				IsSys:            0,
 			}
-			service.AddSigleDrugWarehouse(&warehousing)
+
 			service.CreateDrugWarehouseInfo(warehouseInfo)
 			service.CreateDrugFlowOne(drugflow)
+
 		}
 	}
 	returnData := make(map[string]interface{}, 0)

controllers/stock_in_api_controller.go

@@ -1173,6 +1173,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 				expiry_date := items["expiry_date"].(string)
 
+				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				var expiryDate int64
@@ -1216,6 +1217,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					ProductDate:             productDate,
 					Dealer:                  dealer,
 					LicenseNumber:           license_number,
+					WarehouseInfotId:        warehouse_info_id,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1240,9 +1242,13 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 	//出库逻辑
 	for _, item := range warehousingOutInfo {
 		//查询库存
-		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
-		fmt.Println("库存数量组吗", warehouse.Count)
-		if item.Count > warehouse.Count {
+		//warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
+		//查询该批次的库存
+
+		warehouseOne, _ := service.FindWarehousingInfoByIdSeven(item.WarehouseInfotId)
+		fmt.Println("数据232323232323232323323232", warehouseOne)
+		fmt.Println("库存查询23322332233232233232322323232323", warehouseOne.StockCount)
+		if item.Count > warehouseOne.StockCount {
 			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":                "1",
@@ -1250,6 +1256,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				"specification_name": goodObj.SpecificationName,
 			})
 			return
+
 		} else {
 
 			_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)

main.go

@@ -16,6 +16,8 @@ func main() {
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()
+	//service.BeginAutoCreateDrugJob()
+	service.BeginAutoCreateStockJob()
 	beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 60
 	beego.Run()
 }

models/drug_stock.go

@@ -51,32 +51,33 @@ type DrugWarehouseInfoSix struct {
 }
 
 type DrugWarehouseInfo struct {
-	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number           string  `gorm:"column:number" json:"number" form:"number"`
-	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
-	Price            float64 `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice       float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Remark           string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status           int64   `gorm:"column:status" json:"status" form:"status"`
-	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	IsReturn         int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
-	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	ID                int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId     int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId            int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number            string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount  int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price             float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice        float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer            int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId             int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn          int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type              int64   `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice  float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber       string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit           string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit           string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber    int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber    int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	WarehousingInfoId int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 }
 
 func (DrugWarehouseInfo) TableName() string {

models/self_drug_models.go

@@ -381,32 +381,33 @@ func (XtDrugAutomaticReduceDetail) TableName() string {
 }
 
 type XtDrugWarehouseInfo struct {
-	ID               int64      `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId    int64      `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId           int64      `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number           string     `gorm:"column:number" json:"number" form:"number"`
-	ProductDate      int64      `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate       int64      `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	WarehousingCount int64      `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
-	Price            float64    `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice       float64    `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	Dealer           int64      `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Remark           string     `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime            int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime            int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status           int64      `gorm:"column:status" json:"status" form:"status"`
-	OrgId            int64      `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	IsReturn         int64      `gorm:"column:is_return" json:"is_return" form:"is_return"`
-	WarehousingOrder string     `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	Type             int64      `gorm:"column:type" json:"type" form:"type"`
-	RetailPrice      float64    `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice float64    `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	StockMaxNumber   int64      `gorm:"column:stock_max_number" json:"stock_max_number"`
-	StockMinNumber   int64      `gorm:"column:stock_min_number" json:"stock_min_number"`
-	BatchNumber      string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MaxUnit          string     `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	XtBaseDrug       XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	ID                int64      `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId     int64      `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId            int64      `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number            string     `gorm:"column:number" json:"number" form:"number"`
+	ProductDate       int64      `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64      `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount  int64      `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price             float64    `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice        float64    `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer            int64      `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      int64      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark            string     `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime             int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64      `gorm:"column:status" json:"status" form:"status"`
+	OrgId             int64      `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn          int64      `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder  string     `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type              int64      `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice       float64    `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice  float64    `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	StockMaxNumber    int64      `gorm:"column:stock_max_number" json:"stock_max_number"`
+	StockMinNumber    int64      `gorm:"column:stock_min_number" json:"stock_min_number"`
+	BatchNumber       string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit           string     `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	WarehousingInfoId int64      `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	XtBaseDrug        XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 }
 
 func (XtDrugWarehouseInfo) TableName() string {

service/auto_create_stock.go

@@ -44,17 +44,36 @@ func AutoCreateStockJob() {
 
 		information, _ := FindAlLGoodInformation(item.UserOrgId)
 		for _, ite := range information {
-			countList, _ := FindAllGoodInformationTotalCount(ite.ID)
-			for _, it := range countList {
-				if ite.ID == it.GoodId {
-					formatInt := strconv.FormatInt(it.StockCount, 10)
-					total, _ := strconv.ParseFloat(formatInt, 64)
-					info := models.GoodInfo{
-						Total: total,
-					}
-					UpdateStockTotal(it.GoodId, info)
-				}
+			//countList, _ := FindAllGoodInformationTotalCount(ite.ID)
+			//查询入库数量
+			warehouseInfo, _ := FindAllGoodWarehouseInfoCount(ite.ID)
+
+			//查询自动出库数量
+			autoWarehouseOut, _ := FindAutoGoodWarehouseInfoCount(ite.ID)
+
+			//查询手动出库
+			warehouseOut, _ := FindGoodWarehouseOutCount(ite.ID)
+
+			var total int64
+
+			total = warehouseInfo.WarehousingCount - autoWarehouseOut.Count - warehouseOut.Count
+			formatInt := strconv.FormatInt(total, 10)
+			totalfloat, _ := strconv.ParseFloat(formatInt, 64)
+			info := models.GoodInfo{
+				Total: totalfloat,
 			}
+			UpdateStockTotal(ite.ID, info)
+
+			//for _, it := range countList {
+			//	if ite.ID == it.GoodId {
+			//		formatInt := strconv.FormatInt(it.StockCount, 10)
+			//		total, _ := strconv.ParseFloat(formatInt, 64)
+			//		info := models.GoodInfo{
+			//			Total: total,
+			//		}
+			//		UpdateStockTotal(it.GoodId, info)
+			//	}
+			//}
 		}
 
 	}
@@ -85,3 +104,36 @@ func UpdateStockTotal(id int64, lib models.GoodInfo) error {
 	err := XTWriteDB().Model(&lib).Where("id=? and status = 1", id).Updates(map[string]interface{}{"total": lib.Total}).Error
 	return err
 }
+
+func FindAllGoodWarehouseInfoCount(good_id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	if good_id > 0 {
+		db = db.Where("x.good_id = ? and x.warehousing_count <> 0", good_id)
+	}
+	err = db.Select("x.good_id,sum(x.warehousing_count) as warehousing_count").Find(&info).Error
+	return info, err
+}
+
+func FindAutoGoodWarehouseInfoCount(good_id int64) (models.AutomaticReduceDetail, error) {
+
+	detail := models.AutomaticReduceDetail{}
+	db := XTReadDB().Table("xt_automatic_reduce_detail as x").Where("x.status = 1")
+	if good_id > 0 {
+		db = db.Where("x.good_id = ? and x.count<> 0", good_id)
+	}
+	err := db.Select("x.good_id,sum(x.count) as count").Find(&detail).Error
+	return detail, err
+}
+
+func FindGoodWarehouseOutCount(good_id int64) (models.WarehouseOutInfo, error) {
+
+	out := models.WarehouseOutInfo{}
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
+	if good_id > 0 {
+		db = db.Where("x.good_id = ? and x.is_sys = 0 and x.count<> 0", good_id)
+	}
+	err := db.Select("x.good_id,sum(x.count) as count").Find(&out).Error
+	return out, err
+}

service/auto_create_week_disinfection.go

@@ -94,7 +94,7 @@ func AutoCreateWeekDisinfectionJob() {
 				fmt.Println("错误是什么", errplan)
 				if errplan == gorm.ErrRecordNotFound {
 					fmt.Println("该设备无消毒计划")
-					return
+					continue
 				} else if errplan == nil {
 					//fmt.Println("消毒时长", plan.DisinfecTime)
 					//fmt.Println("基表消毒方式", plan.Way)

service/auto_create_week_plan.go

@@ -89,7 +89,7 @@ func AutoCreateWeekPlanJob() {
 				fmt.Println("错误", errplan)
 				if errplan == gorm.ErrRecordNotFound {
 					fmt.Println("该设备无消毒计划")
-					return
+					continue
 				} else if errplan == nil {
 					//查询该病人是否有记录，无记录的则添加
 					information, errcode := GetInfor(it.PatientId, timenow, it.UserOrgId, it.SchedualType)

service/drug_stock_service.go

@@ -196,17 +196,17 @@ func GetDrugCancelExportList(orderid []string, orgid int64) (info []*models.Drug
 
 func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64) (info []*models.XtDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info").Where("status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 	if startime > 0 {
-		db = db.Where("ctime >=?", startime)
+		db = db.Where("x.ctime >=?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("ctime<=?", endtime)
+		db = db.Where("x.ctime<=?", endtime)
 	}
 	if orgid > 0 {
-		db = db.Where("org_id = ?", orgid)
+		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("drug_id").Find(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number").Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("x.drug_id").Find(&info).Error
 
 	//err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number").Group("x.drug_id").Find(&DrugWarehouseInfo{}).Error
 	return info, err

service/his_service.go

@@ -387,7 +387,7 @@ func SaveHisPatientCaseHistory(caseHistory *models.HisPatientCaseHistory) error
 
 func UpdatePatientCaseHistory(id int64, his *models.HisPatientCaseHistory) error {
 
-	err := XTWriteDB().Model(&his).Where("id = ? and status  =1", id).Updates(map[string]interface{}{"temperature": his.Temperature, "blood_sugar": his.BloodSugar, "pulse": his.BloodSugar, "allergic_history": his.AllergicHistory, "diagnose": his.AllergicHistory, "sick": his.Sick, "remark": his.Remark, "doctor_advice": his.DoctorAdvice, "breathing": his.Breathing, "delivery_way": his.DeliveryWay, "diagnostic": his.Diagnostic, "family_history": his.FamilyHistory, "personal_history": his.PersonalHistory, "chief_conplaint": his.ChiefConplaint, "doctor": his.Doctor, "past_history": his.PastHistory, "history_of_present_illness": his.HistoryOfPresentIllness, "is_infect": his.IsInfect, "sick_date": his.SickDate, "symptom": his.Symptom, "sick_type": his.SickType, "blood_fat": his.BloodFat}).Error
+	err := XTWriteDB().Model(&his).Where("id = ? and status  =1", id).Updates(map[string]interface{}{"temperature": his.Temperature, "blood_sugar": his.BloodSugar, "pulse": his.Pulse, "allergic_history": his.AllergicHistory, "diagnose": his.AllergicHistory, "sick": his.Sick, "remark": his.Remark, "doctor_advice": his.DoctorAdvice, "breathing": his.Breathing, "delivery_way": his.DeliveryWay, "diagnostic": his.Diagnostic, "family_history": his.FamilyHistory, "personal_history": his.PersonalHistory, "chief_conplaint": his.ChiefConplaint, "doctor": his.Doctor, "past_history": his.PastHistory, "history_of_present_illness": his.HistoryOfPresentIllness, "is_infect": his.IsInfect, "sick_date": his.SickDate, "symptom": his.Symptom, "sick_type": his.SickType, "blood_fat": his.BloodFat, "sbp": his.Sbp, "dbp": his.Dbp}).Error
 	return err
 }
 

service/manage_service.go

@@ -730,7 +730,7 @@ func UpdatedZoneID(bedid int64, orgid int64, number *models.DeviceNumber) error
 
 func UpadateForm(id int64, orgid int64, infor *models.DeviceInformation) error {
 
-	err := UserWriteDB().Model(&infor).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"date": infor.Date, "class": infor.Class, "zone": infor.Zone, "bed_number": infor.BedNumber, "contagion": infor.Contagion, "dialysis_mode": infor.DialysisMode, "start_time": infor.StartTime, "end_time": infor.EndTime, "dialysis_hour": infor.DialysisHour, "hyperfiltratio": infor.Hyperfiltratio, "weight_loss": infor.WeightLoss, "warning_value": infor.WarningValue, "user_total": infor.UserTotal, "move": infor.Move, "failure_stage": infor.FailureStage, "fault_description": infor.FaultDescription, "code_information": infor.CodeInformation, "disinfect_type": infor.DisinfectType, "disinfectant_type": infor.DisinfectType, "disinfection": infor.Disinfection, "machine_run": infor.MachineRun, "fluid_path": infor.FluidPath, "disinfectant": infor.Disinfectant, "disinfection_status": infor.DisinfectionStatus, "disinfection_residue": infor.DisinfectionResidue, "long_time": infor.LongTime, "disinfec_startime": infor.DisinfecStartime, "disinfec_endtime": infor.DisinfecEndtime, "dialysis_checked": infor.DialysisChecked, "dialysis_name": infor.DialysisName, "norms": infor.Norms, "dialysis_concentration": infor.DialysisConcentration,
+	err := UserWriteDB().Model(&infor).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"date": infor.Date, "class": infor.Class, "zone": infor.Zone, "bed_number": infor.BedNumber, "contagion": infor.Contagion, "dialysis_mode": infor.DialysisMode, "start_time": infor.StartTime, "end_time": infor.EndTime, "dialysis_hour": infor.DialysisHour, "hyperfiltratio": infor.Hyperfiltratio, "weight_loss": infor.WeightLoss, "warning_value": infor.WarningValue, "user_total": infor.UserTotal, "move": infor.Move, "failure_stage": infor.FailureStage, "fault_description": infor.FaultDescription, "code_information": infor.CodeInformation, "disinfect_type": infor.DisinfectType, "disinfectant_type": infor.DisinfectantType, "disinfection": infor.Disinfection, "machine_run": infor.MachineRun, "fluid_path": infor.FluidPath, "disinfectant": infor.Disinfectant, "disinfection_status": infor.DisinfectionStatus, "disinfection_residue": infor.DisinfectionResidue, "long_time": infor.LongTime, "disinfec_startime": infor.DisinfecStartime, "disinfec_endtime": infor.DisinfecEndtime, "dialysis_checked": infor.DialysisChecked, "dialysis_name": infor.DialysisName, "norms": infor.Norms, "dialysis_concentration": infor.DialysisConcentration,
 		"germ_checked": infor.GermChecked, "germ_name": infor.GermName, "germ_number": infor.GermNumber, "clean": infor.Clean, "sign_name": infor.SignName, "bed": infor.Bed, "patient_id": infor.PatientId, "mtime": time.Now().Unix()}).Error
 	return err
 }

service/patientmanage_service.go

@@ -1626,8 +1626,8 @@ func GetInspectionMajorItem(startime int64, lasttime int64, orgid int64, patient
 
 	db := XTReadDB().Table("xt_inspection")
 
-	err = db.Raw("select * from xt_inspection where id in(select max(id) from xt_inspection where org_id = ? and status = 1 and patient_id = ? and inspect_date>=? and inspect_date<=? group by project_id)", orgid, patientid, lasttime, startime).Scan(&inspection).Error
-
+	//err = db.Raw("select * from xt_inspection where id in(select max(id) from xt_inspection where org_id = ? and status = 1 and patient_id = ? and inspect_date>=? and inspect_date<=? group by project_id)", orgid, patientid, lasttime, startime).Scan(&inspection).Error
+	err = db.Raw("select * from xt_inspection  where org_id = ? and status = 1 and patient_id = ? and inspect_date>=? and inspect_date<=? group by project_id", orgid, patientid, lasttime, startime).Scan(&inspection).Error
 	return inspection, err
 }
 

service/self_drug_service.go

@@ -980,7 +980,7 @@ func GetDrugInventoryList(keyword string, page int64, limit int64, orgid int64,
 	if endtime > 0 {
 		db = db.Where("x.start_time<=?", endtime)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.min_count,x.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.min_count,x.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 
@@ -1009,6 +1009,26 @@ func GetDrugWareInfoById(id int64) (models.XtDrugWarehouseInfo, error) {
 	return info, err
 }
 
+func GetDrugWareInfoByIdTwo(id int64) (info []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("(id = ? or warehousing_info_id = ?) and status = 1", id, id).Find(&info).Error
+	return info, err
+}
+
+func GetLastDrugWarehouse(orgid int64) (models.DrugWarehouse, error) {
+
+	info := models.DrugWarehouse{}
+	err := XTReadDB().Model(&info).Where("org_id=? and status = 1", orgid).Last(&info).Error
+	return info, err
+}
+
+func GetLastDrugWarehouseOut(orgid int64) (models.DrugWarehouseOut, error) {
+
+	info := models.DrugWarehouseOut{}
+	err := XTReadDB().Model(&info).Where("org_id=? and status = 1", orgid).Last(&info).Error
+	return info, err
+}
+
 func GetLastDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
 
 	info := models.XtDrugWarehouseInfo{}
@@ -1078,11 +1098,10 @@ func UpdateDrugWarehouseInfoById(id int64, inventory *models.XtDrugWarehouseInfo
 	return err
 }
 
-func GetDrugWarehouseInfoTotal(id int64) (models.XtDrugWarehouseInfo, error) {
+func GetDrugWarehouseInfoTotal(id int64) (list []*models.XtDrugWarehouseInfo, err error) {
 
-	info := models.XtDrugWarehouseInfo{}
-	err := XTReadDB().Where("id = ? and status = 1", id).Preload("XtBaseDrug", "status = 1").Find(&info).Error
-	return info, err
+	err = XTReadDB().Where("id = ? or warehousing_info_id = ? and status = 1", id, id).Preload("XtBaseDrug", "status = 1").Find(&list).Error
+	return list, err
 }
 
 func CreateDrugWarehouseInfo(info models.DrugWarehouseInfo) error {

service/stock_service.go

@@ -623,6 +623,12 @@ func FindFirstWarehousingInfoByStockTwo(good_id int64, good_type_id int64) (info
 	return info, err
 }
 
+func FindWarehousingInfoByIdSeven(id int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Model(&info).Where("id= ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
 //药品先进先出,找出最先入库的批次
 
 func FindLastDrugWarehousingInfoByID(drug_id int64) (info models.XtDrugWarehouseInfo, err error) {
@@ -3398,18 +3404,6 @@ func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (auto
 		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count,x.record_time FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
 	}
 
-	//db := XTReadDB().Table("xt_automatic_reduce_detail as x").Where("x.status = 1")
-	//
-	//if startime > 0 {
-	//  db = db.Where("x.ctime >=?", startime)
-	//}
-	//if endtime > 0{
-	//  db = db.Where("x.ctime<=?", endtime)
-	//}
-	//if orgid > 0 {
-	//  db = db.Where("x.org_id = ?", orgid)
-	//}
-	//err = db.Group("x.good_id").Select("x.good_id,sum(x.count) as count").Scan(&autoMatic).Error
 	return autoMatic, err
 
 }
@@ -4753,3 +4747,16 @@ func GetWarehouseTotal(id int64) (models.WarehousingInfo, error) {
 	err := db.Select("sum(x.stock_count) as stock_count").Scan(&info).Error
 	return info, err
 }
+
+func GetCurrentWarehosueInfo(id int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("id=? or warehousing_info_id = ? ", id, id).Find(&info).Error
+	return info, err
+}
+
+func GetCurrentWarehosueInfoOne(id int64) (models.DrugWarehouseInfo, error) {
+
+	info := models.DrugWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("id=?", id).Find(&info).Error
+	return info, err
+}