2024/6/17

controllers/drug_stock_api_contorller.go

@@ -1,18 +1,19 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 )
 
 type StockDrugApiController struct {
@@ -3642,6 +3643,7 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 			MinUnit:                 item.MinUnit,
 			StorehouseId:            item.StorehouseId,
 			OverCount:               sum_count,
+			OperateTime:             time.Now().Unix(),
 		}
 		service.CreateDrugFlowTwo(flow)
 		//更新基础库剩余库存

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2731,6 +2731,8 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			}
 			if adminUserInfo.Org.Id == 10579 {
 				newprescribe.Modifier = 0
+				newprescribe.Creater = 0
+				newprescribe.PrescriptionDoctor = 0
 			}
 			err := service.AddSigleRecord(&newprescribe)
 			//记录日志
@@ -2897,6 +2899,8 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				}
 				if adminUserInfo.Org.Id == 10579 {
 					newprescribe.Modifier = 0
+					newprescribe.Creater = 0
+					newprescribe.PrescriptionDoctor = 0
 				}
 				err := service.AddSigleRecord(&newprescribe)
 
@@ -2945,6 +2949,8 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				if appRole.UserType == 2 || appRole.UserType == 1 {
 					if adminUserInfo.Org.Id == 10579 {
 						newprescribe.Modifier = 0
+						newprescribe.Creater = 0
+						newprescribe.PrescriptionDoctor = 0
 					} else {
 						newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
 					}
@@ -3060,6 +3066,8 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				}
 				if adminUserInfo.Org.Id == 10579 {
 					newprescribe.Modifier = 0
+					newprescribe.Creater = 0
+					newprescribe.PrescriptionDoctor = 0
 				}
 				err := service.AddSigleRecord(&newprescribe)
 				//记录日志
@@ -3182,7 +3190,10 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					newprescribe.DialysateFlow = 500
 				}
 				if adminUserInfo.Org.Id == 10579 {
+
 					newprescribe.Modifier = 0
+					newprescribe.Creater = 0
+					newprescribe.PrescriptionDoctor = 0
 				}
 				err := service.AddSigleRecord(&newprescribe)
 
@@ -3225,6 +3236,8 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				}
 				if adminUserInfo.Org.Id == 10579 {
 					newprescribe.Modifier = 0
+					newprescribe.Creater = 0
+					newprescribe.PrescriptionDoctor = 0
 				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1,19 +1,20 @@
 package new_mobile_api_controllers
 
 import (
+	"crypto/md5"
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"crypto/md5"
-	"encoding/json"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
 	"github.com/mozillazg/go-pinyin"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type NewDialysisApiController struct {
@@ -2986,3 +2987,7 @@ func (this *NewDialysisApiController) GetNextInspectionDetail() {
 		})
 	}
 }
+
+func (this *NewDialysisApiController) GetInspectionGroup() {
+
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -188,4 +188,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getllastinspectiondetail", &NewDialysisApiController{}, "Get:GetLastInspectionDetail")
 	beego.Router("/m/api/patient/getnextinspectionDetail", &NewDialysisApiController{}, "Get:GetNextInspectionDetail")
 
+	beego.Router("/m/api/patient/getinspectiongroup", &NewDialysisApiController{}, "Get:GetInspectionGroup")
+
 }

controllers/pharmacy_controller.go

@@ -39,7 +39,11 @@ func PharmacyApiRegistRouters() {
 	beego.Router("/api/pharmacy/getgoodinventorybygoodid", &PharmacyController{}, "Get:GetGoodInventoryByGoodId")
 	beego.Router("/api/pharmacy/updateInventoryWarehouseInfo", &PharmacyController{}, "Get:UpdateInventoryWarehouseInfo")
 
-	beego.Router("/api/pharmacy/getdruginventoryList", &PharmacyController{}, "Get:GetDrugInventoryList")
+	beego.Router("/api/pharmacy/getdrugnewinventoryList", &PharmacyController{}, "Get:GetDrugInventoryList")
+
+	beego.Router("/api/pharmacy/getdruginventorybydrugid", &PharmacyController{}, "Get:GetDrugInventoryByDrugId")
+
+	beego.Router("/api/pharmacy/updatedruginventorywarehouseinfo", &PharmacyController{}, "Get:UpdateDrugInventoryWarehouseInfo")
 }
 
 // 测试
