11月9日库存管理

controllers/manager_center_api_controller.go

@@ -141,7 +141,8 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	drug_remark := c.GetString("drug_remark")
-	dose, _ := c.GetFloat("dose")
+	//dose, _ := c.GetFloat("dose")
+	dose := c.GetString("dose")
 	dose_unit := c.GetString("dose_unit")
 	min_price, _ := c.GetFloat("min_price")
 	min_number, _ := c.GetInt64("min_number")
@@ -216,7 +217,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		LmtUsedFlag:                 lmt_used_flag,
 		PrescribingNumberUnit:       prescribing_number_unit,
 		IsUse:                       is_user,
-		IsPharmacy: 				 is_pharmacy,
+		IsPharmacy:                  is_pharmacy,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
@@ -306,7 +307,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	drug_remark := c.GetString("drug_remark")
 	min_number, _ := c.GetInt64("min_number")
 	drug_day := c.GetString("drug_day")
-	dose, _ := c.GetFloat("dose")
+	//dose, _ := c.GetFloat("dose")
+	dose := c.GetString("dose")
 	dose_unit := c.GetString("dose_unit")
 	total, _ := c.GetFloat("total")
 
@@ -315,10 +317,10 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	prescribing_number_unit := c.GetString("prescribing_number_unit")
 	is_user, _ := c.GetInt64("is_user")
-  sum_count, _ := c.GetInt64("sum_count")
-  sum_in_count, _ := c.GetInt64("sum_in_count")
+	sum_count, _ := c.GetInt64("sum_count")
+	sum_in_count, _ := c.GetInt64("sum_in_count")
 	is_pharmacy, _ := c.GetInt64("is_pharmacy")
-  adminInfo := c.GetAdminUserInfo()
+	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 	drugLib := &models.BaseDrugLib{
 		ID:                          id,
@@ -389,7 +391,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		IsUse:                       is_user,
 		SumCount:                    sum_count,
 		SumInCount:                  sum_in_count,
-		IsPharmacy: is_pharmacy,
+		IsPharmacy:                  is_pharmacy,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)

controllers/stock_in_api_controller.go

@@ -4385,9 +4385,9 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		min_prices := goodNameM["min_price"].(string)
 		min_price, _ := strconv.ParseFloat(min_prices, 64)
 		drug.MinPrice = min_price
