添加新功能

controllers/drug_stock_api_contorller.go

@@ -62,7 +62,7 @@ func DrugStockManagerApiRegistRouters() {
 	//
 	//beego.Router("/api/drugstock/detail", &StockDrugApiController{}, "get:GetDetailInfo")
 	//
-	//beego.Router("/api/drugwarehouseout/user", &StockDrugApiController{}, "get:GetUserDetailInfo")
+	beego.Router("/api/drugwarehouseout/user", &StockDrugApiController{}, "get:GetUserDetailInfo")
 
 	beego.Router("/api/drugstock/get", &StockDrugApiController{}, "get:GetAllDrugStock")
 
@@ -1878,3 +1878,23 @@ func (c *StockDrugApiController) GetDrugQueryInfo() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (this *StockDrugApiController) GetUserDetailInfo() {
+	order_id, _ := this.GetInt64("id")
+	if order_id <= 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adminUserInfo := this.GetAdminUserInfo()
+	userDetails, err, total := service.FindDrugStockUserDetailById(adminUserInfo.CurrentOrgId, order_id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  userDetails,
+			"total": total,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+}

service/drug_stock_service.go

@@ -9,7 +9,7 @@ type DrugConfig struct {
 	ID           int64        `gorm:"column:id" json:"id" form:"id"`
 	DrugName     string       `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
 	DrugCategory int64        `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec     float64      `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpec     string       `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
 	DrugType     int64        `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
 	DrugStatus   string       `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
 	Status       int64        `gorm:"column:status" json:"status" form:"status"`

service/self_drug_service.go

@@ -438,7 +438,7 @@ type Drugs struct {
 	DrugAliasPinyin    string   `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
 	DrugAliasWubi      string   `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
 	DrugCategory       int64    `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec           float64  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpec           string   `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
 	DrugType           int64    `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
 	DrugStockLimit     string   `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
 	DrugStatus         string   `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`

service/stock_service.go

@@ -496,19 +496,19 @@ func (VMDrugWarehouseInfo) TableName() string {
 }
 
 type Drug struct {
-	ID              int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName        string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugSpec        float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType        int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit  string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm  int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	Manufacturer    int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	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"`
-	OrgId           int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode        string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName        string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec        string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType        int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit  string `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace string `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm  int64  `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	Manufacturer    int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	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"`
+	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 }
 
 func (Drug) TableName() string {
@@ -1960,6 +1960,36 @@ func FindUserDetailById(org_id int64, id int64) (user []*models.AutomaticReduceD
 	return
 }
 
+type DrugAutomaticReduceDetail struct {
+	ID                      int64            `gorm:"column:id" json:"id" form:"id"`
+	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"`
+	PatientId               int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_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"`
+	RecordTime              int64            `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	OrgId                   int64            `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugId                  int64            `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count                   int64            `gorm:"column:count" json:"count" form:"count"`
+	Drug                    *Drug            `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	Patients                *models.Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"user"`
+}
+
+func (DrugAutomaticReduceDetail) TableName() string {
+	return "xt_drug_automatic_reduce_detail"
+}
+
+func FindDrugStockUserDetailById(org_id int64, id int64) (user []*DrugAutomaticReduceDetail, err error, total int64) {
+	db := readDb.Model(&DrugAutomaticReduceDetail{})
+	db = db.Preload("Drug", "org_id = ? AND status = 1", org_id)
+	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
+	db = db.Where("status = 1 AND org_id = ? AND warehouse_out_id = ? AND drug_id != 0", org_id, id)
+	db = db.Count(&total)
+	err = db.Find(&user).Error
+	return
+}
+
 func UpdateStockOutInfoCount2(org_id int64, id int64, count int64) {
 	writeDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND id = ?", org_id, id).UpdateColumn("count", gorm.Expr("count + ?", count))