@@ -1082,10 +1086,270 @@ func (this *PharmacyController) UpdateInventoryWarehouseInfo() {
 
 func (this *PharmacyController) GetDrugInventoryList() {
 
+	keywords := this.GetString("keywords")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	drugList, _ := service.GetDrugNewInventoryList(orgId, keywords)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugList":         drugList,
+		"manufacturerList": manufacturerList,
+	})
+}
+
+func (this *PharmacyController) GetDrugInventoryByDrugId() {
+
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	drugList, _ := service.GetDrugNewInventoryList(orgId)
+
+	id, _ := this.GetInt64("id")
+
+	infoList, _ := service.GetDrugInvetoryByDrugId(orgId, id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"infoList": infoList,
+	})
+}
+
+func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
+
+	id, _ := this.GetInt64("id")
+	stock_max_number, _ := this.GetInt64("stock_max_number")
+	stock_min_number, _ := this.GetInt64("stock_min_number")
+	last_stock_max_number, _ := this.GetInt64("last_stock_max_number")
+	last_stock_min_number, _ := this.GetInt64("last_stock_min_number")
+
+	drug_id, _ := this.GetInt64("drug_id")
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	is_type, _ := this.GetInt64("is_type")
+
+	specification_name := this.GetString("specification_name")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	base, _ := service.GetBasedrugByIdOne(drug_id, orgId)
+
+	var ord_total int64
+	var new_total int64
+	var consumable_count int64
+
+	ord_total = stock_max_number*base.MinNumber + stock_min_number
+	new_total = last_stock_max_number*base.MinNumber + last_stock_min_number
+
+	//更新入库单
+	service.UpdateNewDrugWarehouseInfoById(id, last_stock_max_number, last_stock_min_number)
+
+	//查询默认仓库
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	//查询默认仓库剩余多少库存
+	list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, drug_id)
+	var sum_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
+
+	}
+	//更新剩余库存
+	service.UpdateMedicalSumCountOne(drug_id, sum_count, orgId)
+
+	//更新剩余库存
+	service.UpdateDrugStockCount(drug_id, orgId, houseConfig.DrugStorehouseOut, sum_count)
+
+	drugWarehouseInfoOne, _ := service.GetDrugWarehouseInfoOne(id)
+
+	manufacturer, _ := service.GetManufactureById(drugWarehouseInfoOne.Manufacturer)
+
+	recordDateStr := time.Now().Format("2006-01-02")
+
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+	fmt.Println("ord_total-----------------------------", ord_total)
+	fmt.Println("new_total-----------------------------", new_total)
+	//盘亏
+	if ord_total > new_total {
+
+		consumable_count = ord_total - new_total
+
+		inventory := models.XtDrugInventory{
+			DrugName:           base.DrugName,
+			SpecificationName:  specification_name,
+			WarehousingUnit:    drugWarehouseInfoOne.MaxUnit,
+			Count:              consumable_count,
+			LastPrice:          drugWarehouseInfoOne.Price,
+			RetailPrice:        drugWarehouseInfoOne.RetailPrice,
+			NewPrice:           0,
+			Manufacturer:       manufacturer.ManufacturerName,
+			Dealer:             "",
+			Remark:             "",
+			DrugId:             drug_id,
+			UserOrgId:          orgId,
+			Ctime:              time.Now().Unix(),
+			Mtime:              0,
+			Status:             1,
+			WarehousingOrder:   drugWarehouseInfoOne.WarehousingOrder,
+			LicenseNumber:      "",
+			StartTime:          recordDate.Unix(),
+			Creater:            this.GetAdminUserInfo().AdminUser.Id,
+			Checker:            0,
+			CheckerStatus:      0,
+			CheckerTime:        0,
+			ExpiryDate:         drugWarehouseInfoOne.ExpiryDate,
+			ProductDate:        drugWarehouseInfoOne.ProductDate,
+			Number:             "",
+			BatchNumber:        drugWarehouseInfoOne.BatchNumber,
+			Total:              "",
+			DrugOriginPlace:    "",
+			WarehouseInfoId:    id,
+			ProofCount:         0,
+			StockMaxNumber:     stock_max_number,
+			StockMinNumber:     stock_min_number,
+			MinCount:           0,
+			MinUnit:            drugWarehouseInfoOne.MinUnit,
+			LastStockMaxNumber: last_stock_max_number,
+			LastStockMinNumber: last_stock_min_number,
+			InventoryType:      11,
+			Type:               is_type,
+			StorehouseId:       storehouse_id,
+			RecordDate:         recordDate.Unix(),
+		}
+
+		service.CreateDrugInventory(inventory)
+
+		flow := models.DrugFlow{
+			WarehousingId:           id,
+			DrugId:                  drug_id,
+			Number:                  "",
+			BatchNumber:             drugWarehouseInfoOne.BatchNumber,
+			Count:                   consumable_count,
+			UserOrgId:               orgId,
+			PatientId:               0,
+			SystemTime:              recordDate.Unix(),
+			ConsumableType:          11,
+			IsSys:                   1,
+			WarehousingOrder:        drugWarehouseInfoOne.WarehousingOrder,
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            manufacturer.ID,
+			Dealer:                  0,
+			Creator:                 this.GetAdminUserInfo().AdminUser.Id,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   drugWarehouseInfoOne.Price,
+			WarehousingDetailId:     id,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       0,
+			ExpireDate:              drugWarehouseInfoOne.ExpiryDate,
+			ProductDate:             0,
+			MaxUnit:                 drugWarehouseInfoOne.MaxUnit,
+			MinUnit:                 drugWarehouseInfoOne.MinUnit,
+			StorehouseId:            storehouse_id,
+			OverCount:               sum_count,
+		}
+		service.CreateDrugFlowOne(flow)
+
+		//添加出库数据
+		service.AddDrugWarehouseOut(drug_id, consumable_count, storehouse_id, orgId)
+
+	}
+
+	//盘盈
+	if ord_total < new_total {
+
+		consumable_count = new_total - ord_total
+
+		inventory := models.XtDrugInventory{
+			DrugName:           base.DrugName,
+			SpecificationName:  specification_name,
+			WarehousingUnit:    drugWarehouseInfoOne.MaxUnit,
+			Count:              consumable_count,
+			LastPrice:          drugWarehouseInfoOne.Price,
+			RetailPrice:        drugWarehouseInfoOne.RetailPrice,
+			NewPrice:           0,
+			Manufacturer:       manufacturer.ManufacturerName,
+			Dealer:             "",
+			Remark:             "",
+			DrugId:             drug_id,
+			UserOrgId:          orgId,
+			Ctime:              time.Now().Unix(),
+			Mtime:              0,
+			Status:             1,
+			WarehousingOrder:   drugWarehouseInfoOne.WarehousingOrder,
+			LicenseNumber:      "",
+			StartTime:          recordDate.Unix(),
+			Creater:            this.GetAdminUserInfo().AdminUser.Id,
+			Checker:            0,
+			CheckerStatus:      0,
+			CheckerTime:        0,
+			ExpiryDate:         drugWarehouseInfoOne.ExpiryDate,
+			ProductDate:        drugWarehouseInfoOne.ProductDate,
+			Number:             "",
+			BatchNumber:        drugWarehouseInfoOne.BatchNumber,
+			Total:              "",
+			DrugOriginPlace:    "",
+			WarehouseInfoId:    id,
+			ProofCount:         0,
+			StockMaxNumber:     stock_max_number,
+			StockMinNumber:     stock_min_number,
+			MinCount:           0,
+			MinUnit:            drugWarehouseInfoOne.MinUnit,
+			LastStockMaxNumber: last_stock_max_number,
+			LastStockMinNumber: last_stock_min_number,
+			InventoryType:      10,
+			Type:               is_type,
+			StorehouseId:       storehouse_id,
+			RecordDate:         recordDate.Unix(),
+		}
+
+		service.CreateDrugInventory(inventory)
+
+		flow := models.DrugFlow{
+			WarehousingId:           id,
+			DrugId:                  drug_id,
+			Number:                  "",
+			BatchNumber:             drugWarehouseInfoOne.BatchNumber,
+			Count:                   consumable_count,
+			UserOrgId:               orgId,
+			PatientId:               0,
+			SystemTime:              recordDate.Unix(),
+			ConsumableType:          10,
+			IsSys:                   1,
+			WarehousingOrder:        drugWarehouseInfoOne.WarehousingOrder,
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            manufacturer.ID,
+			Dealer:                  0,
+			Creator:                 this.GetAdminUserInfo().AdminUser.Id,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   drugWarehouseInfoOne.Price,
+			WarehousingDetailId:     id,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       0,
+			ExpireDate:              drugWarehouseInfoOne.ExpiryDate,
+			ProductDate:             0,
+			MaxUnit:                 drugWarehouseInfoOne.MaxUnit,
+			MinUnit:                 drugWarehouseInfoOne.MinUnit,
+			StorehouseId:            storehouse_id,
+			OverCount:               sum_count,
+		}
+		service.CreateDrugFlowOne(flow)
+
+		//减少出库数据
+		service.ReduceDrugWarehouseOut(drug_id, consumable_count, storehouse_id, orgId)
+	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"drugList": drugList,
+		"msg": "msg",
 	})
 }

