耗材参数

controllers/drug_stock_api_contorller.go

@@ -1254,29 +1254,30 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	}
 
 	//调用出库逻辑
-	for _, item := range warehousingOutInfo {
-
-		// 出库流程
-		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
-		drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
-		if drup.ID > 0 {
-			prescribingNumber := item.Count
-
-			service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
-
-		}
+	//for _, item := range warehousingOutInfo {
+	//
+	//	// 出库流程
+	//	// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+	//	drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
+	//	if drup.ID > 0 {
+	//		prescribingNumber := item.Count
+	//
+	//		service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
+	//
+	//	}
+	//
+	//}
 
+	errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+	info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+		return
 	}
 
-	//errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-	//info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
-	//if errs != nil {
-	//	utils.ErrorLog(errs.Error())
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
-	//	return
-	//}
-
 	c.ServeSuccessJSON(map[string]interface{}{
+		"info":                  info,
 		"msg":                   "出库成功",
 		"warehousing_out_order": warehousing_out_order,
 	})

controllers/stock_in_api_controller.go

@@ -83,6 +83,8 @@ func StockManagerApiRegistRouters() {
 
 	beego.Router("/api/stock/getstocklistbyid", &StockManagerApiController{}, "Get:GetStockListById")
 	beego.Router("/api/stock/getstockoutlist", &StockManagerApiController{}, "Get:GetStockOutList")
+
+	beego.Router("/api/good/getstockdrugcount", &StockManagerApiController{}, "Get:GetStockDrugCount")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -3733,3 +3735,42 @@ func (this *StockManagerApiController) GetStockOutList() {
 		"total":   total,
 	})
 }
+
+func (this *StockManagerApiController) GetStockDrugCount() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	fmt.Println(orgId)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	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 {
+			this.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())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	count, _ := service.GetStockDrugCount(startTime, endTime, orgId)
+	outList, _ := service.GetAutoDiallysisBefor(startTime, endTime, orgId)
+	autoCount, _ := service.GetOutStockTotalCountFour(startTime, endTime, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"count":     count,
+		"outList":   outList,
+		"autoCount": autoCount,
+	})
+}

models/stock_models.go

@@ -353,3 +353,8 @@ type VmWarehouseOutInfo struct {
 	Price  float64 `gorm:"column:price" json:"price"`
 	OrgId  int64   `gorm:"column:org_id" json:"org_id"`
 }
+
+type VmWarehouseInfo struct {
+	GoodId int64 `gorm:"column:good_id" json:"good_id"`
+	Count  int64 `gorm:"column:count" json:"count"`
+}

service/gobal_config_service.go

@@ -497,11 +497,11 @@ func GetDrugWarehuseOrderInfo(orgid int64) (drug []*models.DrugWarehouseInfo, er
 }
 
 func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int64, startime int64, endtime int64, orgid int64) (list []*models.StDrugWarehouseInfo, total int64, err error) {
-
+	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 
 	likeKey := "%" + keyword + "%"
-	offset := (page - 1) * limit
+
 	if len(keyword) > 0 {
 		db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ? and  t.drug_name like ?", orgid, likeKey)
 	} else {
@@ -509,9 +509,10 @@ func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int6
 	}
 	if drugcategory > 0 {
 		db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ? and  t.drug_category = ?", orgid, drugcategory)
-	} else {
-		db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ? and  t.drug_category = ?", orgid, drugcategory)
 	}
+	//} else {
+	//	db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id")
+	//}
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -524,7 +525,7 @@ func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int6
 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Offset(offset).Count(&total).Group("x.drug_id").Order("x.ctime desc").Scan(&list).Error
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ?", orgid).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 

service/stock_service.go

@@ -2759,7 +2759,7 @@ func GetAllStockList(page int64, limit int64, startime int64, endtime int64, goo
 	if good_type > 0 {
 		db = db.Where("t.good_type_id = ?", good_type)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit,t.manufacturer").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Count(&total).Group("x.good_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit,t.manufacturer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&info).Error
 	return info, total, err
 }
 
@@ -2807,3 +2807,44 @@ func GetStockOutList(good_id int64, orgid int64, limit int64, page int64, starti
 	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id").Offset(offset).Count(&total).Scan(&info).Error
 	return info, total, err
 }
+
+func GetStockDrugCount(startime int64, endtime int64, orgid int64) (info []*models.VmWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_info 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.Select("sum(x.warehousing_count) as count,x.good_id").Group("x.good_id").Scan(&info).Error
+	return info, err
+}
+
+func GetAutoDiallysisBefor(startime int64, endtime int64, orgid int64) (info []*models.VmWarehouseInfo, err error) {
+	db := XTReadDB().Table("xt_warehouse_out_info 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.Select("sum(x.count) as count,x.good_id").Where("is_sys = 0").Group("x.good_id").Scan(&info).Error
+	return info, err
+}
+
+func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
+
+	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >=? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+
+	return autoMatic, err
+
+}