耗材参数

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() {
@@ -1726,6 +1728,7 @@ func (this *SelfDrugApiController) GetWarehoseInfoById() {
 
 	id, _ := this.GetInt64("id")
 	list, _ := service.GetWarehoseInfoById(id)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
@@ -2386,3 +2389,179 @@ 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
+
+			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))
+
+			var consumable_type 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
+			}
+			if ord_total < new_total {
+				consumable_type = 10
+			}
+
+			inventory := models.XtDrugInventory{
+				DrugName:           drug_name,
+				SpecificationName:  specification_name,
+				WarehousingUnit:    max_unit,
+				Count:              0,
+				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:          0,
+				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,
+			}
+
+			err = service.CreateDrugInventory(inventory)
+
+			flow := models.DrugFlow{
+				WarehousingId:           id,
+				DrugId:                  drug_id,
+				Number:                  "",
+				BatchNumber:             batch_number,
+				Count:                   0,
+				UserOrgId:               orgId,
+				PatientId:               0,
+				SystemTime:              time.Now().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)
+
+			//改变库存
+			info := models.DrugWarehouseInfo{
+				DrugId:         drug_id,
+				StockMaxNumber: last_stock_max_number,
+				StockMinNumber: last_stock_min_number,
+			}
+
+			err = service.ModifyDrugWarehouseInfo(&info, drug_id)
+			fmt.Println(err)
+		}
+	}
+}

main.go

@@ -16,7 +16,7 @@ func main() {
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()
-	//service.BeginAutoCreateDrugJob()
+	service.BeginAutoCreateDrugJob()
 	service.BeginAutoCreateStockJob()
 	beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 60
 	beego.Run()

models/drug_stock.go

@@ -359,6 +359,10 @@ type DrugFlow struct {
 	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"`
 }
 
 func (DrugFlow) TableName() string {

models/self_drug_models.go

@@ -768,41 +768,43 @@ 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"`
 }
 
 func (XtDrugInventory) TableName() string {

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/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/self_drug_service.go

@@ -950,7 +950,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
 }
 

service/stock_service.go

@@ -4282,8 +4282,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 +4758,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
+}