11月9日库存管理

controllers/dialysis_api_controller.go

@@ -76,6 +76,11 @@ func DialysisApiRegistRouters() {
 	//新接口
 	beego.Router("/api/patient/getpatientdialysissolutiongrouplist", &DialysisApiController{}, "Get:GetPatientDialysisSolutionGroupList")
 
+	beego.Router("/api/patient/getdialysisadvicetemplatelist", &DialysisApiController{}, "Get:GetDialysisAdviceTemplateList")
+
+	beego.Router("/api/patient/savedialysissetting", &DialysisApiController{}, "Get:SaveDialysisSetting")
+
+	beego.Router("/api/patient/getdialysissetting", &DialysisApiController{}, "Get:GetDialysisSetting")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -4218,6 +4223,7 @@ func (c *DialysisApiController) GetInitPrintDataOne() {
 	}
 }
 
+//新接口
 func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 
 	keyword := this.GetString("keywords")
@@ -4238,7 +4244,7 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
-	fmt.Println("err23233223232332323232", list)
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,
@@ -4251,3 +4257,121 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 		return
 	}
 }
+
+func (this *DialysisApiController) GetDialysisAdviceTemplateList() {
+
+	keyword := this.GetString("keywords")
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	partition_id, _ := this.GetInt64("partition_id")
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	start_time := this.GetString("schedule_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, total, err := service.GetDialysisAdviceTemplateList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
+
+	//获取长期医嘱
+	adviceList, _ := service.GetAllLongAdviceList(orgId)
+
+	//获取医嘱模版
+	templateList, _ := service.GetAllHisAdviceTemplateList(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":         list,
+			"total":        total,
+			"adviceList":   adviceList,
+			"templateList": templateList,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) SaveDialysisSetting() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	device_number_set, _ := this.GetInt64("device_number_set")
+	device_type_set, _ := this.GetInt64("device_type_set")
+	name_set, _ := this.GetInt64("name_set")
+	admission_number_set, _ := this.GetInt64("admission_number_set")
+	dialysis_no_set, _ := this.GetInt64("dialysis_no_set")
+	weight_befor_set, _ := this.GetInt64("weight_befor_set")
+	dry_weight_set, _ := this.GetInt64("dry_weight_set")
+	blood_pressure_set, _ := this.GetInt64("blood_pressure_set")
+	ultrafiltration_volume_set, _ := this.GetInt64("ultrafiltration_volume_set")
+	internal_fistula_set, _ := this.GetInt64("internal_fistula_set")
+	blood_flow_volume_set, _ := this.GetInt64("blood_flow_volume_set")
+	anticoagulant_set, _ := this.GetInt64("anticoagulant_set")
+	sealing_fluid_dispose_set, _ := this.GetInt64("sealing_fluid_dispose_set")
+	mode_id_set, _ := this.GetInt64("mode_id_set")
+	dialysis_time_set, _ := this.GetInt64("dialysis_time_set")
+	dialysis_dialyszers_set, _ := this.GetInt64("dialysis_dialyszers_set")
+	dialysis_irrigation_set, _ := this.GetInt64("dialysis_irrigation_set")
+	gaijiliang_set, _ := this.GetInt64("gaijiliang_set")
+	kalium_set, _ := this.GetInt64("kalium_set")
+	displace_liqui_value_set, _ := this.GetInt64("displace_liqui_value_set")
+	bicarbonate_set, _ := this.GetInt64("bicarbonate_set")
+	glucose_set, _ := this.GetInt64("glucose_set")
+
+	dialysisSetting := models.XtDialysisSetting{
+		UserOrgId:             orgId,
+		Status:                1,
+		DeviceNumber:          device_number_set,
+		DeviceType:            device_type_set,
+		Name:                  name_set,
+		AdmissionNumber:       admission_number_set,
+		DialysisNo:            dialysis_no_set,
+		WeightBefor:           weight_befor_set,
+		DryWeight:             dry_weight_set,
+		BloodPressure:         blood_pressure_set,
+		UltrafiltrationVolume: ultrafiltration_volume_set,
+		InternalFistula:       internal_fistula_set,
+		BloodFlowVolume:       blood_flow_volume_set,
+		Anticoagulant:         anticoagulant_set,
+		SealingFluidDispose:   sealing_fluid_dispose_set,
+		ModeId:                mode_id_set,
+		DialysisTime:          dialysis_time_set,
+		DialysisDialyszers:    dialysis_dialyszers_set,
+		DialysisIrrigation:    dialysis_irrigation_set,
+		Gaijiliang:            gaijiliang_set,
+		Kalium:                kalium_set,
+		DisplaceLiquiValue:    displace_liqui_value_set,
+		Bicarbonate:           bicarbonate_set,
+		Glucose:               glucose_set,
+		Ctime:                 time.Now().Unix(),
+		Mtime:                 time.Now().Unix(),
+	}
+	err := service.SaveDialysisSetting(dialysisSetting)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"dialysisSetting": dialysisSetting,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) GetDialysisSetting() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	dialysisSett, _ := service.GetDialysisSetting(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"dialysisSett": dialysisSett,
+	})
+	return
+}

