11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -1669,7 +1669,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
 			if drup.ID > 0 {
 				prescribingNumber := item.Count
-				service.AutoDrugDeliverInfoTwenty(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
+				service.AutoDrugDeliverInfoTwentyOne(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
 			}
 			prescribing_number_total = 0
 			total_count = 0
@@ -2195,7 +2195,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
 				if drup.ID > 0 {
 					prescribingNumber := item.Count
-					service.AutoDrugDeliverInfoTwenty(item.OrgId, prescribingNumber, &tempWarehouseOut, &drup, item)
+					service.AutoDrugDeliverInfoTwentyOne(item.OrgId, prescribingNumber, &tempWarehouseOut, &drup, item)
 				}
 			}
 

controllers/his_summary_controller.go

@@ -52,6 +52,9 @@ func (this *HisSummaryApiController) GetHisSummaryDetailList() {
 
 	//获取所有的科室
 	hisDepatment, _ := service.GetHisDepatment(adminUser.CurrentOrgId)
+
+	//获取个人支付总额
+	orderList, _ := service.GetAllHisOrderList(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":               list,
@@ -60,6 +63,7 @@ func (this *HisSummaryApiController) GetHisSummaryDetailList() {
 			"hisDepatment":       hisDepatment,
 			"order":              order,
 			"his_record_patient": his_record_patient,
+			"orderList":          orderList,
 		})
 		return
 	} else {
@@ -120,6 +124,9 @@ func (this *HisSummaryApiController) GetGatherDetaiList() {
 	bedNumber, _ := service.GetAllBedNumberSix(adminUser.CurrentOrgId)
 	orderInfo, _ := service.GetHisLastOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 
+	//获取个人支付总额
+	orderList, _ := service.GetAllHisOrderList(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":                      list,
@@ -135,6 +142,7 @@ func (this *HisSummaryApiController) GetGatherDetaiList() {
 			"schedule":                  schedule,
 			"bedNumber":                 bedNumber,
 			"orderInfo":                 orderInfo,
+			"orderList":                 orderList,
 		})
 		return
 	} else {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -540,6 +540,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	projects, _ = service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
 	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
 
+	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminInfo.Org.Id)
 	var team_projects []*models.HisPrescriptionProject
 	//var index int64 = 0
 	for _, item := range temp_team_projects {
@@ -601,6 +602,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"project":                        projects,
 		"team_projects":                  team_projects,
 		"is_advice_open":                 is_advice_open,
+		"prescription_open":              prescriptionConfig.IsOpen,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -3256,6 +3258,8 @@ func (c *DialysisAPIController) GetLongAdvice() {
 	_, config := service.FindDoctorAdviceRecordByOrgId(adminUserInfo.Org.Id)
 	_, hisConfig := service.FindXTHisRecordByOrgId(adminUserInfo.Org.Id)
 	is_advice_open, _ := service.FindAdviceSettingById(adminUserInfo.Org.Id)
+
+	prescription_open, _ := service.FindPrescriptionConfigById(adminUserInfo.Org.Id)
 	//patient, _ := service.FindPatientIsOpenRemindById(patient_id, adminUserInfo.Org.Id)
 	if config.IsOpenRemind == 0 { //针对老用户，即没开启推送功能，也没有	不开启推送功能，不做任何处理
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -3332,12 +3336,13 @@ func (c *DialysisAPIController) GetLongAdvice() {
 		}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"status":          "2",
-				"advices":         advices,
-				"advices_two":     RemoveRepeatedElement(advice_three),
-				"is_open_remind":  config.IsOpenRemind,
-				"his_config_open": hisConfig.IsOpen,
-				"is_advice_open":  is_advice_open.IsAdviceOpen,
+				"status":            "2",
+				"advices":           advices,
+				"advices_two":       RemoveRepeatedElement(advice_three),
+				"is_open_remind":    config.IsOpenRemind,
+				"his_config_open":   hisConfig.IsOpen,
+				"is_advice_open":    is_advice_open.IsAdviceOpen,
+				"prescription_open": prescription_open.IsOpen,
 			})
 		}
 	}

models/his_models.go

@@ -2009,3 +2009,101 @@ type NewCustomTwo struct {
 	ProjectId        int64
 	ItemId           int64
 }
+
+type VmHisOrder struct {
+	ID                      int64     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId               int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId            int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate      int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	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"`
+	Number                  string    `gorm:"column:number" json:"number" form:"number"`
+	PatientId               int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode                 int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg                 string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                  string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                  string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime             string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid             string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus             int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId                 string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                  string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                   string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName                 string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType             string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                  string    `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                    string    `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                    string    `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                    time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                     float64   `gorm:"column:age" json:"age" form:"age"`
+	Insutype                string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType                 string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag             string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime                string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType           string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType                 string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt            float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt         float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay          float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt           float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt             float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc              float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay                 float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay              float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay         float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay                float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay                float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay                float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                  float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                  float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt           float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt              float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay                 float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay              float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt             float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                    float64   `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay           float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId            string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins               string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                  string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType                 string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail              string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	PayWay                  int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice                float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo               string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice           float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice       float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice            float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice              float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice   float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice            float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	IsMedicineInsurance     int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	SettleType              int64     `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime         int64     `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime           int64     `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+	Creator                 int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                  int64     `gorm:"column:modify" json:"modify" form:"modify"`
+	SzChargeInfo            string    `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
+	SzProjectInfo           string    `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
+	SzMedicineInsuranceInfo string    `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
+	AccountPrice            float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
+	MzNumber                string    `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	OrgSetlNumber           string    `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+	YiliaoNumber            string    `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	RefundLog               string    `gorm:"column:refund_log" json:"refund_log" form:"refund_log"`
+	DetailLog               string    `gorm:"column:detail_log" json:"detail_log" form:"detail_log"`
+	RequestLog              string    `gorm:"column:request_log" json:"request_log" form:"request_log"`
+	RefundRequestLog        string    `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
+	FaPiaoCode              string    `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber            string    `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	PType                   int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	IsPre                   int64     `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis               string    `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	FaPiaoBatchnumberId     int64     `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
+	Decimal                 float64   `gorm:"column:decimal" json:"decimal" form:"decimal"`
+}
+
+func (VmHisOrder) TableName() string {
+	return "his_order"
+}

service/his_summary_service.go

@@ -329,3 +329,26 @@ func GetHisChargeOrder(org_id int64, patient_id int64, start_time int64, end_tim
 	}).Error
 	return order, err
 }
+
+func GetAllHisOrderList(org_id int64, patient_id int64, start_time int64, end_time int64) (order []*models.VmHisOrder, err error) {
+
+	db := XTReadDB().Model(&order).Where("status = 1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("settle_accounts_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("settle_accounts_date<=?", end_time)
+	}
+
+	err = db.Find(&order).Error
+
+	return order, err
+}

service/warhouse_service.go

@@ -4238,7 +4238,7 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 	//开启事物
 
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
-	fmt.Println("h2h332322323232323233232233223", deliver_number)
+
 	if err != nil {
 
 		return err
@@ -4279,6 +4279,10 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			AdminUserId:             advice.AdminUserId,
 		}
 
+		if warehouse.RetailPrice == 0 {
+			warehouseOutInfo.Price = advice.Price
+		}
+
 		warehouseOutInfo.Count = prescribingNumber
 		warehouseOutInfo.CountUnit = advice.CountUnit
 
@@ -4314,6 +4318,9 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
 		}
+		if warehouse.RetailPrice == 0 {
+			drugflow.Price = advice.Price
+		}
 
 		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要减去对应批次的库存数量
@@ -4440,6 +4447,9 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
 		}
+		if warehouse.RetailPrice == 0 {
+			warehouseOutInfo.Price = advice.Price
+		}
 		warehouseOutInfo.Count = stock_number
 
 		//warehouseOutInfo.CountUnit = advice.CountUnit
@@ -4475,6 +4485,9 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
 		}
+		if warehouse.RetailPrice == 0 {
+			drugflow.Price = advice.Price
+		}
 		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要将该批次库存清零
 		//扣减库存
@@ -4514,3 +4527,299 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 
 	return
 }
+
+// 药品手动出库 递归方式
+func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
+
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+
+	if advice.CountUnit == drup.MaxUnit {
+		deliver_number = prescribingNumber * drup.MinNumber
+	} else {
+		deliver_number = prescribingNumber
+	}
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	//开启事物
+
+	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
+
+	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:                  advice.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   0,
+			SysRecordTime:           advice.Ctime,
+			DrugId:                  advice.DrugId,
+			ExpiryDate:              advice.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			Number:                  advice.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Count:                   deliver_number,
+			RetailPrice:             advice.RetailPrice,
+			Price:                   advice.Price,
+			WarehouseInfoId:         warehouse.ID,
+			CountUnit:               drup.MinUnit,
+			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+		}
+
+		warehouseOutInfo.Count = prescribingNumber
+		warehouseOutInfo.CountUnit = advice.CountUnit
+
+		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
+		}
+
+		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
+		drugflow := models.DrugFlow{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
+			Count:                   deliver_number,
+			Price:                   advice.Price,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			UserOrgId:               advice.OrgId,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          2,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+			WarehouseOutDetailId:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+		}
+		if warehouse.RetailPrice == 0 {
+			drugflow.Price = advice.Price
+		}
+
+		CreateDrugFlowOne(drugflow)
+		// 出库完成后，要减去对应批次的库存数量
+		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
+		var maxNumber int64 = 0
+		var minNumber int64 = 0
+		var stock_max_number int64 = 0
+		stock_max_number = warehouse.StockMaxNumber
+
+		maxNumber = deliver_number / drup.MinNumber
+		minNumber = deliver_number % drup.MinNumber
+
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+				return errors.New("库存数量不足")
+			}
+		}
+
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+		if warehouse.StockMinNumber < 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		warehouse.Mtime = time.Now().Unix()
+
+		if warehouse.StockMinNumber < minNumber {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+		} else {
+			if minNumber > 0 {
+				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				} else {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+			}
+
+			if minNumber == 0 && maxNumber != 1 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+
+		}
+
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			if warehouse.StockMinNumber == 0 {
+				warehouse.StockMaxNumber = stock_max_number
+			}
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+				return errors.New("库存数量不足")
+			}
+		}
+		if warehouse.StockMinNumber <= 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+
+		if errThree != nil {
+			return errThree
+		}
+
+		//查询默认仓库
+		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+		//查询默认仓库剩余多少库存
+		list, _ := GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgID, warehouse.DrugId)
+		var sum_count int64
+		var sum_in_count int64
+		for _, it := range list {
+			baseDrug, _ := GetBaseDrugMedical(it.DrugId)
+			if it.MaxUnit == baseDrug.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+				it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+				sum_count += it.StockMaxNumber + it.StockMinNumber
+				sum_in_count += it.WarehousingCount
+			}
+		}
+		UpdateMedicalSumCount(warehouse.DrugId, sum_count, sum_in_count, orgID)
+
+		return nil
+
+	} else {
+		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  advice.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   0,
+			SysRecordTime:           advice.Ctime,
+			DrugId:                  advice.DrugId,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Count:                   stock_number,
+			RetailPrice:             advice.RetailPrice,
+			Price:                   advice.Price,
+			WarehouseInfoId:         warehouse.ID,
+			CountUnit:               drup.MinUnit,
+			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+		}
+
+		warehouseOutInfo.Count = stock_number
+
+		//warehouseOutInfo.CountUnit = advice.CountUnit
+
+		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
+		}
+		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
+		drugflow := models.DrugFlow{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
+			Count:                   stock_number,
+			Price:                   advice.Price,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			UserOrgId:               advice.OrgId,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          2,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+			WarehouseOutDetailId:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+		}
+
+		CreateDrugFlowOne(drugflow)
+		// 出库完成后，要将该批次库存清零
+		//扣减库存
+
+		warehouse.StockMaxNumber = 0
+		warehouse.StockMinNumber = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+
+		//查询默认仓库
+		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+		//查询默认仓库剩余多少库存
+		list, _ := GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgID, warehouse.DrugId)
+		var sum_count int64
+		var sum_in_count int64
+		for _, it := range list {
+			baseDrug, _ := GetBaseDrugMedical(it.DrugId)
+			if it.MaxUnit == baseDrug.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+				it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+				sum_count += it.StockMaxNumber + it.StockMinNumber
+				sum_in_count += it.WarehousingCount
+			}
+		}
+		UpdateMedicalSumCount(warehouse.DrugId, sum_count, sum_in_count, orgID)
+		if errThree != nil {
+			return errThree
+		}
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		advice.CountUnit = drup.MinUnit
+
+		AutoDrugDeliverInfoTwentyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)
+	}
+
+	return
+}