controllers/self_drug_api_congtroller.go

@@ -1802,7 +1802,7 @@ func (this *SelfDrugApiController) SaveDrugInventory() {
 	fmt.Println(err)
 
 	tableData, _ := dataBody["tableData"].([]interface{})
-	fmt.Println("999939433443", tableData)
+
 	if len(tableData) > 0 {
 		for _, item := range tableData {
 			items := item.(map[string]interface{})

controllers/stock_in_api_controller.go

@@ -7717,6 +7717,7 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 				BatchNumberCount:        item.WarehousingCount,
 				IsCheck:                 1,
 				OverCount:               flush_count,
+				OperateTime:             time.Now().Unix(),
 			}
 			//创建出库流水
 			service.CreateStockFlowOne(stockFlow)

models/drug.go

@@ -111,6 +111,29 @@ func (BaseDrugLibSeven) TableName() string {
 	return "xt_base_drug"
 }
 
+type BaseDrugLibTwentyOne struct {
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName     string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit      string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit      string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	RetailPrice  float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice    float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugDose     float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	Manufacturer int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Status       int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId        int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	MinNumber    int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose         string  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit     string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugDay      string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	MinPrice     float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+}
+
+func (BaseDrugLibTwentyOne) TableName() string {
+	return "xt_base_drug"
+}
+
 type BaseDrugLibEleven struct {
 	ID               int64  `gorm:"column:id" json:"id" form:"id"`
 	DrugName         string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`

models/self_drug_models.go

@@ -888,6 +888,7 @@ type XtDrugInventory struct {
 	StorehouseId       int64             `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	BaseDrugLib        BaseDrugLib       `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 	DrugWarehouseInfo  DrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfoId"json:"drug_warehouse_info" `
+	RecordDate         int64             `gorm:"column:record_date" json:"record_date" form:"record_date"`
 }
 
 func (XtDrugInventory) TableName() string {

service/his_service.go

@@ -3432,3 +3432,12 @@ func GetBaseGoodById(good_id int64, user_org_id int64) (models.GoodInfo, error)
 
 	return info, err
 }
+
+func GetBasedrugByIdOne(drug_id int64, user_org_id int64) (models.BaseDrugLib, error) {
+
+	lib := models.BaseDrugLib{}
+
+	err := XTReadDB().Where("id = ? and org_id =? and status=1", drug_id, user_org_id).Find(&lib).Error
+
+	return lib, err
+}

service/new_stock_service.go

@@ -634,9 +634,18 @@ func AddGoodNewCancelSumCountOne(storehouse_id int64, good_id int64, user_org_id
 	return err
 }
 
-func GetDrugNewInventoryList(org_id int64) (drug []*models.BaseDrugLibTwentyOne, err error) {
+func GetDrugNewInventoryList(org_id int64, keyword string) (drug []*models.BaseDrugLibTwentyOne, err error) {
 
-	err = XTReadDB().Where("org_id = ? and status =1", org_id).Find(&drug).Error
+	likeKey := "%" + keyword + "%"
+
+	db := XTReadDB().Where("status=1")
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("drug_name like ?", likeKey)
+	}
+	err = db.Order("id desc").Find(&drug).Error
 
 	return drug, err
 }

service/new_warehouse_service.go

@@ -5250,3 +5250,33 @@ func ReduceNewGoodCountTwo(good_id int64, org_id int64, storehouse_id int64, out
 	}
 	return err
 }
+
+func AddDrugWarehouseOut(drug_id int64, total_count int64, storehouse_id int64, user_org_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 + ?", total_count)).Error
+
+	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 + ?", total_count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func ReduceDrugWarehouseOut(drug_id int64, total_count int64, storehouse_id int64, user_org_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 - ?", total_count)).Error
+
+	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 - ?", total_count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}