controllers/secondary_order_api_contorller.go

@@ -1199,6 +1199,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 					}
 					service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
 				}
+
 			}
 
 			//耗材
@@ -1327,6 +1328,114 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 		}
 	}
 
+	//获取所有的入库仓库
+	druglist, _ := service.GetDrugWarehouseInfoStorehouseList(orgId)
+	for _, item := range druglist {
+		//查询该药品该仓库是否有数据
+		drug, _ := service.GetDrugStockCout(item.DrugId, item.StorehouseId, item.OrgId)
+
+		//查询该仓库该药品的入库数量
+		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
+		var sum_in_count int64
+		var flush_count int64
+		var sum_out_count int64
+		var cancel_out_count int64
+		//查询入库数量和剩余库存
+		infolist, _ := service.GetDrugWarehouseInfoByStorehouseId(item.StorehouseId, item.DrugId, item.OrgId)
+		for _, it := range infolist {
+			if it.MaxUnit == medical.MaxUnit {
+				it.WarehousingCount = it.WarehousingCount * medical.MinNumber
+				it.StockMaxNumber = it.StockMaxNumber * medical.MinNumber
+			}
+			sum_in_count += it.WarehousingCount
+			flush_count += it.StockMaxNumber + it.StockMinNumber
+		}
+
+		//获取出库数量
+		outinfolist, _ := service.GetDrugFlowStockOutCount(item.StorehouseId, item.DrugId, item.OrgId)
+		for _, it := range outinfolist {
+			if it.MaxUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
+			}
+			sum_out_count += it.Count
+		}
+
+		//获取退库数量
+		cancelinfolist, _ := service.GetDrugFlowStockCancelCount(item.StorehouseId, item.DrugId, item.OrgId)
+		for _, it := range cancelinfolist {
+			if it.MaxUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
+			}
+			cancel_out_count += it.Count
+		}
+
+		//新增
+		if drug.ID == 0 {
+			drugstock := models.XtDrugStockCount{
+				UserOrgId:      orgId,
+				StorehouseId:   item.StorehouseId,
+				SumInCount:     sum_in_count,
+				SumOutCount:    sum_out_count - cancel_out_count,
+				SumCancelCount: cancel_out_count,
+				DrugId:         item.DrugId,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Status:         1,
+				FlushCount:     flush_count,
+				SumActOutCount: sum_out_count,
+			}
+			service.CreateDrugStockCount(drugstock)
+		}
+	}
+
+	//获取入库数据
+	goodlist, _ := service.GetSendGoodInformation(orgId)
+	for _, it := range goodlist {
+		//查询是否有数据
+		_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)
+		//获取总退库数量
+		var cancel_count int64
+		var out_count int64
+		var act_count int64
+		//退库总数量
+		cancellist, _ := service.GetAllCancelCount(it.StorehouseId, it.GoodId, it.OrgId)
+		for _, item := range cancellist {
+			cancel_count += item.Count
+		}
+		//出库总数量
+		outlist, _ := service.GetAllStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+		for _, item := range outlist {
+			out_count += item.Count
+		}
+
+		//实际出库总数量
+		actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+		for _, item := range actlist {
+			act_count += item.Count
+		}
+
+		if errcode == gorm.ErrRecordNotFound {
+			good := models.XtGoodStockCount{
+				UserOrgId:        it.OrgId,
+				GoodId:           it.GoodId,
+				StorehouseId:     it.StorehouseId,
+				Status:           1,
+				Ctime:            time.Now().Unix(),
+				Mtime:            0,
+				StockInCount:     it.WarehousingCount,
+				StockOutCount:    out_count - cancel_count,
+				StockCancelCount: cancel_count,
+				FlushCount:       it.StockCount,
+				StockActOutCount: act_count,
+			}
+			service.CreateGoodCountSix(good)
+		}
+		if errcode == nil {
+			service.UpdateGoodCount(it.WarehousingCount, it.StockCount, out_count, it.StorehouseId, it.GoodId, it.OrgId, cancel_count, act_count)
+		}
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": 1,
 	})
