医保对接

controllers/gobal_config_api_controller.go

@@ -1969,13 +1969,15 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
 	detail, total, err := service.GetBatchOrderDetail(drug_id, orgId, page, limit)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"detail": detail,
-		"total":  total,
+		"detail":           detail,
+		"total":            total,
+		"manufacturerList": manufacturerList,
 	})
 }
 

controllers/self_drug_api_congtroller.go

@@ -79,6 +79,8 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getinventorydetaillist", &SelfDrugApiController{}, "Get:GetDrugInventoryDetailList")
 	beego.Router("/api/drug/savedrugproofinventory", &SelfDrugApiController{}, "Get:SaveDrugProofInventory")
 	beego.Router("/api/drug/getdrugwarehouseinfototal", &StockManagerApiController{}, "Get:GetDrugWarehouseInfoTotal")
+
+	beego.Router("/api/drug/saveinentorylist", &SelfDrugApiController{}, "Post:SaveInventoryList")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -1450,6 +1452,8 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	list, total, err := service.GetDrugDamageList(startTime, endTime, orgId, keyword, limit, page)
+
+	damagelist, _ := service.GetDrugDamageByOrgId(orgId)
 	doctorList, err := service.GetAllDoctorThree(orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
@@ -1459,6 +1463,7 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"total":      total,
 		"list":       list,
+		"damagelist": damagelist,
 		"doctorList": doctorList,
 	})
 }
@@ -1726,6 +1731,7 @@ func (this *SelfDrugApiController) GetWarehoseInfoById() {
 
 	id, _ := this.GetInt64("id")
 	list, _ := service.GetWarehoseInfoById(id)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
@@ -2386,3 +2392,197 @@ func (this *StockManagerApiController) GetDrugWarehouseInfoTotal() {
 		"list": list,
 	})
 }
