耗材参数

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9531
-runmode = prod
+httpport = 9529
+runmode = dev
 
 #
 copyrequestbody = true

controllers/stock_in_api_controller.go

@@ -1099,7 +1099,8 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 	}
 
 	var warehousingOutInfo []*models.WarehouseOutInfo
-
+	var beforePrepares []*models.DialysisBeforePrepareGoods
+	var newBeforePrepares []*models.NewDialysisBeforePrepareGoods
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockOut"].([]interface{})
 		if len(thisStockIn) > 0 {
@@ -1156,20 +1157,40 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
+				prepareGoods := &models.DialysisBeforePrepareGoods{
+					GoodTypeId: good_type_id,
+					GoodId:     good_id,
+					Count:      count,
+				}
+
+				beforePrepares = append(beforePrepares, prepareGoods)
+
+				newPrepareGoods := &models.NewDialysisBeforePrepareGoods{
+					GoodTypeId: good_type_id,
+					GoodId:     good_id,
+					Count:      count,
+				}
+				newBeforePrepares = append(newBeforePrepares, newPrepareGoods)
 			}
 		}
 	}
-	errs := service.CreateWarehousingOutInfo(warehousingOutInfo)
-	info, _ := service.FindLastWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
-	if errs != nil {
-		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-		return
+
+	//查询库存
+	for _, item := range warehousingOutInfo {
+		parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), item, &warehouseOut, item.Count)
+		fmt.Println(parseDateErr)
 	}
 
+	//errs := service.CreateWarehousingOutInfo(warehousingOutInfo)
+	//info, _ := service.FindLastWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
+	//if errs != nil {
+	//	utils.ErrorLog(errs.Error())
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+	//	return
+	//}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":                   "出库成功",
-		"info":                  info,
 		"warehousing_out_order": warehousing_out_order,
 	})
 

models/drug.go