@@ -1542,6 +1651,114 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 		}
 	}
 
+	//获取所有的入库仓库
+	druglist, _ := service.GetDrugWarehouseInfoStorehouseList(orgId)
+	for _, item := range druglist {
+		//查询该药品该仓库是否有数据
+		drug, _ := service.GetDrugStockCout(item.DrugId, item.StorehouseId, item.OrgId)
+
+		//查询该仓库该药品的入库数量
+		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
+		var sum_in_count int64
+		var flush_count int64
+		var sum_out_count int64
+		var cancel_out_count int64
+		//查询入库数量和剩余库存
+		infolist, _ := service.GetDrugWarehouseInfoByStorehouseId(item.StorehouseId, item.DrugId, item.OrgId)
+		for _, it := range infolist {
+			if it.MaxUnit == medical.MaxUnit {
+				it.WarehousingCount = it.WarehousingCount * medical.MinNumber
+				it.StockMaxNumber = it.StockMaxNumber * medical.MinNumber
+			}
+			sum_in_count += it.WarehousingCount
+			flush_count += it.StockMaxNumber + it.StockMinNumber
+		}
+
+		//获取出库数量
+		outinfolist, _ := service.GetDrugFlowStockOutCount(item.StorehouseId, item.DrugId, item.OrgId)
+		for _, it := range outinfolist {
+			if it.MaxUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
+			}
+			sum_out_count += it.Count
+		}
+
+		//获取退库数量
+		cancelinfolist, _ := service.GetDrugFlowStockCancelCount(item.StorehouseId, item.DrugId, item.OrgId)
+		for _, it := range cancelinfolist {
+			if it.MaxUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
+			}
+			cancel_out_count += it.Count
+		}
+
+		//新增
+		if drug.ID == 0 {
+			drugstock := models.XtDrugStockCount{
+				UserOrgId:      orgId,
+				StorehouseId:   item.StorehouseId,
+				SumInCount:     sum_in_count,
+				SumOutCount:    sum_out_count - cancel_out_count,
+				SumCancelCount: cancel_out_count,
+				DrugId:         item.DrugId,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Status:         1,
+				FlushCount:     flush_count,
+				SumActOutCount: sum_out_count,
+			}
+			service.CreateDrugStockCount(drugstock)
+		}
+	}
+
+	//获取入库数据
+	goodlist, _ := service.GetSendGoodInformation(orgId)
+	for _, it := range goodlist {
+		//查询是否有数据
+		_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)
+		//获取总退库数量
+		var cancel_count int64
+		var out_count int64
+		var act_count int64
+		//退库总数量
+		cancellist, _ := service.GetAllCancelCount(it.StorehouseId, it.GoodId, it.OrgId)
+		for _, item := range cancellist {
+			cancel_count += item.Count
+		}
+		//出库总数量
+		outlist, _ := service.GetAllStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+		for _, item := range outlist {
+			out_count += item.Count
+		}
+
+		//实际出库总数量
+		actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+		for _, item := range actlist {
+			act_count += item.Count
+		}
+
+		if errcode == gorm.ErrRecordNotFound {
+			good := models.XtGoodStockCount{
+				UserOrgId:        it.OrgId,
+				GoodId:           it.GoodId,
+				StorehouseId:     it.StorehouseId,
+				Status:           1,
+				Ctime:            time.Now().Unix(),
+				Mtime:            0,
+				StockInCount:     it.WarehousingCount,
+				StockOutCount:    out_count - cancel_count,
+				StockCancelCount: cancel_count,
+				FlushCount:       it.StockCount,
+				StockActOutCount: act_count,
+			}
+			service.CreateGoodCountSix(good)
+		}
+		if errcode == nil {
+			service.UpdateGoodCount(it.WarehousingCount, it.StockCount, out_count, it.StorehouseId, it.GoodId, it.OrgId, cancel_count, act_count)
+		}
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "1",
 	})