+
+//新改造
+
+func (this *SelfDrugApiController) SaveInventoryList() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+
+	tableData, _ := dataBody["tableData"].([]interface{})
+	fmt.Println("999939433443", tableData)
+	if len(tableData) > 0 {
+		for _, item := range tableData {
+			items := item.(map[string]interface{})
+			drug_name := items["drug_name"].(string)
+			if items["drug_name"] == nil || reflect.TypeOf(items["drug_name"]).String() != "string" {
+				utils.ErrorLog("drug_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			fmt.Println("drug_name", drug_name)
+			specification_name := items["specification_name"].(string)
+			if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
+				utils.ErrorLog("specification_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			max_unit := items["max_unit"].(string)
+			if items["max_unit"] == nil || reflect.TypeOf(items["max_unit"]).String() != "string" {
+				utils.ErrorLog("max_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			min_unit := items["min_unit"].(string)
+			if items["min_unit"] == nil || reflect.TypeOf(items["min_unit"]).String() != "string" {
+				utils.ErrorLog("min_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			drug_id := int64(items["drug_id"].(float64))
+
+			min_number := int64(items["min_number"].(float64))
+
+			stock_max_number := int64(items["stock_max_number"].(float64))
+
+			stock_min_number := int64(items["stock_min_number"].(float64))
+
+			last_stock_max_number := int64(items["last_stock_max_number"].(float64))
+
+			last_stock_min_number := int64(items["last_stock_min_number"].(float64))
+
+			warehousing_order := items["warehousing_order"].(string)
+
+			price := items["price"].(float64)
+
+			manufacturer_name := items["manufacturer_name"].(string)
+
+			batch_number := items["batch_number"].(string)
+
+			id := int64(items["id"].(float64))
+
+			orgId := this.GetAdminUserInfo().CurrentOrgId
+
+			type_id := int64(items["type"].(float64))
+
+			if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "float64" {
+				utils.ErrorLog("expiry_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			expiry_date := int64(items["expiry_date"].(float64))
+
+			manufacturer := int64(items["manufacturer"].(float64))
+			timeLayout := "2006-01-02"
+			loc, _ := time.LoadLocation("Local")
+			timeNow := time.Now().Format("2006-01-02")
+			locationTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", timeNow+" 00:00:00", loc)
+			var consumable_type int64
+			var consumable_count int64
+			var ord_total int64
+			var new_total int64
+			ord_total = stock_max_number*min_number + stock_min_number
+			new_total = last_stock_max_number*min_number + last_stock_min_number
+
+			if ord_total > new_total {
+				consumable_type = 11
+				consumable_count = ord_total - new_total
+			}
+			if ord_total < new_total {
+				consumable_type = 10
+				consumable_count = new_total - ord_total
+			}
+
+			//改变库存
+			info := models.DrugWarehouseInfo{
+				DrugId:         drug_id,
+				StockMaxNumber: last_stock_max_number,
+				StockMinNumber: last_stock_min_number,
+			}
+
+			err = service.ModifyDrugWarehouseInfo(&info, id)
+			inventory := models.XtDrugInventory{
+				DrugName:           drug_name,
+				SpecificationName:  specification_name,
+				WarehousingUnit:    max_unit,
+				Count:              consumable_count,
+				LastPrice:          price,
+				RetailPrice:        0,
+				NewPrice:           0,
+				Manufacturer:       manufacturer_name,
+				Dealer:             "",
+				Remark:             "",
+				DrugId:             drug_id,
+				UserOrgId:          orgId,
+				Ctime:              time.Now().Unix(),
+				Mtime:              0,
+				Status:             1,
+				WarehousingOrder:   warehousing_order,
+				LicenseNumber:      "",
+				StartTime:          locationTime.Unix(),
+				Creater:            this.GetAdminUserInfo().AdminUser.Id,
+				Checker:            0,
+				CheckerStatus:      0,
+				CheckerTime:        0,
+				ExpiryDate:         expiry_date,
+				ProductDate:        0,
+				Number:             "",
+				BatchNumber:        batch_number,
+				Total:              "",
+				DrugOriginPlace:    "",
+				WarehouseInfoId:    id,
+				ProofCount:         0,
+				StockMaxNumber:     stock_max_number,
+				StockMinNumber:     stock_min_number,
+				MinCount:           0,
+				MinUnit:            min_unit,
+				LastStockMaxNumber: last_stock_max_number,
+				LastStockMinNumber: last_stock_min_number,
+				InventoryType:      consumable_type,
+				Type:               type_id,
+			}
+
+			err = service.CreateDrugInventory(inventory)
+
+			flow := models.DrugFlow{
+				WarehousingId:           id,
+				DrugId:                  drug_id,
+				Number:                  "",
+				BatchNumber:             batch_number,
+				Count:                   consumable_count,
+				UserOrgId:               orgId,
+				PatientId:               0,
+				SystemTime:              locationTime.Unix(),
+				ConsumableType:          consumable_type,
+				IsSys:                   1,
+				WarehousingOrder:        warehousing_order,
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: "",
+				IsEdit:                  0,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            manufacturer,
+				Dealer:                  0,
+				Creator:                 this.GetAdminUserInfo().AdminUser.Id,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   price,
+				WarehousingDetailId:     id,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              expiry_date,
+				ProductDate:             0,
+				MaxUnit:                 max_unit,
+				MinUnit:                 min_unit,
+			}
+
+			service.CreateDrugFlowOne(flow)
+
+			if err != nil {
+				this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+				return
+			}
+
+			this.ServeSuccessJSON(map[string]interface{}{
+				"inventory": inventory,
+			})
+		}
+	}
+}

models/drug_stock.go

@@ -327,38 +327,44 @@ type StDrugWarehouseOutInfo struct {
 }
 
 type DrugFlow struct {
-	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId           int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number                  string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
-	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	SystemTime              int64   `gorm:"column:system_time" json:"system_time" form:"system_time"`
-	ConsumableType          int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	WarehousingOrder        string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	IsEdit                  int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
-	CancelStockId           int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber       string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
-	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Creator                 int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	UpdateCreator           int64   `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
-	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
-	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	WarehousingDetailId     int64   `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
-	WarehouseOutDetailId    int64   `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
-	CancelOutDetailId       int64   `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
-	ExpireDate              int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
-	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	MaxUnit                 string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	ID                      int64                `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId           int64                `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                  int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                  string               `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string               `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                   int64                `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId               int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId               int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime              int64                `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType          int64                `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                   int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder        string               `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId          int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                  int64                `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId           int64                `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber       string               `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer            int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                  int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                 int64                `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator           int64                `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                  int64                `gorm:"column:status" json:"status" form:"status"`
+	Ctime                   int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                   float64              `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId     int64                `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId    int64                `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId       int64                `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate              int64                `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate             int64                `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	MaxUnit                 string               `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                 string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	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"`
+	LastStockMaxNumber      int64                `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber      int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	DrugWarehouseInfo       []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" `
+	BaseDrugLib             BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 }
 
 func (DrugFlow) TableName() string {

models/self_drug_models.go

@@ -768,41 +768,45 @@ func (XtDrugDamage) TableName() string {
 }
 
 type XtDrugInventory struct {
-	ID                int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName          string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
-	Count             int64   `gorm:"column:count" json:"count" form:"count"`
-	LastPrice         float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	NewPrice          float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
-	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
-	DrugId            int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	UserOrgId         int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status            int64   `gorm:"column:status" json:"status" form:"status"`
-	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	LicenseNumber     string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	StartTime         int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
-	Checker           int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	CheckerStatus     int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
-	CheckerTime       int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
-	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	Number            string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber       string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Total             string  `gorm:"column:total" json:"total" form:"total"`
-	DrugOriginPlace   string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	WarehouseInfoId   int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	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"`
+	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName           string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName  string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit    string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count              int64   `gorm:"column:count" json:"count" form:"count"`
+	LastPrice          float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	RetailPrice        float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	NewPrice           float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer       string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer             string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark             string  `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugId             int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime              int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64   `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder   string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber      string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime          int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater            int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker            int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus      int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime        int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	ExpiryDate         int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate        int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	Number             string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber        string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Total              string  `gorm:"column:total" json:"total" form:"total"`
+	DrugOriginPlace    string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	WarehouseInfoId    int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	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"`
+	LastStockMaxNumber int64   `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	InventoryType      int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	Type               int64   `gorm:"column:type" json:"type" form:"type"`
 }
 
 func (XtDrugInventory) TableName() string {
@@ -810,39 +814,46 @@ func (XtDrugInventory) TableName() string {
 }
 
 type VmDrugInventory struct {
-	ID                int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName          string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
-	Count             int64   `gorm:"column:count" json:"count" form:"count"`
-	LastPrice         float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	NewPrice          float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
-	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
-	DrugId            int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	UserOrgId         int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status            int64   `gorm:"column:status" json:"status" form:"status"`
-	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	Number            string  `gorm:"column:number" json:"number" form:"number"`
-	StartTime         int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
-	Checker           int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	CheckerStatus     int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
-	CheckerTime       int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
-	MinNumber         int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose              float64 `gorm:"column:dose" json:"dose" form:"dose"`
-	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"`
+	ID                 int64              `gorm:"column:id" json:"id" form:"id"`
+	DrugName           string             `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName  string             `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit    string             `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count              int64              `gorm:"column:count" json:"count" form:"count"`
+	LastPrice          float64            `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	RetailPrice        float64            `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	NewPrice           float64            `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer       string             `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer             string             `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark             string             `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugId             int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	UserOrgId          int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime              int64              `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64              `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64              `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder   string             `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Number             string             `gorm:"column:number" json:"number" form:"number"`
+	StartTime          int64              `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater            int64              `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker            int64              `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus      int64              `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime        int64              `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	MinNumber          int64              `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose               float64            `gorm:"column:dose" json:"dose" form:"dose"`
+	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"`
+	LastStockMaxNumber int64              `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber int64              `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	InventoryType      int64              `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	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"`
+	WarehouseInfoId    int64              `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Children           []*XtDrugInventory `gorm:"column:children" json:"children" form:"children"`
 }
 
 type SgjDrugWarehouseOutInfo struct {

service/app_version.go

@@ -361,3 +361,79 @@ func GetHisPrescriptionTemplateTwo() (prescription []*HisPrescriptionInfoTemplat
 func SaveAdviceTemplate(advice HisPrescriptionAdviceTemplate) {
 	writeDb.Save(&advice)
 }
+
+func GetAllPT(org_id int64) (his []*models.HisPrescriptionTemplate, err error) {
+	err = readDb.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? AND status = 1", org_id).Find(&his).Error
+	return
+}
+
+type HisPrescriptionProjectTemplate struct {
+	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64 `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count              int64   `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string  `gorm:"column:day" json:"day" form:"day"`
+	Remark             string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string  `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64   `gorm:"column:type" json:"type" form:"type"`
+	PrescriptionId     int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	FrequencyType      int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount           int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay            string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+}
+
+func (HisPrescriptionProjectTemplate) TableName() string {
+	return "his_prescription_project_template"
+}
+
+type HisPrescriptionInfoTemplateTHree 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"`
+	RecordDate                     int64                            `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId                      int64                            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status                         int64                            `gorm:"column:status" json:"status" form:"status"`
+	Ctime                          int64                            `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                          int64                            `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Type                           int64                            `gorm:"column:type" json:"type" form:"type"`
+	Creator                        int64                            `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier                       int64                            `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	PType                          int64                            `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	PTemplateId                    int64                            `gorm:"column:p_template_id" json:"p_template_id" form:"p_template_id"`
+	HisPrescriptionAdviceTemplate  []HisPrescriptionAdviceTemplate  `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProjectTemplate []HisPrescriptionProjectTemplate `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	MedType                        string                           `gorm:"column:med_type" json:"med_type" form:"med_type"`
+}
+
+func (HisPrescriptionInfoTemplateTHree) TableName() string {
+	return "his_prescription_info_template"
+}
+
+func GetAllPTInfo(org_id int64, p_template_id int64) (his []*HisPrescriptionInfoTemplateTHree, err error) {
+	err = readDb.Model(&HisPrescriptionInfoTemplateTHree{}).Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1")
+	}).Preload("HisPrescriptionProjectTemplate", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1")
+	}).Where("user_org_id = ? AND status = 1 AND p_template_id = ?", org_id, p_template_id).Find(&his).Error
+	return
+}
+
+func GetAllInfo(org_id int64, project_id int64) (his []*HisPrescriptionProjectTemplate, err error) {
+	err = readDb.Model(&HisPrescriptionProjectTemplate{}).Where("user_org_id = ? AND status = 1 AND project_id = ? ", org_id, project_id).Find(&his).Error
+	return
+}
+func UpdateStatus(project_id int64, p_id int64) {
+	writeDb.Model(&HisPrescriptionProjectTemplate{}).Where("id = ?", project_id).Updates(map[string]interface{}{"status": 0})
+	writeDb.Model(&HisPrescriptionInfoTemplateTwo{}).Where("id = ?", p_id).Updates(map[string]interface{}{"status": 0})
+}

service/auto_create_drug.go

@@ -43,7 +43,6 @@ func AutoCreateDrugJob() {
 
 	var total int64
 	for _, item := range org {
-		fmt.Println("hhhh2h3h2323232323232323", item.UserOrgId)
 		//查询该机构下的所有药品信息
 		list, _ := FindAllDrugList(item.UserOrgId)
 		for _, ite := range list {
@@ -56,10 +55,10 @@ func AutoCreateDrugJob() {
 					total = it.StockMaxNumber + it.StockMinNumber
 					fmt.Println(it.StockMaxNumber)
 					fmt.Println(it.StockMinNumber)
-					fmt.Println("total223232323232323232323", total)
+
 					formatInt := strconv.FormatInt(total, 10)
 					float, _ := strconv.ParseFloat(formatInt, 64)
-					fmt.Println("min_number2323232323232", float)
+
 					lib := models.BaseDrugLib{
 						Total: float,
 					}
@@ -108,3 +107,19 @@ func UpdateDrugTotal(id int64, lib models.BaseDrugLib) error {
 	err := XTWriteDB().Model(&lib).Where("id=? and status = 1", id).Updates(map[string]interface{}{"total": lib.Total}).Error
 	return err
 }
+
+func FindAllDrugWarehouseInfo(drug_id int64) (models.DrugWarehouseInfoSix, error) {
+
+	info := models.DrugWarehouseInfoSix{}
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1")
+	fmt.Println(table)
+	if drug_id > 0 {
+		db = db.Where("x.drug_id = ?", drug_id)
+	}
+
+	err = db.Select("x.drug_id,sum(x.warehousing_count) as warehousing_count,b.min_number").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&info).Error
+
+	return info, err
+}

service/auto_create_stock.go

@@ -14,8 +14,8 @@ var createStockCronJob *cron.Cron
 func init() {
 	utils.InfoLog("开启自动更新耗材库存定时任务")
 	createStockCronJob = cron.New()
-	spec := "0 */5 * * * ?" // 每1分钟执行一次
-	//spec := "0 55 23 * * ?" // 每天23点55执行一次
+	//spec := "0 */5 * * * ?" // 每1分钟执行一次
+	spec := "0 55 23 * * ?" // 每天23点55执行一次
 	//spec := "0 0 0 ? * Sun"
 	createStockCronJob.AddFunc(spec, func() {
 		AutoCreateStockJob()

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -211,6 +211,9 @@ type PrescriptionVM struct {
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	MaxUltrafiltrationRate     float64 `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	OxygenUptake               int64   `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
+	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
+	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
 }
 
 func (PrescriptionVM) TableName() string {

service/schedule_service.go

@@ -715,9 +715,17 @@ func FindSchedualTemplateExportLog(org_id int64, export_time int64) (errLogs []*
 	return
 }
 
-func GetDialysisOrderByBedId(orgID, start, bed_id int64, schedule_type int64) (schedule models.DialysisOrder, err error) {
-	err = readDb.Model(&models.DialysisOrder{}).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).First(&schedule).Error
-	return
+func GetDialysisOrderByBedId(orgID, start, bed_id int64, schedule_type int64) (*models.DialysisOrder, error) {
+	order := models.DialysisOrder{}
+	err = readDb.Model(&order).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).Find(&order).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &order, nil
+
 }
 
 type VMDeviceNumber struct {

service/self_drug_service.go

@@ -876,10 +876,10 @@ func CreateDrugDamage(damage models.XtDrugDamage) error {
 	return err
 }
 
-func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.XtDrugDamage, total int64, err error) {
+func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.VmDrugInventory, total int64, err error) {
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_drug_damage as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1 and inventory_type = 10")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
 	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
 	fmt.Println(table, tab)
@@ -895,10 +895,15 @@ func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword strin
 	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,x.drug_origin_place,x.warehousing_info_id,x.batch_number,x.stock_max_number,x.stock_min_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
+	err = db.Group("x.drug_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,x.drug_origin_place,x.warehouse_info_id,x.batch_number,x.stock_max_number,x.stock_min_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
 }
 
+func GetDrugDamageByOrgId(orgid int64) (list []*models.XtDrugInventory, err error) {
+	err = XTReadDB().Model(&list).Where("user_org_id = ? and inventory_type = 10 and status = 1", orgid).Find(&list).Error
+	return list, err
+}
+
 func UpdateDrugDamage(ids []string, damage models.XtDrugDamage) error {
 
 	err := XTWriteDB().Model(&damage).Where("id in(?)", ids).Updates(map[string]interface{}{"checker": damage.Checker, "checker_status": damage.CheckerStatus, "checker_time": damage.CheckerTime}).Error
@@ -950,7 +955,7 @@ func GetDrugDamagePrint(ids []string) (damage []*models.XtDrugDamage, err error)
 
 func GetWarehoseInfoById(id int64) (info []*models.XtDrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("drug_id=? and status = 1", id).Find(&info).Error
+	err = XTReadDB().Model(&info).Where("drug_id=? and status = 1", id).Preload("XtBaseDrug", "status= 1").Find(&info).Error
 	return info, err
 }
 
@@ -1077,12 +1082,12 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
 	fmt.Println(table, tab)
 	if len(keyword) > 0 {
-		db = db.Where("x.warehousing_order = ? or r.user_name like ?", keyword, likeKey)
+		db = db.Where("x.warehousing_order = ? or r.user_name like ? or t.drug_name like ?", keyword, likeKey, likeKey)
 	}
 	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,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
+	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,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").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/stock_service.go

@@ -4201,8 +4201,15 @@ func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime i
 		if stock_type == 4 {
 			db = db.Where("consumable_type = 4")
 		}
+		if stock_type == 10 {
+			db = db.Where("consumable_type = 10")
+		}
+		if stock_type == 11 {
+			db = db.Where("consumable_type = 11")
+		}
+
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&drug_flow).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Preload("BaseDrugLib", "status = 1").Preload("DrugWarehouseInfo", "status = 1").Find(&drug_flow).Error
 	return drug_flow, total, err
 }
 
@@ -4282,8 +4289,6 @@ func GetDrugWarehouseInfoById(id int64) (models.XtDrugWarehouseInfo, error) {
 
 func UpdateDrugWarehouseInfo(info *models.XtDrugWarehouseInfo, id int64) error {
 
-	//err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber}).Error
-	//return err
 	err = writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", info.StockMaxNumber)).Error
 	return err
 }
@@ -4760,3 +4765,9 @@ func GetCurrentWarehosueInfoOne(id int64) (models.DrugWarehouseInfo, error) {
 	err := XTReadDB().Model(&info).Where("id=?", id).Find(&info).Error
 	return info, err
 }
+
+func ModifyDrugWarehouseInfo(info *models.DrugWarehouseInfo, id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber, "stock_min_number": info.StockMinNumber}).Error
+	return err
+}