service/stock_service.go

@@ -4770,7 +4770,7 @@ func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64)
 		db = db.Where("x.ctime<=?", endtime)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,x.manufacturer,x.dealer,p.warehouse_out_time").Joins("left join xt_warehouse_out as p on p.id =x.warehouse_out_id").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,x.license_number,x.warehouse_out_order_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,x.manufacturer,x.dealer,p.warehouse_out_time").Joins("left join xt_warehouse_out as p on p.id =x.warehouse_out_id").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
 	return out, err
 
 }
@@ -5846,6 +5846,15 @@ func GetDrugWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 	return info, err
 }
 
+func GetDrugWarehouseInfoOne(id int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+
+	err := XTReadDB().Where("status = 1 and id=?", id).Find(&info).Error
+
+	return info, err
+}
+
 //func GetDrugWarehouseInfoTX(id int64,tx *gorm.DB) (models.XtDrugWarehouseInfo, error) {
 //	info := models.XtDrugWarehouseInfo{}
 //	db := tx.Model(&info).Where("status = 1")
@@ -7327,6 +7336,17 @@ func UpdateMedicalSumCount(drug_id int64, sum_count int64, sum_in_count int64, o
 	return err
 }
 
+func UpdateMedicalSumCountOne(drug_id int64, sum_count int64, orgid int64) error {
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return err
+}
+
 //func UpdateMedicalSumCountTX(drug_id int64, sum_count int64, sum_in_count int64, orgid int64,tx *gorm.DB) error {
 //	err := tx.Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
 //	return err
@@ -9205,3 +9225,17 @@ func ModifyNewGoodWarehouseInfoStockMinNumber(count int64, goodid int64, orgid i
 	}
 	return err
 }
+
+func GetDrugInvetoryByDrugId(user_org_id int64, drug_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and drug_id = ? and status=1", user_org_id, drug_id).Preload("XtBaseDrug", "org_id = ? and status=1", user_org_id).Order("id desc").Find(&info).Error
+
+	return info, err
+}
+
+func UpdateNewDrugWarehouseInfoById(id int64, last_stock_max_number int64, last_stock_min_number int64) error {
+
+	err := XTWriteDB().Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"stock_max_number": last_stock_max_number, "stock_min_number": last_stock_min_number}).Error
+
+	return err
+}