耗材参数

controllers/his_api_controller.go

@@ -898,11 +898,17 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		fmt.Println(project_id)
 		fmt.Println(project.ProjectId)
 	}
-	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
-		price := int64(json["price"].(float64))
-		formatInt_price := strconv.FormatInt(price, 10)
-		float_price, _ := strconv.ParseFloat(formatInt_price, 64)
-		project.Price = float_price
+	//if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
+	//	//price := int64(json["price"].(float64))
+	//	//fmt.Println("price--------------------------",price)
+	//	//formatInt_price := strconv.FormatInt(price, 10)
+	//	//float_price, _ := strconv.ParseFloat(formatInt_price, 64)
+	//	//project.Price = float_price
+	//
+	//}
+	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["price"].(string), 64)
+		project.Price = price
 	}
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
@@ -952,11 +958,16 @@ func (c *HisApiController) setAddtionWithJSON(additionalCharge *models.HisAdditi
 		item_id := int64(json["item_id"].(float64))
 		additionalCharge.ItemId = item_id
 	}
-	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
-		price := int64(json["price"].(float64))
-		formatInt_price := strconv.FormatInt(price, 10)
-		float_price, _ := strconv.ParseFloat(formatInt_price, 64)
-		additionalCharge.Price = float_price
+	//if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
+	//	price := int64(json["price"].(float64))
+	//	formatInt_price := strconv.FormatInt(price, 10)
+	//	float_price, _ := strconv.ParseFloat(formatInt_price, 64)
+	//	additionalCharge.Price = float_price
+	//}
+
+	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["price"].(string), 64)
+		additionalCharge.Price = price
 	}
 	if json["count"] != nil && reflect.TypeOf(json["count"]).String() == "string" {
 		count, _ := json["count"].(string)

controllers/manager_center_api_controller.go

@@ -1813,7 +1813,10 @@ func (c *ManagerCenterApiController) DeleteBaseDrugById() {
 func (c *ManagerCenterApiController) CreateAddition() {
 	name := c.GetString("name")
 	code := c.GetString("code")
-	price, _ := c.GetFloat("price")
+	//price, _ := c.GetFloat("price")
+
+	price := c.GetString("price")
+	price_float, _ := strconv.ParseFloat(price, 64)
 
 	if len(name) <= 0 {
 		utils.ErrorLog("len(name) == 0")
@@ -1821,11 +1824,11 @@ func (c *ManagerCenterApiController) CreateAddition() {
 		return
 	}
 
-	if len(code) <= 0 {
-		utils.ErrorLog("len(code) == 0")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//if len(code) <= 0 {
+	//	utils.ErrorLog("len(code) == 0")
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -1833,7 +1836,7 @@ func (c *ManagerCenterApiController) CreateAddition() {
 		Name:      name,
 		Code:      code,
 		Status:    1,
-		Price:     price,
+		Price:     price_float,
 		Ctime:     time.Now().Unix(),
 		Mtime:     time.Now().Unix(),
 		UserOrgId: adminUserInfo.CurrentOrgId,
@@ -1870,11 +1873,11 @@ func (c *ManagerCenterApiController) ModifyAddition() {
 		return
 	}
 
-	if len(code) <= 0 {
-		utils.ErrorLog("len(content_code) == 0")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//if len(code) <= 0 {
+	//	utils.ErrorLog("len(content_code) == 0")
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	adminUserInfo := c.GetAdminUserInfo()
 	addition := models.XtHisAddtionConfig{

service/stock_service.go

@@ -1161,7 +1161,7 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, star
 	}
 	if endtime > 0 {
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("org_id = ? AND status = 1 and sys_record_time>=? and  sys_record_time<=?", orgId, startime, endtime)
+			return db.Where("org_id = ? AND status = 1 and sys_record_time<=?", orgId, endtime)
 		})
 	}
 
@@ -1170,6 +1170,7 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, star
 	db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("org_id = ? AND status = 1", orgId)
 	})
+
 	db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1", orgId)
 
 	if startime == 0 || endtime == 0 {
@@ -2091,3 +2092,9 @@ func PostSearchStock(keyword string, orgid int64) (goods []*models.GoodsType, er
 	err = db.Where("org_id = ? and status =1", orgid).Find(&goods).Error
 	return goods, err
 }
+
+func GetStockType(orgid int64) (goodstype []*models.GoodsTypeOne, err error) {
+	err = XTReadDB().Where("org_id = ? and status = 1 and (stock_attribute = 2 or stock_attribute = 3)", orgid).
+		Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&goodstype).Error
+	return goodstype, err
+}