controllers/supply_order_api_contorller.go

@@ -2391,6 +2391,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 
 	for _, item := range warehousingInfo {
 		service.CreatedWarehouseingDetail(item)
+
 		//查询该机构默认仓库
 		storeConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
 		//查询剩余库存
@@ -2402,7 +2403,11 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 			sum_in_count += item.WarehousingCount
 		}
 		service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
+		//增加入库数量
+		service.AddGoodSumInCount(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId, item.WarehousingCount)
 
+		//更新剩余库存
+		service.UpdateGoodFlushCount(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId, sum_count)
 		warehousinginfo, _ := service.GetLastWarehousingInfo(item.GoodId)
 		flow := models.VmStockFlow{
 			WarehousingOrder:          item.WarehousingOrder,
@@ -2453,6 +2458,8 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 		}
 		service.UpdateMedicalSumCount(items.DrugId, sum_count, sum_in_count, items.OrgId)
 
+		//更新入库数量和剩余库存
+		service.UpdateDrugCount(houseConfig.DrugStorehouseOut, items.OrgId, items.DrugId, sum_in_count, sum_count)
 	}
 	fmt.Println(errs)
 	for _, items := range drugFlow {
@@ -3246,6 +3253,9 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 					sum_in_count += it.WarehousingCount
 				}
 				service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
+
+				//更新库存
+				service.UpdateDrugCount(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId, sum_in_count, sum_count)
 			}
 		} else {
 			for _, it := range goodOrder {
@@ -3540,11 +3550,24 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo, warehouse_out_id, id)
 			}
 
-			//修改原数据
-			/*	orderInfo := models.SpSupplierWarehousingCancelOrder{
-					SourceCount: item.SupplyCount - item.SourceCount,
-				}
-				service.UpdateSupplyCancelById(item.ID, orderInfo)*/
+			//查询默认仓库
+			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			//查询默认仓库剩余多少库存
+			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, drup.ID)
+			var sum_count int64
+			var sum_in_count int64
+			for _, it := range list {
+				baseDrug, _ := service.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
+			}
+			service.UpdateDrugCountOne(houseConfig.DrugStorehouseOut, orgId, drup.ID, sum_count)
+
 		}
 
 		//耗材
@@ -3638,6 +3661,17 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 				return
 			}
+			//查询该机构默认仓库
+			storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			//查询剩余库存
+			goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.ProjectId, orgId)
+			var sum_count int64
+			for _, item := range goodList {
+				sum_count += item.StockCount
+			}
+			//更新剩余库存
+			service.UpdateGoodFlushCount(storeConfig.StorehouseOutInfo, item.ProjectId, orgId, sum_count)
+
 		}
 	}
 	cancel := models.SpSupplierWarehouseCancel{
@@ -3723,6 +3757,8 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 	//获取退库单据日期
 	cancel, _ := service.GetReturnOrderById(id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 	if err == nil {
 		//获取退库单详情
 		list, _ := service.GetSupplyCancelOrderDetail(id, orgId)
@@ -3742,6 +3778,8 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 					var sum_count int64
 					sum_count = item.SupplyCount * base.MinNumber
 					service.ModifyDrugAddInformation(item.ProjectId, sum_count, orgId)
+					//出库数量减少
+					service.ReduceDrugSumOut(houseConfig.DrugStorehouseOut, orgId, item.ProjectId, sum_count)
 				}
 
 				if item.SupplyType == base.MinUnit && base.MaxUnit != base.MinUnit {
@@ -3750,6 +3788,9 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 					}
 					service.UpdateDrugWasehousringOne(item.ProjectId, item.SupplyWarehouseDetailInfo, drugInfo)
 					service.ModifyDrugAddInformation(item.ProjectId, item.SupplyCount, orgId)
+					//出库数量减少
+					service.ReduceDrugSumOut(houseConfig.DrugStorehouseOut, orgId, item.ProjectId, item.SupplyCount)
+
 				}
 
 				//删除流水
@@ -3761,6 +3802,23 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 				if len(drugOutList) == 0 {
 					service.UpdateDrugWarehouseById(drugOut.ID)
 				}
+
+				//查询默认仓库剩余多少库存
+				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ProjectId)
+				var sum_count int64
+				var sum_in_count int64
+				for _, it := range list {
+					baseDrug, _ := service.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
+				}
+				service.UpdateDrugCountOne(houseConfig.DrugStorehouseOut, orgId, item.ProjectId, sum_count)
+
 			}
 			//耗材
 			if item.IsSource == 2 {
@@ -3772,7 +3830,20 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 
 				//更改库存
 				err := service.UpdateWarehousingInfoById(item.ProjectId, item.SupplyWarehouseDetailInfo, info)
+
 				service.ModifyGoodAddInformation(item.ProjectId, item.SupplyCount, item.UserOrgId)
+
+				//扣减出库数量
+				service.ReduceGoodSumOutCount(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId, item.SupplyCount)
+
+				//查询剩余库存
+				goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId)
+				var sum_count int64
+				for _, item := range goodList {
+					sum_count += item.StockCount
+				}
+				//更新剩余库存
+				service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId, sum_count)
 				fmt.Println(err)
 				//删除出库记录
 				service.DeleteGoodWarehouseOut(item.ProjectId, item.WarehouseCancelId, orgId)