@@ -65,12 +65,8 @@ type BaseDrugLib struct {
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
-	DrugDay      string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
-	Total        float64 `gorm:"column:total" json:"total" form:"total"`
-	Dosage       string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
-	Unval        string  `gorm:"column:unval" json:"unval" form:"unval"`
-	PackingUnit  string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total   float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (BaseDrugLib) TableName() string {

models/stock_models.go

@@ -80,7 +80,6 @@ type WarehousingInfo struct {
 	ExpiryDate       int64       `gorm:"column:expiry_date" json:"expiry_date"`
 	WarehousingCount int64       `gorm:"column:warehousing_count" json:"warehousing_count"`
 	WarehousingUnit  string      `gorm:"column:warehousing_unit" json:"warehousing_unit"`
-	StockNumber      int64       `gorm:"column:stock_number" json:"stock_number"`
 	Price            float64     `gorm:"column:price" json:"price"`
 	TotalPrice       float64     `gorm:"column:total_price" json:"total_price"`
 	Dealer           int64       `gorm:"column:dealer" json:"dealer"`

service/stock_service.go

@@ -484,6 +484,7 @@ func FindLastWarehousingInfoByID(drug_id int64) (info models.WarehousingInfo, er
 	err = readDb.Model(&models.WarehousingInfo{}).Where("drup_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
 	return info, err
 }
+
 //
 //// 出库时先进先出，找出最先入库的批次
 //func  (drug_id int64) (info models.WarehousingInfo, err error) {
@@ -2098,12 +2099,35 @@ func GetStockInRecoredByGoodId(goodid int64, goodtypeid int64, recordtime int64,
 	return &info, nil
 }
 
+func GetStockInRecoredByGoodIdOne(goodid int64, goodtypeid int64, recordtime int64, orgid int64) (*models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+
+	err := XTReadDB().Model(&info).Where("good_id = ? and good_type_id = ? and sys_record_time = ?  and org_id = ? and status = 1", goodid, goodtypeid, recordtime, orgid).Find(&info).Error
+
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
 func UpdateAutoMaticReduceDetail(goodid int64, goodtypeid int64, recordtime int64, patientid int64, orgid int64, prepare *models.WarehouseOutInfo) error {
 
 	err := XTWriteDB().Model(&prepare).Where("good_id = ? and good_type_id = ? and sys_record_time = ? and patient_id = ? and org_id = ? and status =1", goodid, goodtypeid, recordtime, patientid, orgid).Updates(map[string]interface{}{"count": prepare.Count}).Error
 	return err
 }
 
+func UpdateAutoMaticReduceDetailOne(goodid int64, goodtypeid int64, recordtime int64, orgid int64, prepare *models.WarehouseOutInfo) error {
+
+	err := XTWriteDB().Model(&prepare).Where("good_id = ? and good_type_id = ? and sys_record_time = ? and org_id = ? and status =1", goodid, goodtypeid, recordtime, orgid).Updates(map[string]interface{}{"count": prepare.Count}).Error
+	return err
+}
+
 func AddSigleWarehouseOutInfo(info *models.WarehouseOutInfo) error {
 
 	err := writeDb.Create(&info).Error
@@ -2144,6 +2168,11 @@ func FindStockOutInfoByStock(org_id int64, good_type_id int64, good_id int64, re
 	return
 }
 
+func FindStockOutInfoByStockOne(org_id int64, good_type_id int64, good_id int64, record_date int64) (out []*models.WarehouseOutInfo, err error) {
+	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND sys_record_time = ?", org_id, good_type_id, good_id, record_date).Order("ctime desc").Find(&out).Error
+	return
+}
+
 func FindDrugStockOutInfoByTypeId(org_id int64, drug_id int64, out_id int64, number string) (out models.DrugWarehouseOutInfo, err error) {
 	err = readDb.Model(&models.DrugWarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND  drug_id = ? AND is_sys = 1 AND  (warehouse_out_id = ? or warehouse_out_order_number = ?)", org_id, drug_id, out_id, number).First(&out).Error
 	return

service/warhouse_service.go

@@ -871,563 +871,6 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				CreateAutoReduceRecord(&details)
 			}
 		}
-//
-//import (
-//	"XT_New/models"
-//	"XT_New/utils"
-//	"errors"
-//	"fmt"
-//	_ "fmt"
-//	"github.com/jinzhu/gorm"
-//	"math"
-//	"strconv"
-//	"strings"
-//	"time"
-//)
-//
-//// 药品出库
-//
-//func DrugsDelivery(orgID int64, advice *models.DoctorAdvice) (err error) {
-//	// 1.判断药品是否来自专用字典的药品库
-//	// 2.判断当天当前机构有没有创建出库单，没有则创建
-//	// 3.创建出库流程
-//	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
-//	isHasWay := false
-//	record_time := int64(0)
-//	if advice.Way == 1 {
-//		isHasWay = true
-//		record_time = advice.RecordDate
-//	}
-//	if isHasWay {
-//		//判断当天当前机构有没有创建出库单，没有则创建
-//		out, err := FindDrugStockOutByIsSys(orgID, 1, record_time)
-//		if err == gorm.ErrRecordNotFound {
-//			timeStr := time.Now().Format("2006-01-02")
-//			timeArr := strings.Split(timeStr, "-")
-//			total, _ := FindAllDrugWarehouseOut(orgID)
-//			total = total + 1
-//			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-//			number = number + total
-//			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-//			// creater := adminUserInfo.AdminUser.Id
-//			warehouseOut := models.DrugWarehouseOut{
-//				WarehouseOutOrderNumber: warehousing_out_order,
-//				OperationTime:           time.Now().Unix(),
-//				OrgId:                   orgID,
-//				Creater:                 0,
-//				Ctime:                   time.Now().Unix(),
-//				Status:                  1,
-//				WarehouseOutTime:        record_time,
-//				Dealer:                  0,
-//				Manufacturer:            0,
-//				Type:                    1,
-//				IsSys:                   1,
-//			}
-//			err := AddSigleDrugWarehouseOut(&warehouseOut)
-//			if err != nil {
-//				utils.TraceLog("创建出库单失败 err = %v", err)
-//				return err
-//			} else {
-//				out = warehouseOut
-//			}
-//		}
-//
-//		// 出库流程
-//		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
-//		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
-//		if drup.ID > 0 {
-//			prescribingNumber := advice.PrescribingNumber
-//			DrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
-//		} else {
-//			return errors.New("药品信息不存在")
-//		}
-//
-//	}
-//
-//	return
-//}
-//
-//// 药品出库 递归方式
-//func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DoctorAdvice) (err error) {
-//	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
-//	var deliver_number int64 = 0
-//	var stock_number int64 = 0
-//
-//	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
-//	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-//	if advice.PrescribingNumberUnit == drup.MaxUnit {
-//		deliver_number = count * drup.MinNumber
-//	} else {
-//		deliver_number = count
-//	}
-//
-//	// 根据先进先出原则，查询最先入库的批次，进行出库
-//	// 如果没有对应的库存，则报错
-//	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
-//	fmt.Println("查询222222222222222222222222222222222222222222222222", err)
-//	if err != nil {
-//		return err
-//	}
-//
-//	// 将该批次的剩余库存数量转换为拆零数量
-//	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-//	// 当库存数量大于或等于出库数量的话，则正常出库该批次
-//	if stock_number >= deliver_number {
-//		warehouseOutInfo := &models.DrugWarehouseOutInfo{
-//			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-//			WarehouseOutId:          warehouseout.ID,
-//			Status:                  1,
-//			Ctime:                   time.Now().Unix(),
-//			Remark:                  "",
-//			OrgId:                   orgID,
-//			Type:                    1,
-//			Manufacturer:            0,
-//			Dealer:                  0,
-//			IsSys:                   1,
-//			SysRecordTime:           advice.RecordDate,
-//			DrugId:                  advice.DrugId,
-//		}
-//		warehouseOutInfo.Count = deliver_number
-//		warehouseOutInfo.CountUnit = drup.MinUnit
-//		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-//		if errOne != nil {
-//			return errOne
-//		} else {
-//			// prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-//			// count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-//			details := &models.DrugAutomaticReduceDetail{
-//				WarehouseOutId:          warehouseOutInfo.ID,
-//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-//				PatientId:               advice.PatientId,
-//				Ctime:                   time.Now().Unix(),
-//				Mtime:                   time.Now().Unix(),
-//				Status:                  1,
-//				RecordTime:              advice.RecordDate,
-//				OrgId:                   orgID,
-//				DrugId:                  advice.DrugId,
-//				Count:                   deliver_number,
-//				CountUnit:               drup.MinUnit,
-//			}
-//			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
-//			if errTwo != nil {
-//				return errTwo
-//			}
-//		}
-//		// 出库完成后，要减去对应批次的库存数量
-//		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
-//		var maxNumber int64 = 0
-//		var minNumber int64 = 0
-//		if advice.PrescribingNumberUnit == drup.MinUnit {
-//			maxNumber = count / drup.MinNumber
-//			minNumber = count % drup.MinNumber
-//		} else {
-//			maxNumber = count
-//		}
-//
-//		if warehouse.StockMaxNumber < maxNumber {
-//			return errors.New("库存数量不足")
-//		}
-//
-//		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-//		warehouse.Mtime = time.Now().Unix()
-//		if warehouse.StockMinNumber < minNumber {
-//			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-//			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-//		} else {
-//			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-//		}
-//
-//		if warehouse.StockMaxNumber < 0 {
-//			return errors.New("库存数量不足")
-//		}
-//		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-//		if errThree != nil {
-//			return errThree
-//		}
-//
-//		return nil
-//	} else {
-//		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
-//		warehouseOutInfo := &models.DrugWarehouseOutInfo{
-//			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-//			WarehouseOutId:          warehouseout.ID,
-//			Status:                  1,
-//			Ctime:                   time.Now().Unix(),
-//			Remark:                  "",
-//			OrgId:                   orgID,
-//			Type:                    1,
-//			Manufacturer:            0,
-//			Dealer:                  0,
-//			IsSys:                   1,
-//			SysRecordTime:           advice.RecordDate,
-//			DrugId:                  advice.DrugId,
-//		}
-//		// prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-//		// count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-//		warehouseOutInfo.Count = stock_number
-//		warehouseOutInfo.CountUnit = drup.MinUnit
-//
-//		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-//		if errOne != nil {
-//			return errOne
-//		} else {
-//			details := &models.DrugAutomaticReduceDetail{
-//				WarehouseOutId:          warehouseOutInfo.ID,
-//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-//				PatientId:               advice.PatientId,
-//				Ctime:                   time.Now().Unix(),
-//				Mtime:                   time.Now().Unix(),
-//				Status:                  1,
-//				RecordTime:              advice.RecordDate,
-//				OrgId:                   orgID,
-//				DrugId:                  advice.DrugId,
-//				Count:                   stock_number,
-//				CountUnit:               drup.MinUnit,
-//			}
-//			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
-//			if errTwo != nil {
-//				return errTwo
-//			}
-//		}
-//		// 出库完成后，要将该批次库存清零
-//		warehouse.StockMaxNumber = 0
-//		warehouse.StockMinNumber = 0
-//		warehouse.Mtime = time.Now().Unix()
-//		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-//		if errThree != nil {
-//			return errThree
-//		}
-//		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
-//		prescribingNumber_two_temp := deliver_number - stock_number
-//		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
-//		advice.PrescribingNumberUnit = drup.MinUnit
-//		DrugDeliverInfo(orgID, prescribingNumber, warehouseout, drup, advice)
-//	}
-//	return
-//}
-//
-//// 耗材出库
-//func ConsumablesDeliveryTotal(orgID int64,patient_id int64,record_time int64,goods []models.DialysisBeforePrepareGoods) (err error) {
-//	//查询该患者当天已经出库的耗材信息
-//	goods_yc,_ := FindConsumablesByDateTwo(orgID, patient_id, record_time)
-//	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
-//	for i := len(goods_yc) - 1; i >= 0; i--{
-//		goods_yc_temp := goods_yc[i]
-//		for j := len(goods) - 1; j >= 0; j-- {
-//			goods_temp := goods[j]
-//			// 已经出库和新请求出库都存在该耗材，则判断出库数量，分成是继续出库，还是删除出库
-//			if goods_yc_temp.GoodTypeId == goods_temp.GoodTypeId && goods_yc_temp.GoodId == goods_temp.GoodId{
-//				// 已经出库和新请求出库的出库数量一致，则清除两个结构体里的数据（既不出库，也不删除出库）
-//				if goods_yc_temp.Count == goods_temp.Count {
-//					goods_yc = append(goods_yc[:i],goods_yc[i+1:]...)
-//					goods = append(goods[:j],goods[j+1:]...)
-//				}
-//
-//				// 如果已经出库的数量 大于 新请求出库的数量，则代表需要删除出库
-//				if goods_yc_temp.Count > goods_temp.Count {
-//					temp_count := goods_yc_temp.Count - goods_temp.Count
-//					goods_yc[i].Count = temp_count
-//					goods = append(goods[:j],goods[j+1:]...)
-//				}
-//
-//				// 如果已经出库的数量 小于 新请求出库的梳理，则代表需要增加出库
-//				if goods_yc_temp.Count < goods_temp.Count {
-//					temp_count := goods_temp.Count - goods_yc_temp.Count
-//					goods[j].Count = temp_count
-//					goods_yc = append(goods_yc[:i],goods_yc[i+1:]...)
-//				}
-//			}
-//		}
-//	}
-//
-//	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
-//	// goods 这个数据就是需要出库的耗材的数据
-//	if len(goods) > 0 {
-//		out, err := FindStockOutByIsSys(orgID, 1, record_time)
-//		if err == gorm.ErrRecordNotFound {
-//			//没有记录，则创建出库单
-//			timeStr := time.Now().Format("2006-01-02")
-//			timeArr := strings.Split(timeStr, "-")
-//			total, _ :=  FindAllWarehouseOut(orgID)
-//			total = total + 1
-//			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-//			number = number + total
-//			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-//			warehouseOut := models.WarehouseOut{
-//				WarehouseOutOrderNumber: warehousing_out_order,
-//				OperationTime:           time.Now().Unix(),
-//				OrgId:                   orgID,
-//				Creater:                 0,
-//				Ctime:                   time.Now().Unix(),
-//				Status:                  1,
-//				WarehouseOutTime:        record_time,
-//				Dealer:                  0,
-//				Manufacturer:            0,
-//				Type:                    1,
-//				IsSys:                   1,
-//			}
-//			err := AddSigleWarehouseOut(&warehouseOut)
-//			if err != nil {
-//				utils.TraceLog("创建出库单失败 err = %v", err)
-//				return err
-//			} else {
-//				out = warehouseOut
-//			}
-//		}
-//		for _,good := range goods {
-//			ConsumablesDelivery(orgID ,patient_id ,record_time ,good,out )
-//		}
-//	}
-//
-//	if len(goods_yc) > 0 {
-//		for _,good_yc := range goods_yc{
-//			ConsumablesDeliveryDelete(orgID ,patient_id ,record_time ,good_yc ,out )
-//		}
-//	}
-//
-//	return nil
-//}
-//
-//// 耗材出库
-//func ConsumablesDelivery(orgID int64,patient_id int64,record_time int64,goods models.DialysisBeforePrepareGoods,warehouseOut models.WarehouseOut) (err error) {
-//	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
-//	var deliver_number int64 = 0
-//	var stock_number int64 = 0
-//
-//	deliver_number = good.Count
-//
-//
-//	// 根据先进先出原则，查询最先入库的批次，进行出库
-//	// 如果没有对应的库存，则报错
-//	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId,goods.GoodTypeId)
-//	if err != nil {
-//		return err
-//	}
-//
-//	// 将该批次的剩余库存数量转换为拆零数量
-//	stock_number = warehouse.StockCount
-//	// 当库存数量大于或等于出库数量的话，则正常出库该批次
-//	if stock_number >= deliver_number {
-//		warehouseOutInfo := &models.WarehouseOutInfo{
-//			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-//			WarehouseOutId:          warehouseOut.ID,
-//			WarehouseInfoId:		 warehouse.ID,
-//			Status:                  1,
-//			Ctime:                   time.Now().Unix(),
-//			Remark:                  "",
-//			OrgId:                   orgID,
-//			Type:                    1,
-//			Manufacturer:            0,
-//			Dealer:                  0,
-//			IsSys:                   1,
-//			SysRecordTime:           record_time,
-//			GoodTypeId:              goods.GoodTypeId,
-//			GoodId:                  goods.GoodId,
-//			PatientId:				 patient_id,
-//		}
-//		warehouseOutInfo.Count = goods.Count
-//		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
-//		warehouseOutInfo.Price = stockInInfo.Price
-//		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
-//		if errOne != nil {
-//			return errOne
-//		} else {
-//			details := &models.AutomaticReduceDetail{
-//				WarehouseOutId:          warehouseOutInfo.ID,
-//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-//				PatientId:               patient_id,
-//				Ctime:                   time.Now().Unix(),
-//				Mtime:                   time.Now().Unix(),
-//				Status:                  1,
-//				RecordTime:              record_time,
-//				OrgId:                   orgID,
-//				GoodId:                  goods.GoodId,
-//				GoodTypeId:              goods.GoodTypeId,
-//				Count:                   goods.Count,
-//			}
-//			errTwo := service.AddSigleAutoReduceRecordInfo(details)
-//			if errTwo != nil {
-//				return errTwo
-//			}
-//		}
-//
-//		// 出库完成后，要减去对应批次的库存数量
-//
-//		maxNumber = goods.Count
-//
-//
-//		if warehouse.StockMaxNumber < maxNumber {
-//			return errors.New("库存数量不足")
-//		}
-//
-//		warehouse.StockNumber = warehouse.StockMaxNumber - maxNumber
-//		warehouse.Mtime = time.Now().Unix()
-//
-//
-//		if warehouse.StockNumber < 0 {
-//			return errors.New("库存数量不足")
-//		}
-//		errThree := UpDateWarehouseInfoByStock(&warehouse)
-//		if errThree != nil {
-//			return errThree
-//		}
-//
-//		return nil
-//	}  else {
-//		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
-//		warehouseOutInfo := &models.WarehouseOutInfo{
-//			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-//			WarehouseOutId:          warehouseOut.ID,
-//			WarehouseInfoId:		 warehouse.ID,
-//			Status:                  1,
-//			Ctime:                   time.Now().Unix(),
-//			Remark:                  "",
-//			OrgId:                   orgID,
-//			Type:                    1,
-//			Manufacturer:            0,
-//			Dealer:                  0,
-//			IsSys:                   1,
-//			SysRecordTime:           record_time,
-//			GoodTypeId:              goods..GoodTypeId,
-//			GoodId:                  goods.GoodId,
-//			PatientId:				 patient_id,
-//		}
-//		warehouseOutInfo.Count = stock_number
-//		stockInInfo, _ := service.FindLastStockInInfoRecord(goods.GoodId, orgID)
-//		warehouseOutInfo.Price = stockInInfo.Price
-//		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-//		if errOne != nil {
-//			return errOne
-//		} else {
-//			details := &models.AutomaticReduceDetail{
-//				WarehouseOutId:          warehouseOutInfo.ID,
-//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-//				PatientId:               patient_id,
-//				Ctime:                   time.Now().Unix(),
-//				Mtime:                   time.Now().Unix(),
-//				Status:                  1,
-//				RecordTime:              record_time,
-//				OrgId:                   orgID,
-//				GoodId:                  goods.GoodId,
-//				GoodTypeId:              goods.GoodTypeId,
-//				Count:                   goods.Count,
-//			}
-//			errTwo := service.AddSigleAutoReduceRecordInfo(details)
-//			if errTwo != nil {
-//				return errTwo
-//			}
-//		}
-//		// 出库完成后，要将该批次库存清零
-//		warehouse.StockNumber = 0
-//		warehouse.Mtime = time.Now().Unix()
-//		errThree := UpDateWarehouseInfoByStock(&warehouse)
-//		if errThree != nil {
-//			return errThree
-//		}
-//		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
-//		goods.Count := deliver_number - stock_number
-//
-//		ConsumablesDelivery(orgID ,patient_id ,record_time ,good,out )
-//	}
-//	return nil
-//}
-//
-//// 耗材出库删除
-//func ConsumablesDeliveryDelete(orgID int64,patient_id int64,record_time int64,good_yc models.DialysisBeforePrepare,warehouseOut models.WarehouseOut) (err error) {
-//	// 先根据相关信息查询当天该耗材的出库信息
-//	warehouseOutInfos,err :=FindStockOutInfoByStock(orgID,good_yc.GoodTypeId,good_yc.GoodId,record_time,patient_id)
-//	if err != nil {
-//		return err
-//	}
-//
-//	var delete_count int64 = 0
-//
-//	for _ , ware := range warehouseOutInfos{
-//		// 判断当前出库的数据和删除出库数量
-//		if good_yc.Count <= ware.Count {
-//			delete_count = good_yc.Count
-//		} else {
-//			delete_count = ware.Count
-//		}
-//		// 在出库记录表里记录退库详情
-//		warehouseOutInfo := &models.WarehouseOutInfo{
-//			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-//			WarehouseOutId:          warehouseOut.ID,
-//			WarehouseInfoId:		 warehouse.ID,
-//			Status:                  1,
-//			Ctime:                   time.Now().Unix(),
-//			Remark:                  "",
-//			OrgId:                   orgID,
-//			Type:                    1,
-//			Manufacturer:            0,
-//			Dealer:                  0,
-//			IsSys:                   2,
-//			SysRecordTime:           record_time,
-//			GoodTypeId:              goods..GoodTypeId,
-//			GoodId:                  goods.GoodId,
-//			PatientId:				 patient_id,
-//		}
-//		warehouseOutInfo.Count = delete_count
-//		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
-//		warehouseOutInfo.Price = stockInInfo.Price
-//		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
-//		if errOne != nil {
-//			return errOne
-//		} else {
-//			details := &models.AutomaticReduceDetail{
-//				WarehouseOutId:          warehouseOutInfo.ID,
-//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-//				PatientId:               patient_id,
-//				Ctime:                   time.Now().Unix(),
-//				Mtime:                   time.Now().Unix(),
-//				Status:                  1,
-//				RecordTime:              record_time,
-//				OrgId:                   orgID,
-//				GoodId:                  goods.GoodId,
-//				GoodTypeId:              goods.GoodTypeId,
-//				Count:                   delete_count,
-//				Type:					 2,
-//			}
-//			errTwo := AddSigleAutoReduceRecordInfo(details)
-//			if errTwo != nil {
-//				return errTwo
-//			}
-//		}
-//
-//		// 删除出库完成后，要增加对应批次的库存数量
-//
-//
-//
-//		errThree := UpDateWarehouseInfoByStockDelete(ware.WarehouseInfoId,delete_count)
-//		if errThree != nil {
-//			return errThree
-//		}
-//
-//		// 增加了对应的库存后，看看还有多少需要退库的
-//		good_yc.Count = goods_yc.Count - delete_count
-//		if good_yc.Count == 0 {
-//			return nil
-//		}
-//	}
-//
-//	if good_yd.Count == 0 {
-//		return nil
-//	}  else {
-//		return errors.New("退库和出库数据不匹配")
-//	}
-//}
-
-		// 出库完成后，要减去对应批次的库存数量
-
-		//查询是否有出库记录
-		//_, errcodeOne := GetAutoDialysisBefor(goods.GoodId, goods.GoodTypeId, goods.PatientId, goods.UserOrgId, goods.RecordDate)
-		//if errcodeOne == gorm.ErrRecordNotFound{
-		//  maxNumber = goods.Count
-		//}else if errcodeOne == nil{
-		//  maxNumber = goods.NewCount
-		//}
 		fmt.Println("newcount9999999999999999999999999999999", goods.NewCount)
 		maxNumber = goods.NewCount
 
@@ -1758,20 +1201,25 @@ func ConsumablesDeliveryTotalOne(orgID int64, patient_id int64, record_time int6
 		}
 
 		for _, item := range goodOne {
-			prepare := models.DialysisBeforePrepare{
+			//prepare := models.DialysisBeforePrepare{
+			//	GoodTypeId: item.GoodTypeId,
+			//	GoodId:     item.GoodId,
+			//	Count:      item.Count,
+			//	NewCount:   item.NewCount,
+			//}
+			info := models.WarehouseOutInfo{
 				GoodTypeId: item.GoodTypeId,
 				GoodId:     item.GoodId,
 				Count:      item.Count,
-				NewCount:   item.NewCount,
 			}
-			ConsumablesDeliveryOne(orgID, patient_id, record_time, &prepare, &out, item.Count)
+			ConsumablesDeliveryOne(orgID, record_time, &info, &out, item.Count)
 		}
 	}
 
 	if len(goods_yc) > 0 {
 		for _, good_yc := range goods_yc {
 			out, _ := FindStockOutByIsSys(orgID, 1, record_time)
-			ConsumablesDeliveryDeleteOne(orgID, patient_id, record_time, good_yc, &out)
+			ConsumablesDeliveryDeleteOne(orgID, record_time, good_yc, &out)
 		}
 	}
 
@@ -1779,7 +1227,7 @@ func ConsumablesDeliveryTotalOne(orgID int64, patient_id int64, record_time int6
 }
 
 //耗材出库
-func ConsumablesDeliveryOne(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
+func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64) (err error) {
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -1812,18 +1260,17 @@ func ConsumablesDeliveryOne(orgID int64, patient_id int64, record_time int64, go
 			Type:                    1,
 			Manufacturer:            0,
 			Dealer:                  0,
-			IsSys:                   1,
+			IsSys:                   2,
 			SysRecordTime:           record_time,
 			GoodTypeId:              goods.GoodTypeId,
 			GoodId:                  goods.GoodId,
-			PatientId:               patient_id,
 		}
 		warehouseOutInfo.Count = goods.Count
 		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
 
 		//判断当前耗材是否有出库详情记录
-		_, errcode := GetStockInRecoredByGoodId(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID)
+		_, errcode := GetStockInRecoredByGoodIdOne(goods.GoodId, goods.GoodTypeId, record_time, orgID)
 		if errcode == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -1841,17 +1288,16 @@ func ConsumablesDeliveryOne(orgID int64, patient_id int64, record_time int64, go
 				Type:                    1,
 				Manufacturer:            0,
 				Dealer:                  0,
-				IsSys:                   1,
+				IsSys:                   2,
 				SysRecordTime:           record_time,
 				GoodTypeId:              goods.GoodTypeId,
 				GoodId:                  goods.GoodId,
-				PatientId:               patient_id,
 			}
 			warehouseOutInfo.Count = goods.Count
 
 		}
 
-		maxNumber = goods.NewCount
+		maxNumber = goods.Count
 
 		if warehouse.StockCount < maxNumber {
 			return errors.New("库存数量不足")
@@ -1886,13 +1332,12 @@ func ConsumablesDeliveryOne(orgID int64, patient_id int64, record_time int64, go
 			SysRecordTime:           record_time,
 			GoodTypeId:              goods.GoodTypeId,
 			GoodId:                  goods.GoodId,
-			PatientId:               patient_id,
 		}
 		warehouseOutInfo.Count = stock_number
 		stockInInfo, _ := service.FindLastStockInInfoRecord(goods.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
 
-		_, errcode := GetStockInRecoredByGoodId(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID)
+		_, errcode := GetStockInRecoredByGoodIdOne(goods.GoodId, goods.GoodTypeId, record_time, orgID)
 		if errcode == gorm.ErrRecordNotFound {
 			errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 
@@ -1909,7 +1354,7 @@ func ConsumablesDeliveryOne(orgID int64, patient_id int64, record_time int64, go
 			// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 			goods.Count = deliver_number - stock_number
 
-			ConsumablesDeliveryOne(orgID, patient_id, record_time, goods, warehouseOut, count)
+			ConsumablesDeliveryOne(orgID, record_time, goods, warehouseOut, count)
 		} else if errcode == nil {
 
 			warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1927,11 +1372,10 @@ func ConsumablesDeliveryOne(orgID int64, patient_id int64, record_time int64, go
 				SysRecordTime:           record_time,
 				GoodTypeId:              goods.GoodTypeId,
 				GoodId:                  goods.GoodId,
-				PatientId:               patient_id,
 			}
 			warehouseOutInfo.Count = goods.Count
 			//更新入库详情表
-			UpdateAutoMaticReduceDetail(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID, warehouseOutInfo)
+			UpdateAutoMaticReduceDetailOne(goods.GoodId, goods.GoodTypeId, record_time, orgID, warehouseOutInfo)
 		}
 
 	}
@@ -1939,9 +1383,9 @@ func ConsumablesDeliveryOne(orgID int64, patient_id int64, record_time int64, go
 }
 
 //耗材出库删除
-func ConsumablesDeliveryDeleteOne(orgID int64, patient_id int64, record_time int64, good_yc *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut) (err error) {
+func ConsumablesDeliveryDeleteOne(orgID int64, record_time int64, good_yc *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut) (err error) {
 	// 先根据相关信息查询当天该耗材的出库信息
-	warehouseOutInfos, err := FindStockOutInfoByStock(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time, patient_id)
+	warehouseOutInfos, err := FindStockOutInfoByStockOne(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time)
 	if err != nil {
 		return err
 	}
@@ -1971,7 +1415,6 @@ func ConsumablesDeliveryDeleteOne(orgID int64, patient_id int64, record_time int
 			SysRecordTime: record_time,
 			GoodTypeId:    good_yc.GoodTypeId,
 			GoodId:        good_yc.GoodId,
-			PatientId:     patient_id,
 		}
 		warehouseOutInfo.Count = delete_count
 		stockInInfo, _ := FindLastStockInInfoRecord(good_yc.GoodId, orgID)