耗材参数

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		//userAdmin.ModifyTime = 1530786071
 		//var subscibe models.ServeSubscibe
 		//subscibe.ID = 1
-		//subscibe.OrgId = 4
+		//subscibe.OrgId = 9671
 		//subscibe.PeriodStart = 1538035409
 		//subscibe.PeriodEnd = 1569571409
 		//subscibe.State = 1
@@ -91,8 +91,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		//subscibes[4] = &subscibe
 		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 4
-		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.CurrentOrgId = 9671
+		//adminUserInfo.CurrentAppId = 9671
 		//adminUserInfo.AdminUser = &userAdmin
 		//adminUserInfo.Subscibes = subscibes
 		//this.SetSession("admin_user_info", &adminUserInfo)
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		//userAdmin.ModifyTime = 1530786071
 		//var subscibe models.ServeSubscibe
 		//subscibe.ID = 1
-		//subscibe.OrgId = 4
+		//subscibe.OrgId = 9671
 		//subscibe.PeriodStart = 1538035409
 		//subscibe.PeriodEnd = 1569571409
 		//subscibe.State = 1
@@ -337,8 +337,8 @@ func (this *BaseServeAPIController) Prepare() {
 		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		//subscibes[4] = &subscibe
 		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 4
-		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.CurrentOrgId = 9671
+		//adminUserInfo.CurrentAppId = 9671
 		//adminUserInfo.AdminUser = &userAdmin
 		//adminUserInfo.Subscibes = subscibes
 		//this.SetSession("admin_user_info", &adminUserInfo)

controllers/drug_stock_api_contorller.go

@@ -1183,13 +1183,6 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 
-				//if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
-				//	utils.ErrorLog("last_price")
-				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-				//	return
-				//}
-				//last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
-				//fmt.Println(last_price)
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 				total := float64(count) * price
@@ -1233,8 +1226,9 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					}
 
 				}
-
+				fmt.Println("孟子", warehouseOut.ID)
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
+
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseOut.ID,
 					DrugId:                  drug_id,
@@ -1259,10 +1253,11 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					WarehouseInfoId:         warehouse_info_id,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+				fmt.Println("hhhhhhhhhhhhhhhh", warehouseOut.ID)
 
 				drugflow := &models.DrugFlow{
 					WarehouseOutId:          warehouseOut.ID,
-					WarehouseOutOrderNumber: warehousing_out_order,
+					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					DrugId:                  drug_id,
 					Number:                  number,
 					ProductDate:             productDates,
@@ -1344,6 +1339,10 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			return
 		} else {
 			service.AddSigleDrugWarehouseOut(&warehouseOut)
+			list, _ := service.GetLastWarehouseOut(adminUserInfo.CurrentOrgId)
+			for _, item := range drugFlow {
+				item.WarehouseOutId = list.ID
+			}
 			service.CreateDrugFlow(drugFlow)
 			// 出库流程
 			// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
@@ -2138,7 +2137,20 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 				batch_number := items["batch_number"].(string)
 				max_unit := items["max_unit"].(string)
 				batch_number_id := int64(items["batch_number_id"].(float64))
-
+				var manufacturer_id int64
+				var dealer_id int64
+				manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+				dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
+				for _, item := range manufacturerList {
+					if manufacturer == item.ManufacturerName {
+						manufacturer_id = item.ID
+					}
+				}
+				for _, item := range dealerList {
+					if dealer == item.DealerName {
+						dealer_id = item.ID
+					}
+				}
 				fmt.Println("99999999999999999999", batch_number_id)
 				cancelStockInfo := &models.DrugCancelStockInfo{
 					OrderNumber:      cancelStock.OrderNumber,
@@ -2182,8 +2194,8 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 					IsEdit:                  0,
 					CancelStockId:           cancelStock.ID,
 					CancelOrderNumber:       cancelStock.OrderNumber,
-					Manufacturer:            0,
-					Dealer:                  0,
+					Manufacturer:            manufacturer_id,
+					Dealer:                  dealer_id,
 					Creator:                 adminUserInfo.AdminUser.Id,
 					UpdateCreator:           0,
 					Status:                  1,

controllers/gobal_config_api_controller.go

@@ -1682,14 +1682,17 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 	keyword := c.GetString("keyword")
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
+	orderPrint, _ := service.GetDrugCancelOrderPrint(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword)
 	order, total, err := service.GetDrugCancelOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order": order,
-		"total": total,
+		"order":      order,
+		"total":      total,
+		"orderPrint": orderPrint,
 	})
 }
 