models/drug_stock.go

@@ -432,6 +432,7 @@ type DrugFlow struct {
 	IsRead                    int64                `gorm:"column:is_read" json:"is_read" form:"is_read"`
 	IsCheck                   int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	OverCount                 int64                `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	RetailPrice               float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 }
 
 func (DrugFlow) TableName() string {

models/new_stock_models.go

@@ -143,3 +143,37 @@ type NewBaseDrug struct {
 func (NewBaseDrug) TableName() string {
 	return "xt_base_drug"
 }
+
+type XtDialysisSetting 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"`
+	Status                int64 `gorm:"column:status" json:"status" form:"status"`
+	DeviceNumber          int64 `gorm:"column:device_number" json:"device_number" form:"device_number"`
+	DeviceType            int64 `gorm:"column:device_type" json:"device_type" form:"device_type"`
+	Name                  int64 `gorm:"column:name" json:"name" form:"name"`
+	AdmissionNumber       int64 `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	DialysisNo            int64 `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	WeightBefor           int64 `gorm:"column:weight_befor" json:"weight_befor" form:"weight_befor"`
+	DryWeight             int64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	BloodPressure         int64 `gorm:"column:blood_pressure" json:"blood_pressure" form:"blood_pressure"`
+	UltrafiltrationVolume int64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume" form:"ultrafiltration_volume"`
+	InternalFistula       int64 `gorm:"column:internal_fistula" json:"internal_fistula" form:"internal_fistula"`
+	BloodFlowVolume       int64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	Anticoagulant         int64 `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	SealingFluidDispose   int64 `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
+	ModeId                int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	DialysisTime          int64 `gorm:"column:dialysis_time" json:"dialysis_time" form:"dialysis_time"`
+	DialysisDialyszers    int64 `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation    int64 `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	Gaijiliang            int64 `gorm:"column:gaijiliang" json:"gaijiliang" form:"gaijiliang"`
+	Kalium                int64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	DisplaceLiquiValue    int64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
+	Bicarbonate           int64 `gorm:"column:bicarbonate" json:"bicarbonate" form:"bicarbonate"`
+	Glucose               int64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
+	Ctime                 int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDialysisSetting) TableName() string {
+	return "xt_dialysis_setting"
+}

service/dialysis_service.go