-		doses := goodNameM["dose"].(string)
-		dose, _ := strconv.ParseFloat(doses, 64)
-		if dose < 0 { //名字为空则生成一条导入错误日志
+		dose := goodNameM["dose"].(string)
+		//dose, _ := strconv.ParseFloat(doses, 64)
+		if len(dose) < 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
@@ -4403,7 +4403,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.Dose = dose
 
-		if dose < 0 { //名字为空则生成一条导入错误日志
+		if len(dose) < 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,

models/drug.go

@@ -18,7 +18,7 @@ type BaseDrugLib struct {
 	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	Dose                        string  `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`

models/drug_pharmacy_management_models.go

@@ -63,7 +63,7 @@ type PharmacyBaseDrug struct {
 	Total                       float64                `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit       string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 	MinNumber                   int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose                        float64                `gorm:"column:dose" json:"dose" form:"dose"`
+	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"`

models/drug_stock.go

@@ -370,7 +370,7 @@ type StDrugWarehouseOutInfo struct {
 	MinUnit                 string  `json:"min_unit"`
 	MinNumber               int64   `json:"min_number"`
 	MinPrice                float64 `json:"min_price"`
-	Dose                    float64 `json:"dose"`
+	Dose                    string  `json:"dose"`
 	DoseUnit                string  `json:"dose_unit"`
 	LastPrice               string  `json:"last_price"`
 	PackingUnit             string  `json:"packing_unit"`

models/self_drug_models.go

@@ -70,7 +70,7 @@ type XtBaseDrug struct {
 	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 	MinNumber             int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose                  float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	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"`
@@ -479,7 +479,7 @@ type BloodDrugWarehouseInfo struct {
 	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	MaxUnit          string  `json:"max_unit"`
 	MinNumber        int64   `json:"min_number"`
-	Dose             float64 `json:"dose"`
+	Dose             string  `json:"dose"`
 	DoseUnit         string  `json:"dose_unit"`
 	WarehouseingUnit string  `gorm:"column:warehouseing_unit" json:"warehouseing_unit" form:"warehouseing_unit"`
 	LastPrice        float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
@@ -516,7 +516,7 @@ type BloodDrugCancelStockInfo struct {
 	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	MaxUnit          string  `json:"max_unit"`
 	MinNumber        int64   `json:"min_number"`
-	Dose             float64 `json:"dose"`
+	Dose             string  `json:"dose"`
 	DoseUnit         string  `json:"dose_unit"`
 	Unit             string  `json:"unit"`
 	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
@@ -581,7 +581,7 @@ type BloodDrugWarehouseOutInfo struct {
 	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	MaxUnit                 string  `json:"max_unit"`
 	MinNumber               int64   `json:"min_number"`
-	Dose                    float64 `json:"dose"`
+	Dose                    string  `json:"dose"`
 	DoseUnit                string  `json:"dose_unit"`
 	LastPrice               float64 `json:"last_price"`
 	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
@@ -643,7 +643,7 @@ type StDrugWarehouseInfo struct {
 	MaxUnit          string  `json:"max_unit"`
 	MinUnit          string  `json:"min_unit"`
 	MinNumber        int64   `json:"min_number"`
-	Dose             float64 `json:"dose"`
+	Dose             string  `json:"dose"`
 	DoseUnit         string  `json:"dose_unit"`
 	LastPrice        string  `json:"last_price"`
 	PackingUnit      string  `json:"packing_unit"`
@@ -682,7 +682,7 @@ type VmDrugWarehouseOutInfo struct {
 	MaxUnit                 string  `json:"max_unit"`
 	MinUnit                 string  `json:"min_unit"`
 	MinNumber               int64   `json:"min_number"`
-	Dose                    float64 `json:"dose"`
+	Dose                    string  `json:"dose"`
 	DoseUnit                string  `json:"dose_unit"`
 	LastPrice               float64 `json:"last_price"`
 	MinPrice                float64 `json:"min_price"`
@@ -907,7 +907,7 @@ type VmDrugInventory struct {
 	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"`
+	Dose               string             `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"`
@@ -964,19 +964,19 @@ func (SgjDrugWarehouseOutInfo) TableName() string {
 }
 
 type PatientDrugWarehouseInfo struct {
-	DrugId         int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number         string  `gorm:"column:number" json:"number" form:"number"`
-	ProductDate    int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate     int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	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"`
-	BatchNumber    string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	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"`
-	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"`
-	Manufacturer   int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer         int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	DrugId         int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number         string `gorm:"column:number" json:"number" form:"number"`
+	ProductDate    int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate     int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	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"`
+	BatchNumber    string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	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"`
+	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"`
+	Manufacturer   int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer         int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
 }

models/stock_models.go

@@ -692,7 +692,7 @@ type VmBaseDrug struct {
 	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                   float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	Dose                   string  `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit               string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
 	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`

models/supply.models.go

@@ -27,7 +27,7 @@ type SpBaseDrug struct {
 	MaxUnit           string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinNumber         int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit           string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose              float64                `gorm:"column:dose" json:"dose" form:"dose"`
+	Dose              string                 `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit          string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	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"`

service/his_service.go

@@ -720,7 +720,7 @@ type BaseDrugLib struct {
 	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	Dose                        string  `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
 	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`

service/self_drug_service.go

@@ -548,7 +548,7 @@ type Drugs struct {
 	LmtUsedFlag           int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	PrescribingNumberUnit string   `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 	MinNumber             int64    `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose                  float64  `gorm:"column:dose" json:"dose" form:"dose"`
+	Dose                  string   `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"`
 	DrugDoseUnit          int64    `grom:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`

service/stock_service.go

@@ -1079,7 +1079,7 @@ type Drug struct {
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	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"`
@@ -3506,7 +3506,7 @@ func IsExistDrugByName(drugname string, drugdesc string, orgid int64) (*models.B
 	return &drug, nil
 }
 
-func IsExistDrugByNameOne(drugname string, dosage float64, doseunit string, minnumber int64, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
+func IsExistDrugByNameOne(drugname string, dosage string, doseunit string, minnumber int64, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
 	var drug models.BaseDrugLib
 	var err error
 	err = XTReadDB().Model(&drug).Where("drug_name = ? and dose = ? and dose_unit = ?   and min_number = ? and min_unit=? and max_unit = ? and status =1 and org_id = ?", drugname, dosage, doseunit, minnumber, minunit, packtunit, orgid).Find(&drug).Error