@@ -1850,9 +1853,6 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 	}
 	adminUserInfo := c.GetAdminUserInfo()
 
-	//查询入库数量
-	//list, total, err := service.GetDrugStockList(page, limit, keyword, drug_type, startTime, endTime, adminUserInfo.CurrentOrgId)
-
 	list, total, err := service.GetAllBaseDurgListCount(page, limit, keyword, drug_type, startTime, endTime, adminUserInfo.CurrentOrgId)
 	fmt.Println("total232323232323232232323", total)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
@@ -2035,10 +2035,10 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 	start_time, _ := c.GetInt64("start_time")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetSingleOrderDetail(id, orgId)
-	outList, err := service.GetAllSingleDrugDetail(id, orgId)
 	dealerList, err := service.GetAllDealerList(orgId)
 	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	drugFlowList, _ := service.GetDrugStockFlowDetail(start_time, orgId)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -2047,7 +2047,6 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 		"list":             list,
 		"dealerList":       dealerList,
 		"manufacturerList": manufacturerList,
-		"outList":          outList,
 		"drugFlowList":     drugFlowList,
 	})
 }

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1702,6 +1702,8 @@ func (this *DialysisAPIController) StartDialysis() {
 	change_nurse, _ := this.GetInt64("change_nurse")
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
+	zone_id, _ := this.GetInt64("zone_id")
+	fmt.Println("zone23333232323232232332232323", zone_id)
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1872,9 +1874,19 @@ func (this *DialysisAPIController) StartDialysis() {
 		ChangeNurse:            change_nurse,
 		DifficultPunctureNurse: difficult_puncture_nurse,
 		NewFistulaNurse:        new_fistula_nurse,
+		ZoneId:                 zone_id,
+	}
+	//查询该床位是否有人用了
+	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
+	if errorscode == gorm.ErrRecordNotFound {
+		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
+		if createErr != nil {
+			this.ErrorLog("上机失败：%v", createErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 	}
 
-	createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
 	newdialysisRecord, getRecordErr := service.MobileGetDialysisRecord(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 
 	var tempdispose string
@@ -1969,11 +1981,6 @@ func (this *DialysisAPIController) StartDialysis() {
 		http.PostForm(api, values)
 	}()
 
-	if createErr != nil {
-		this.ErrorLog("上机失败：%v", createErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"dialysis_order": newdialysisRecord,
 		"monitor":        record,

controllers/self_drug_api_congtroller.go

@@ -74,7 +74,7 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/savedrugcheckinventory", &SelfDrugApiController{}, "Get:SaveDrugCheckInventory")
 	beego.Router("/api/drug/getdruginventorydetail", &SelfDrugApiController{}, "Get:GetDrugInventoryDetail")
 	beego.Router("/api/drug/modifyinventory", &SelfDrugApiController{}, "Get:ModifyInventory")
-	beego.Router("/api/drug/deletedruginventory", &SelfDrugApiController{}, "Delete:DeleteDrugInventory")
+	beego.Router("/api/drug/deletedruginventory", &SelfDrugApiController{}, "Get:DeleteDrugInventory")
 	beego.Router("/api/drug/getdruginventoryprintlist", &SelfDrugApiController{}, "Get:GetDrugInventoryPrintList")
 	beego.Router("/api/drug/getinventorydetaillist", &SelfDrugApiController{}, "Get:GetDrugInventoryDetailList")
 	beego.Router("/api/drug/savedrugproofinventory", &SelfDrugApiController{}, "Get:SaveDrugProofInventory")
@@ -1869,14 +1869,6 @@ func (this *SelfDrugApiController) SaveDrugInventory() {
 
 			numbers := items["number"].(string)
 
-			//if items["batch_number"] == nil || reflect.TypeOf(items["batch_number"]).String() != "string" {
-			//	utils.ErrorLog("batch_number")
-			//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			//	return
-			//}
-			//
-			//batch_number := items["batch_number"].(string)
-
 			if items["warehouse_info_id"] == nil || reflect.TypeOf(items["warehouse_info_id"]).String() != "float64" {
 				utils.ErrorLog("warehouse_info_id")
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1891,6 +1883,11 @@ func (this *SelfDrugApiController) SaveDrugInventory() {
 			}
 
 			total := items["total"].(string)
+
+			drug_origin_place := items["drug_origin_place"].(string)
+
+			min_count := int64(items["min_count"].(float64))
+			min_unit := items["min_unit"].(string)
 			inventory := models.XtDrugInventory{
 
 				DrugName:          drug_name,
@@ -1921,6 +1918,9 @@ func (this *SelfDrugApiController) SaveDrugInventory() {
 				//BatchNumber:       batch_number,
 				Total:           total,
 				WarehouseInfoId: warehouse_info_id,
+				DrugOriginPlace: drug_origin_place,
+				MinUnit:         min_unit,
+				MinCount:        min_count,
 			}
 			err = service.CreateDrugInventory(inventory)
 			fmt.Println(err)
@@ -2026,7 +2026,7 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 		lastInfo, _ := service.GetLastDrugWarehouseInfo(item.DrugId)
 		firstInfo, _ := service.GetFirstDrugWarehouseInfo(item.DrugId)
 		stock_total = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
-		proof_count = item.StockMaxNumber*drug.MinNumber + item.StockMinNumber
+		proof_count = item.Count*drug.MinNumber + item.MinCount
 
 		//判断 如果库存数量 大于盘点库存，则出库
 		if stock_total > proof_count {
@@ -2231,6 +2231,8 @@ func (this *SelfDrugApiController) ModifyInventory() {
 	stock_max_number, _ := this.GetInt64("stock_max_number")
 	stock_min_number, _ := this.GetInt64("stock_min_number")
 	warehouse_info_id, _ := this.GetInt64("warehouse_info_id")
+	min_count, _ := this.GetInt64("min_count")
+	min_unit := this.GetString("min_unit")
 	inventory := models.XtDrugInventory{
 		DrugName:          drug_name,
 		SpecificationName: specification_name,
@@ -2248,6 +2250,8 @@ func (this *SelfDrugApiController) ModifyInventory() {
 		StockMaxNumber:    stock_max_number,
 		StockMinNumber:    stock_min_number,
 		WarehouseInfoId:   warehouse_info_id,
+		MinCount:          min_count,
+		MinUnit:           min_unit,
 	}
 	err := service.ModifyDrugInventory(id, inventory)
 	if err != nil {

controllers/stock_in_api_controller.go

@@ -1828,7 +1828,7 @@ func (c *StockManagerApiController) CreateCancelStock() {
 		ReturnTime:  cancelStockDate.Unix(),
 		Type:        types,
 	}
-	service.AddSigleCancelStock(&cancelStock)
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -1973,17 +1973,8 @@ func (c *StockManagerApiController) CreateCancelStock() {
 
 	for _, item := range cancelStockInfos {
 
-		////查找该耗材是否有出库记录
-		//_, errcode := service.GetWarehoureOutOrderInfo(item.GoodId, item.OrgId)
-		//if errcode == gorm.ErrRecordNotFound {
-		//	c.ServeSuccessJSON(map[string]interface{}{
-		//		"msg": "1",
-		//	})
-		//	return
-		//}
-
-		//统计该耗材的出库数量
-		info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId)
+		//统计该批次耗材的出库数量
+		info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
 		fmt.Println("2333223323322332233223322323", item.Count, info.Count)
 		if item.Count > info.Count {
 			service.UpdateCancelInfo(item.CancelStockId)
@@ -2004,7 +1995,14 @@ func (c *StockManagerApiController) CreateCancelStock() {
 		}
 
 		if item.Count <= infolist.WarehousingCount {
-
+			_, msgerrkonde := service.GetCancelStockDetailByOrderNumber(orderNumber, adminUserInfo.CurrentOrgId)
+			if msgerrkonde == gorm.ErrRecordNotFound {
+				service.AddSigleCancelStock(&cancelStock)
+			}
+			listcancel, _ := service.GetLastCancelStockById(adminUserInfo.CurrentOrgId)
+			for _, it := range cancelStockInfos {
+				it.CancelStockId = listcancel.ID
+			}
 			errs := service.CreateCancelStockInfo(cancelStockInfos)
 			if len(stockFLow) > 0 {
 				service.CreateStockFlow(stockFLow)
@@ -2025,12 +2023,6 @@ func (c *StockManagerApiController) CreateCancelStock() {
 			}
 			//更改入库数量
 			errs = service.UpdateWareInfoById(item.WarehouseInfoId, item.Count)
-
-			//查询该耗材的入库记录
-			//list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
-			////调用退库的方法
-			//parseDateErr := service.UpdateCancelOut(list, item.Count)
-			//fmt.Println("999999999999", parseDateErr)
 			break
 		}
 	}
@@ -2379,7 +2371,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 		for _, item := range cancelStockInfos {
 			//统计该耗材的出库数量
-			info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId)
+			info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
 			if item.Count > info.Count {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "2",
@@ -2667,10 +2659,12 @@ func (this *StockManagerApiController) GetDetailInfo() {
 		}
 	} else if types == 4 {
 		list3, total, err = service.FindCancelDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer)
+		listGroup, err := service.FindeCancelGroup(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"list":  list3,
-				"total": total,
+				"list":      list3,
+				"total":     total,
+				"listgroup": listGroup,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -5734,6 +5728,7 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 				StockCount:       item.Count - list.StockCount,
 				Dealer:           dealer_id,
 				LicenseNumber:    info.LicenseNumber,
+				WarehouseInfoId:  item.WarehousingInfoId,
 			}
 
 			flow := models.VmStockFlow{

models/dialysis.go

@@ -802,6 +802,7 @@ type DialysisOrder struct {
 	ChangeNurse            int64         `gorm:"column:change_nurse" json:"change_nurse" form:"change_nurse"`
 	DifficultPunctureNurse int64         `gorm:"column:difficult_puncture_nurse" json:"difficult_puncture_nurse" form:"difficult_puncture_nurse"`
 	NewFistulaNurse        int64         `gorm:"column:new_fistula_nurse" json:"new_fistula_nurse" form:"new_fistula_nurse"`
+	ZoneId                 int64         `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
 }
 
 func (DialysisOrder) TableName() string {

models/self_drug_models.go

@@ -504,6 +504,7 @@ type BloodDrugCancelStockInfo struct {
 	MinNumber        int64   `json:"min_number"`
 	Dose             float64 `json:"dose"`
 	DoseUnit         string  `json:"dose_unit"`
+	Unit             string  `json:"unit"`
 }
 
 type BloodDrugSalesReturnInfo struct {
@@ -799,6 +800,8 @@ type XtDrugInventory struct {
 	ProofCount        int64   `gorm:"column:proof_count" json:"proof_count" form:"proof_count"`
 	StockMaxNumber    int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
 	StockMinNumber    int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	MinCount          int64   `gorm:"column:min_count" json:"min_count" form:"min_count"`
+	MinUnit           string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 }
 
 func (XtDrugInventory) TableName() string {
@@ -834,6 +837,9 @@ type VmDrugInventory struct {
 	DoseUnit          string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	MaxUnit           string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinUnit           string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MinCount          int64   `gorm:"column:min_count" json:"min_count" form:"min_count"`
 	Total             string  `gorm:"column:total" json:"total" form:"total"`
+	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
 	DrugOriginPlace   string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
 }

models/stock_models.go

@@ -130,6 +130,7 @@ type WarehousingInfo struct {
 	GoodInfo         GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 	Type             int64       `gorm:"column:type" json:"type"`
 	LicenseNumber    string      `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	WarehouseInfoId  int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 }
 
 func (WarehousingInfo) TableName() string {

service/gobal_config_service.go

@@ -339,6 +339,37 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 	return outinfo, total, err
 }
 
+func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string) (info []*models.BloodDrugCancelStockInfo, err error) {
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Table("xt_drug_cancel_stock_info as x").Where("x.status =1")
+	dbOne := XTReadDB().Table("xt_base_drug as s").Where("s.status =1")
+	dbTwo := XTReadDB().Table("xt_drug_cancel_stock as t").Where("t.status = 1")
+	fmt.Print(dbOne, dbTwo)
+	if startime > 0 {
+		db = db.Where("x.ctime >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if orderType > 0 {
+		db = db.Where("x.type = ? ", orderType)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("x.order_number like ? or s.drug_spec like ? or t.creater like ?", likeKey, likeKey, likeKey)
+	}
+
+	if manufacturerId > 0 {
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
+	} else {
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
+	}
+
+	return info, err
+}
+
 func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64) (cancel []*models.BloodDrugCancelStockInfo, total int64, err error) {
 
 	likeKey := "%" + keyword + "%"
@@ -364,9 +395,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	} else {
-		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	}
 
 	return cancel, total, err
@@ -757,9 +788,9 @@ func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouse
 	return info, err
 }
 
-func GetDrugStockFlowDetail(id int64, orgid int64) (drugflow []*models.XtDrugAutomaticReduceDetail, err error) {
+func GetDrugStockFlowDetail(record_time int64, orgid int64) (drugflow []*models.XtDrugAutomaticReduceDetail, err error) {
 
-	err = XTReadDB().Where("record_time = ? and org_id = ? and status = 1", id, orgid).Find(&drugflow).Error
+	err = XTReadDB().Where("record_time = ? and org_id = ? and status = 1", record_time, orgid).Preload("XtBaseDrug", "status = 1").Find(&drugflow).Error
 	return drugflow, err
 }
 

service/manage_service.go

@@ -813,9 +813,8 @@ func GetUserForm(id int64, orgId int64, limit int64, page int64) (infor []*model
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Scan(&infor).Error
+	err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date desc").Scan(&infor).Error
 	if err != nil {
-
 		return
 	}
 	return

service/self_drug_service.go

@@ -829,23 +829,7 @@ func CreateDrugPrice(price models.XtDrugAdjustPrice) error {
 }
 
 func GetDrugPriceList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.VmDrugAdjustPrice, total int64, err error) {
-	//likeKey := "%" + keyword + "%"
-	//offset := (page - 1) * limit
-	//db := XTReadDB().Model(&adjust).Where("status = 1")
-	//if startime > 0 {
-	//	db = db.Where("ctime >=?", startime)
-	//}
-	//if endtime > 0 {
-	//	db = db.Where("ctime<=?", endtime)
-	//}
-	//if orgId > 0 {
-	//	db = db.Where("user_org_id = ?", orgId)
-	//}
-	//if len(keyword) > 0 {
-	//	db = db.Where("warehousing_order like ?", likeKey)
-	//}
-	//err = db.Count(&total).Offset(offset).Limit(limit).Find(&adjust).Error
-	//return adjust, total, err
+
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_drug_adjust_price as x").Where("x.status = 1")
@@ -858,6 +842,12 @@ func GetDrugPriceList(startime int64, endtime int64, orgId int64, keyword string
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
 	err = db.Group("x.id").Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.number").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
 	return adjust, total, err
 
@@ -990,7 +980,7 @@ func GetDrugInventoryList(keyword string, page int64, limit int64, orgid int64,
 	if endtime > 0 {
 		db = db.Where("x.start_time<=?", endtime)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.min_count,x.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 
@@ -1042,7 +1032,7 @@ func GetDrugInventoryDetail(id int64) (models.XtDrugInventory, error) {
 
 func ModifyDrugInventory(id int64, info models.XtDrugInventory) error {
 
-	err := XTWriteDB().Model(&info).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": info.DrugName, "specification_name": info.SpecificationName, "warehousing_unit": info.WarehousingUnit, "count": info.Count, "last_price": info.LastPrice, "manufacturer": info.Manufacturer, "remark": info.Remark, "drug_id": info.DrugId, "warehousing_order": info.WarehousingOrder, "number": info.Number, "total": info.Number, "drug_origin_place": info.DrugOriginPlace, "stock_max_number": info.StockMaxNumber, "stock_min_number": info.StockMinNumber, "warehouse_info_id": info.WarehouseInfoId}).Error
+	err := XTWriteDB().Model(&info).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": info.DrugName, "specification_name": info.SpecificationName, "warehousing_unit": info.WarehousingUnit, "count": info.Count, "last_price": info.LastPrice, "manufacturer": info.Manufacturer, "remark": info.Remark, "drug_id": info.DrugId, "warehousing_order": info.WarehousingOrder, "number": info.Number, "total": info.Number, "drug_origin_place": info.DrugOriginPlace, "stock_max_number": info.StockMaxNumber, "stock_min_number": info.StockMinNumber, "warehouse_info_id": info.WarehouseInfoId, "min_count": info.MinCount, "min_unit": info.MinUnit}).Error
 	return err
 }
 
@@ -1072,7 +1062,7 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,t.dose,t.dose_unit,t.max_unit,t.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,t.dose,t.dose_unit,t.max_unit,x.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 

service/statistics_service/index_evaluation_service.go

@@ -1276,12 +1276,16 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 	var NewTotalSix int64
 	var NewTotalSeven int64
 	var NewTotalEight int64
+	var NewTotalNight int64
+	var NewTotalTen int64
 
 	db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ?", user_org_id, start_time, end_time).Count(&NewTotalOne)
 	db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ?", user_org_id, start_time, end_time).Count(&NewTotalFive)
 	db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ?", user_org_id, start_time, end_time).Count(&NewTotalSix)
 	db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ?", user_org_id, start_time, end_time).Count(&NewTotalSeven)
 	db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ?", user_org_id, start_time, end_time).Count(&NewTotalEight)
+	db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ?", user_org_id, start_time, end_time).Count(&NewTotalNight)
+	db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ?", user_org_id, start_time, end_time).Count(&NewTotalTen)
 	db.Table("xt_monitoring_record as monitor ").Joins("join xt_schedule sch On sch.schedule_date = monitor.monitoring_date AND sch.patient_id = monitor.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("monitor.user_org_id = ? AND monitor.status = 1  AND monitor.monitoring_date >= ? AND monitor.monitoring_date <= ?", user_org_id, start_time, end_time).Count(&NewTotalThree)
 	db.Table("xt_treatment_summary as summary").Joins("join xt_schedule sch On sch.schedule_date = summary.assessment_date AND sch.patient_id = summary.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("summary.user_org_id = ? AND summary.status = 1  AND summary.assessment_date >= ? AND summary.assessment_date <= ?", user_org_id, start_time, end_time).Count(&NewTotalFour)
 
@@ -1389,6 +1393,34 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 
 		}
 		break
+	case 8:
+		for _, item := range datas {
+			var Total int64
+			db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.finish_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&Total)
+			item.FinshNurserCount = Total
+			if math.IsNaN(float64(item.FinshNurserCount) / float64(NewTotalNight)) {
+				item.FinshNurseRatio = "0.0"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.FinshNurserCount)/float64(NewTotalNight))*100), 64)
+				item.FinshNurseRatio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
+
+		}
+		break
+	case 9:
+		for _, item := range datas {
+			var Total int64
+			db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.washpipe_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&Total)
+			item.WashpipeNurserCount = Total
+			if math.IsNaN(float64(item.WashpipeNurserCount) / float64(NewTotalTen)) {
+				item.WashpipeNurseRatio = "0.0"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.WashpipeNurserCount)/float64(NewTotalTen))*100), 64)
+				item.WashpipeNurseRatio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
+
+		}
+		break
 
 	}
 

service/stock_service.go

@@ -517,6 +517,13 @@ func FindeLastWarehouseInfo(id int64) (models.DrugWarehouseInfo, error) {
 	return info, err
 }
 
+func GetLastWarehouseOut(orgid int64) (models.DrugWarehouseOut, error) {
+
+	out := models.DrugWarehouseOut{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Last(&out).Error
+	return out, err
+}
+
 func CreateDrugFlow(drugflow []*models.DrugFlow) (err error) {
 	if len(drugflow) > 0 {
 		utx := writeDb.Begin()
@@ -525,6 +532,7 @@ func CreateDrugFlow(drugflow []*models.DrugFlow) (err error) {
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range drugflow {
+				fmt.Println("hhhhhh", info.WarehouseOutId)
 				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.DrugId)
@@ -1486,12 +1494,31 @@ func FindWarehouseInfoByGoodTypeId(good_type_id int64) (models.WarehousingInfo,
 
 }
 
+func GetCancelStockDetailByOrderNumber(ordernumber string, orgid int64) (*models.CancelStock, error) {
+
+	stock := models.CancelStock{}
+	err := XTReadDB().Where("order_number = ? and org_id = ? and status = 1", ordernumber, orgid).Find(&stock).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &stock, nil
+}
+
 func AddSigleCancelStock(cancelStock *models.CancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
 
 }
 
+func GetLastCancelStockById(orgid int64) (models.CancelStock, error) {
+	stock := models.CancelStock{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Last(&stock).Error
+	return stock, err
+}
+
 func AddSigleDrugCancelStock(cancelStock *models.DrugCancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
@@ -2410,6 +2437,35 @@ func FindSalesReturnDetailList(orgId int64, page int64, limit int64, startTime i
 	return
 }
 
+func FindeCancelGroup(orgId int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64) (list []*models.CancelStockInfo, err error) {
+	db := readDb.Model(&models.CancelStockInfo{})
+	db = db.Where("xt_cancel_stock_info.org_id = ? AND xt_cancel_stock_info.status = 1", orgId)
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Joins("join xt_cancel_stock on xt_cancel_stock.id = xt_cancel_stock_info.cancel_stock_id AND xt_cancel_stock.return_time >=? AND xt_cancel_stock.return_time<= ? AND xt_cancel_stock.status = 1 AND xt_cancel_stock.org_id = ?", startTime, endTime, orgId)
+		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_cancel_stock.creater")
+		db = db.Joins("join xt_good_information on xt_good_information.id = xt_cancel_stock_info.good_id")
+
+		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_cancel_stock_info.order_number LIKE ? OR xt_good_information.specification_name LIKE ?", likeKey, likeKey, likeKey).Group("xt_cancel_stock_info.id")
+	} else {
+		db = db.Joins("join xt_cancel_stock on xt_cancel_stock.id = xt_cancel_stock_info.cancel_stock_id AND xt_cancel_stock.return_time >=? AND xt_cancel_stock.return_time<= ? ", startTime, endTime)
+	}
+
+	if manufacturer > 0 {
+		db = db.Joins("join xt_cancel_stock as cs on cs.id = xt_cancel_stock_info.cancel_stock_id AND cs.manufacturer =?", manufacturer)
+	}
+
+	if order_type > 0 {
+		db = db.Where("xt_cancel_stock_info.type = ?", order_type)
+	}
+
+	db = db.Preload("CancelStock", "status = 1 AND org_id = ?", orgId)
+	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
+
+	err = db.Group("xt_cancel_stock_info.good_id").Order("xt_cancel_stock_info.ctime desc").Find(&list).Error
+	return
+}
+
 func FindCancelDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64) (list []*models.CancelStockInfo, total int64, err error) {
 	db := readDb.Model(&models.CancelStockInfo{})
 	db = db.Where("xt_cancel_stock_info.org_id = ? AND xt_cancel_stock_info.status = 1", orgId)
@@ -3776,7 +3832,7 @@ func GetWarehoureOutOrderInfo(goodid int64, orgid int64) (*models.WarehouseOutIn
 	return &info, nil
 }
 
-func GetWarehoureOrderInfoCount(goodid int64, orgid int64) (info models.WarehouseOutInfo, err error) {
+func GetWarehoureOrderInfoCount(goodid int64, orgid int64, id int64) (info models.WarehouseOutInfo, err error) {
 
 	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status =1")
 	if goodid > 0 {
@@ -3785,6 +3841,9 @@ func GetWarehoureOrderInfoCount(goodid int64, orgid int64) (info models.Warehous
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
+	if id > 0 {
+		db = db.Where("x.warehouse_info_id = ?", id)
+	}
 	err = db.Select("x.good_id,sum(x.count) as count").Scan(&info).Error
 	return info, err
 }
@@ -4048,7 +4107,7 @@ func GetStockFlowList(limit int64, page int64, consumable_type int64, orgId int6
 		db = db.Where("good_id = ?", good_id)
 	}
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Find(&flow).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&flow).Error
 
 	return flow, total, err
 }
@@ -4492,10 +4551,10 @@ func GetInventorylist(startime int64, endtime int64, page int64, limit int64, in
 	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
 	fmt.Println(table, tab)
 	if startime > 0 {
-		db = db.Where("x.start_time>=?", startime)
+		db = db.Where("x.ctime>=?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("x.end_time<=?", endtime)
+		db = db.Where("x.ctime<=?", endtime)
 	}
 	if len(keyword) > 0 {
 		db = db.Where("x.warehousing_order like ? or r.user_name like ?", likeKey, likeKey)
@@ -4532,7 +4591,14 @@ func GetInventoryDetailById(id []string) (list []*models.XtStockInventory, err e
 func GetWarehouseInfoById(id int64) (models.WarehousingInfo, error) {
 
 	info := models.WarehousingInfo{}
-	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	//err := XTReadDB().Model(&info).Where("id = ? or warehouse_info_id and status = 1", id).Find(&info).Error
+	//return info, err
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	if id > 0 {
+		db = db.Where("x.id = ? or x.warehouse_info_id = ?", id, id)
+	}
+	err := db.Select("sum(x.warehousing_count) as warehousing_count,sum(x.stock_count) as stock_count").Scan(&info).Error
 	return info, err
 }
 
@@ -4660,6 +4726,13 @@ func CeateStockCorrectRecord(record models.XtStockCorrectRecord) error {
 
 func GetWarehouseTotal(id int64) (models.WarehousingInfo, error) {
 	info := models.WarehousingInfo{}
-	err := XTReadDB().Where("id=? and status = 1", id).Find(&info).Error
+	//err := XTReadDB().Where("id=? and status = 1", id).Find(&info).Error
+	//return info, err
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	if id > 0 {
+		db = db.Where("x.id = ? or x.warehouse_info_id = ?", id, id)
+	}
+	err := db.Select("sum(x.stock_count) as stock_count").Scan(&info).Error
 	return info, err
 }

service/warhouse_service.go

@@ -91,12 +91,28 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 	fmt.Println("单位1", advice.PrescribingNumber)
 	fmt.Println("单位2", drup.MaxUnit)
+	var drug_price float64
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		deliver_number = count * drup.MinNumber
+
 	} else {
 		deliver_number = count
+
+	}
+
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		drug_price = drup.RetailPrice
+	}
+
+	if advice.PrescribingNumberUnit == drup.MinUnit {
+		drug_price = drup.MinPrice
+	}
+
+	if advice.PrescribingNumberUnit != drup.MaxUnit || advice.PrescribingNumberUnit != drup.MinUnit {
+		drug_price = drup.RetailPrice
 	}
 
+	fmt.Println("hhhh233232322333232323332323323232323232323223", drug_price)
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
 	//开启事物
@@ -115,7 +131,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	fmt.Println("deliver_number88888888888", deliver_number)
 
 	//查找药品信息
-	baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -134,9 +150,9 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   baseInfo.RetailPrice,
+			Price:                   drug_price,
 			CountUnit:               advice.PrescribingNumberUnit,
-			RetailPrice:             baseInfo.RetailPrice,
+			RetailPrice:             drug_price,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
@@ -154,7 +170,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   count,
-			Price:                   baseInfo.RetailPrice,
+			Price:                   drug_price,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -255,7 +271,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   baseInfo.RetailPrice,
+			Price:                   drug_price,
 			CountUnit:               advice.PrescribingNumberUnit,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
@@ -310,7 +326,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   stock_number,
-			Price:                   baseInfo.RetailPrice,
+			Price:                   drug_price,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -417,6 +433,19 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		deliver_number = count
 	}
 
+	var min_price float64
+
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		min_price = drup.RetailPrice
+	}
+	if advice.PrescribingNumberUnit == drup.MinUnit {
+		min_price = drup.MinPrice
+	}
+
+	if advice.PrescribingNumberUnit != drup.MaxUnit && advice.PrescribingNumberUnit != drup.MinUnit {
+		min_price = drup.RetailPrice
+	}
+
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
 	//开启事物
@@ -451,9 +480,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   baseInfo.RetailPrice,
+			Price:                   min_price,
 			CountUnit:               baseInfo.MaxUnit,
-			RetailPrice:             baseInfo.RetailPrice,
+			RetailPrice:             min_price,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
@@ -471,7 +500,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   count,
-			Price:                   baseInfo.RetailPrice,
+			Price:                   min_price,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -569,8 +598,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   baseInfo.RetailPrice,
-			RetailPrice:             baseInfo.RetailPrice,
+			Price:                   min_price,
+			RetailPrice:             min_price,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
@@ -589,7 +618,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   stock_number,
-			Price:                   baseInfo.RetailPrice,
+			Price:                   min_price,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,