@@ -131,8 +131,7 @@ func GetTotalDialysisCout(orgid int64, patientid int64) (order []*models.Dialysi
 //临时医嘱
 func FindDoctorAdviceOrderById(orgID int64, patientsId int64, recordDate int64) (patient []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).
-		Where("patient_id = ? and user_org_id=? and status=1 and advice_date = ? and advice_type = 2", patientsId, orgID, recordDate).
-		Where("patient_id = ? and user_org_id=? and status=1 and record_date = ? and （advice_type = 2 or advice_type = 3)", patientsId, orgID, recordDate).
+		Where("patient_id = ? and user_org_id=? and status=1 and record_date = ? and (advice_type = 2 or advice_type = 3)", patientsId, orgID, recordDate).
 		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno, IF(parent_id > 0, parent_id, id) as advice_order").Order("start_time asc, groupno desc, advice_order desc, id asc").
 		Find(&patient).Error
 	return

service/dialysis_solution_service.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"XT_New/models"
-	"fmt"
 )
 
 func GetPatientSolutionGroupList(patient_id int64, orgid int64) (solution []*models.DialysisSolution, err error) {
@@ -70,8 +69,62 @@ func GetPatientDialysisSolutionGroupList(keywords string, limit int64, page int6
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).Find(&schedule).Error
 	}
-	fmt.Println("err2332232323233223232332", err)
-	fmt.Println("total99999999999999999999", total)
-	fmt.Println("scheudle23323233232", schedule)
+
+	return schedule, total, err
+}
+
+func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodSchedule, total int64, err error) {
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
+	offset := (page - 1) * limit
+	if scheduleDate > 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("partition_id = ?", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("user_org_id  = ?", orgID)
+	}
+
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+	} else {
+		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+	}
+
 	return schedule, total, err
 }
+
+func GetAllLongAdviceList(user_org_id int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and advice_type = 1 and status = 1", user_org_id).Find(&advice).Error
+	return advice, err
+}
+
+func GetAllHisAdviceTemplateList(user_org_id int64) (advice []*models.HisPrescriptionAdviceTemplate, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&advice).Error
+	return advice, err
+}
+
+func SaveDialysisSetting(setting models.XtDialysisSetting) error {
+
+	err := XTWriteDB().Create(&setting).Error
+	return err
+}
+
+func GetDialysisSetting(orgid int64) (models.XtDialysisSetting, error) {
+
+	setting := models.XtDialysisSetting{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&setting).Error
+	return setting, err
+}

service/secondary_service.go

@@ -1086,7 +1086,7 @@ func GetStoreHouseDrugWarehouseingInfo(id int64) (models.DrugWarehouseInfo, erro
 
 func GetDrugSumCountByStorehouseId(storehouse_id int64, orgid int64, drug_id int64) (info []*models.DrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Where("storehouse_id = ? and org_id = ? and status = 1 and (stock_max_number >0 or stock_min_number>0) and drug_id =? and is_check = 1", storehouse_id, orgid, drug_id).Find(&info).Error
+	err = XTReadDB().Where("storehouse_id = ? and org_id = ? and status = 1  and drug_id =? and is_check = 1", storehouse_id, orgid, drug_id).Find(&info).Error
 	return info, err
 }
 

service/stock_service.go

@@ -4855,7 +4855,7 @@ func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDr
 	if len(warehouse_out_id) > 0 {
 		db = db.Where("x.warehouse_out_id in(?)", warehouse_out_id)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,x.ctime,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.retail_price,x.product_date,x.expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,x.ctime,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
 	return out, err
 }
 
@@ -6519,6 +6519,7 @@ func ModifyDrugReduceInformationSix(drug_id int64, sum_count int64, orgid int64,
 
 	err = XTWriteDB().Model(&info).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count - ?", sum_count)).Error
 	err = XTWriteDB().Model(&info).Where("id=? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"batch_retai_price": batch_retai_price}).Error
+
 	return info, err
 }
 
@@ -7891,3 +7892,134 @@ func GetGoodDialysisOutInfo(orgid int64, patient_id int64, sys_record_time int64
 	err := XTReadDB().Where("org_id =? and patient_id = ? and record_time = ? and good_id = ? and status= 1", orgid, patient_id, sys_record_time, good_id).Find(&detail).Error
 	return detail, err
 }
+
+func AddGoodSumInCount(storehouse_id int64, good_id int64, user_org_id int64, count int64) error {
+
+	ut := XTWriteDB().Begin()
+
+	err := ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count + ?", count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func ReduceGoodSumInCount(storehouse_id int64, good_id int64, user_org_id int64, count int64) error {
+
+	ut := XTWriteDB().Begin()
+
+	err := ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count - ?", count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func UpdateGoodFlushCount(storehouse_id int64, good_id int64, user_org_id int64, flush_count int64) error {
+	ut := XTWriteDB().Begin()
+
+	err := ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func UpdateDrugCount(storehouse_id int64, user_org_id int64, drug_id int64, sum_in_count int64, flush_count int64) error {
+
+	ut := XTWriteDB().Begin()
+	err := ut.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and drug_id =?", storehouse_id, user_org_id, drug_id).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	err = ut.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and drug_id =?", storehouse_id, user_org_id, drug_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+
+	ut.Commit()
+	return err
+}
+
+func UpdateDrugCountOne(storehouse_id int64, user_org_id int64, drug_id int64, flush_count int64) error {
+
+	ut := XTWriteDB().Begin()
+	err = ut.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and drug_id =?", storehouse_id, user_org_id, drug_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+
+	ut.Commit()
+	return err
+}
+
+func AddDrugSumOutCount(storehouse_id int64, sum_out_count int64, user_org_id int64, drug_id int64) error {
+
+	ut := XTWriteDB().Begin()
+	err := ut.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and drug_id =?", storehouse_id, user_org_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count + ?", sum_out_count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	err = ut.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and drug_id =?", storehouse_id, user_org_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count + ?", sum_out_count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func ReduceDrugSumOut(storehouse_id int64, user_org_id int64, drug_id int64, sum_out_count int64) error {
+	ut := XTWriteDB().Begin()
+	err := ut.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and drug_id =?", storehouse_id, user_org_id, drug_id).UpdateColumn("sum_act_out_count", gorm.Expr("sum_act_out_count + ?", sum_out_count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func AddGoodSumOutCount(storehouse_id int64, good_id int64, user_org_id int64, count int64) error {
+	ut := XTWriteDB().Begin()
+	err := ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count + ?", count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	err = ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("sum_act_out_count", gorm.Expr("sum_act_out_count + ?", count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+
+	ut.Commit()
+	return err
+}
+
+func ReduceGoodSumOutCount(storehouse_id int64, good_id int64, user_org_id int64, count int64) error {
+	ut := XTWriteDB().Begin()
+	err := ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count - ?", count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	err = ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("sum_act_out_count", gorm.Expr("sum_act_out_count - ?", count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+
+	ut.Commit()
+	return err
+}

service/warhouse_service.go

@@ -3335,7 +3335,10 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 
 		//扣减库存
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
+		//出库数量增加
+		AddGoodSumOutCount(houseConfig.StorehouseOutInfo, warehouse.GoodId, warehouse.OrgId, goods.Count)
 		ModifyGoodReduceInformationSix(warehouse.GoodId, maxNumber, warehouse.OrgId, warehouse.PackingPrice)
+
 		if errThree != nil {
 			return errThree
 		}
@@ -3430,6 +3433,8 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 		if errThree != nil {
 			return errThree
 		}
+		//出库数量增加
+		AddGoodSumOutCount(houseConfig.StorehouseOutInfo, warehouse.GoodId, warehouse.OrgId, warehouse.StockCount)
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		goods.Count = deliver_number - stock_number
 
@@ -3458,11 +3463,17 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
-
+	var retail_price float64
 	if advice.CountUnit == drup.MaxUnit {
 		deliver_number = prescribingNumber * drup.MinNumber
+		formatInt := strconv.FormatInt(prescribingNumber, 10)
+		floatcount, _ := strconv.ParseFloat(formatInt, 64)
+		retail_price = floatcount * advice.Price
 	} else {
 		deliver_number = prescribingNumber
+		formatInt := strconv.FormatInt(prescribingNumber, 10)
+		floatcount, _ := strconv.ParseFloat(formatInt, 64)
+		retail_price = floatcount * advice.Price
 	}
 
 	// 根据先进先出原则，查询最先入库的批次，进行出库
@@ -3538,7 +3549,7 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 			ProductDate:             advice.ProductDate,
 			ExpireDate:              advice.ExpiryDate,
 			Count:                   deliver_number,
-			Price:                   advice.Price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               advice.OrgId,
@@ -3556,6 +3567,10 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 			SupplyWarehouseId:       warehouseout.SupplyWarehouseId,
 			SystemTime:              advice.SysRecordTime,
 			StorehouseId:            warehouse.StorehouseId,
+			WarehousingDetailId:     warehouse.ID,
+			WarehousingId:           warehouse.ID,
+			RetailPrice:             retail_price,
+			LastPrice:               warehouse.Price,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -3603,10 +3618,14 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 			var sum_count int64
 			sum_count = maxNumber * drup.MinNumber
 			ModifyDrugReduceInformationSix(warehouse.DrugId, sum_count, warehouse.OrgId, warehouse.RetailPrice)
+			//出库数量增加
+			AddDrugSumOutCount(houseConfig.DrugStorehouseOut, sum_count, warehouse.OrgId, warehouse.DrugId)
 		}
 
 		if warehouse.StockMinNumber > 0 {
 			ModifyDrugReduceInformationSix(warehouse.DrugId, minNumber, warehouse.OrgId, warehouse.RetailPrice)
+			//出库数量增加
+			AddDrugSumOutCount(houseConfig.DrugStorehouseOut, minNumber, warehouse.OrgId, warehouse.DrugId)
 		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
@@ -3662,7 +3681,7 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 			ProductDate:             advice.ProductDate,
 			ExpireDate:              advice.ExpiryDate,
 			Count:                   stock_number,
-			Price:                   advice.Price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               advice.OrgId,
@@ -3680,16 +3699,22 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 			SupplyWarehouseId:       warehouseout.SupplyWarehouseId,
 			SystemTime:              advice.SysRecordTime,
 			StorehouseId:            warehouse.StorehouseId,
+			WarehousingDetailId:     warehouse.ID,
+			WarehousingId:           warehouse.ID,
+			RetailPrice:             retail_price,
+			LastPrice:               warehouse.Price,
 		}
 		CreateDrugFlowOne(drugflow)
 		if warehouse.StockMaxNumber > 0 {
 			var sum_count int64
 			sum_count = warehouse.StockMaxNumber * drup.MinNumber
 			ModifyDrugReduceInformationSix(warehouse.DrugId, sum_count, warehouse.OrgId, warehouse.RetailPrice)
+			AddDrugSumOutCount(houseConfig.DrugStorehouseOut, sum_count, warehouse.OrgId, warehouse.DrugId)
 		}
 
 		if warehouse.StockMinNumber > 0 {
 			ModifyDrugReduceInformationSix(warehouse.DrugId, warehouse.StockMinNumber, warehouse.OrgId, warehouse.RetailPrice)
+			AddDrugSumOutCount(houseConfig.DrugStorehouseOut, warehouse.StockMinNumber, warehouse.OrgId, warehouse.DrugId)
 		}
 
 		// 出库完成后，要将该批次库存清零
@@ -5443,11 +5468,17 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
-
+	var retail_price float64
 	if advice.CountUnit == drup.MaxUnit {
 		deliver_number = prescribingNumber * drup.MinNumber
+		formatInt := strconv.FormatInt(prescribingNumber, 10)
+		floatcount, _ := strconv.ParseFloat(formatInt, 64)
+		retail_price = floatcount * advice.Price
 	} else {
 		deliver_number = prescribingNumber
+		formatInt := strconv.FormatInt(prescribingNumber, 10)
+		floatcount, _ := strconv.ParseFloat(formatInt, 64)
+		retail_price = floatcount * advice.Price
 	}
 
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
@@ -5586,6 +5617,8 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			StockCount:              advice.StockCount,
 			WarehousingDetailId:     warehouse.ID,
 			OverCount:               over_count,
+			RetailPrice:             retail_price, //手动出库出库价格
+			WarehousingId:           warehouse.ID,
 		}
 		if warehouse.RetailPrice == 0 {
 			drugflow.Price = advice.Price
@@ -5599,7 +5632,9 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 		return nil
 
 	} else {
-
+		stock_number_int := strconv.FormatInt(stock_number, 10)
+		stock_number_int_count, _ := strconv.ParseFloat(stock_number_int, 64)
+		retail_price = stock_number_int_count * advice.Price
 		//扣减库存
 		warehouse.StockMaxNumber = 0
 		warehouse.StockMinNumber = 0
@@ -5648,6 +5683,9 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			LastPrice:               warehouse.Price,
 			StockCount:              advice.StockCount,
 			OverCount:               over_count,
+			RetailPrice:             retail_price, //手动出库出库价格
+			WarehousingId:           warehouse.ID,
+			WarehousingDetailId:     warehouse.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)