耗材参数

controllers/stock_in_api_controller.go

@@ -101,7 +101,7 @@ func StockManagerApiRegistRouters() {
 
 	//耗材调价
 	beego.Router("/api/stock/postsearchgoodwarehouselist", &StockManagerApiController{}, "Get:GetSearchGoodWarehouseList")
-
+	beego.Router("/api/stock/saveadjustprice", &StockManagerApiController{}, "Post:SaveAdjuestPrice")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -4713,3 +4713,162 @@ func (this *StockManagerApiController) GetSearchGoodWarehouseList() {
 		"dealerList":       dealerList,
 	})
 }
+
+func (this *StockManagerApiController) SaveAdjuestPrice() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	tableData, _ := dataBody["tableData"].([]interface{})
+	if len(tableData) > 0 {
+		for _, item := range tableData {
+			items := item.(map[string]interface{})
+
+			if items["good_name"] == nil || reflect.TypeOf(items["good_name"]).String() != "string" {
+				utils.ErrorLog("good_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			good_name := items["good_name"].(string)
+
+			if items["good_name"] == nil || reflect.TypeOf(items["good_name"]).String() != "string" {
+				utils.ErrorLog("good_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			if items["packing_price"] == nil || reflect.TypeOf(items["packing_price"]).String() != "string" {
+				utils.ErrorLog("packing_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			packing_price, _ := strconv.ParseFloat(items["packing_price"].(string), 64)
+
+			if items["warehousing_order"] == nil || reflect.TypeOf(items["warehousing_order"]).String() != "string" {
+				utils.ErrorLog("warehousing_order")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			warehousing_order := items["warehousing_order"].(string)
+
+			if items["license_number"] == nil || reflect.TypeOf(items["license_number"]).String() != "string" {
+				utils.ErrorLog("license_number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			license_number := items["license_number"].(string)
+
+			if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "string" {
+				utils.ErrorLog("dealer")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			dealer := items["dealer"].(string)
+
+			if items["manufacturer"] == nil || reflect.TypeOf(items["manufacturer"]).String() != "string" {
+				utils.ErrorLog("manufacturer")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			manufacturer := items["manufacturer"].(string)
+
+			if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
+				utils.ErrorLog("specification_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			specification_name := items["specification_name"].(string)
+
+			if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
+				utils.ErrorLog("remark")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			remark := items["remark"].(string)
+
+			if items["warehousing_unit"] == nil || reflect.TypeOf(items["warehousing_unit"]).String() != "string" {
+				utils.ErrorLog("warehousing_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			warehousing_unit := items["warehousing_unit"].(string)
+
+			if items["buy_price"] == nil || reflect.TypeOf(items["buy_price"]).String() != "string" {
+				utils.ErrorLog("buy_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			buy_price, _ := strconv.ParseFloat(items["buy_price"].(string), 64)
+
+			if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "float64" {
+				utils.ErrorLog("count")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			count := int64(items["count"].(float64))
+
+			if items["new_price"] == nil || reflect.TypeOf(items["new_price"]).String() != "string" {
+				utils.ErrorLog("new_price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			new_price, _ := strconv.ParseFloat(items["new_price"].(string), 64)
+
+			if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
+				utils.ErrorLog("good_id")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			good_id := int64(items["good_id"].(float64))
+
+			if items["start_time"] == nil || reflect.TypeOf(items["start_time"]).String() != "string" {
+				utils.ErrorLog("start_time")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			var startTime int64
+			start_time := items["start_time"].(string)
+			if len(start_time) > 0 {
+				theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+				if err != nil {
+					fmt.Println(err)
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				startTime = theTime.Unix()
+			}
+			orgId := this.GetAdminUserInfo().CurrentOrgId
+			adjustprice := models.XtStockAdjustPrice{
+				GoodName:          good_name,
+				SpecificationName: specification_name,
+				WarehousingUnit:   warehousing_unit,
+				Count:             count,
+				BuyPrice:          buy_price,
+				PackingPrice:      packing_price,
+				NewPrice:          new_price,
+				Manufacturer:      manufacturer,
+				Dealer:            dealer,
+				Remark:            remark,
+				GoodId:            good_id,
+				UserOrgId:         orgId,
+				Ctime:             time.Now().Unix(),
+				Mtime:             0,
+				Status:            1,
+				WarehousingOrder:  warehousing_order,
+				LicenseNumber:     license_number,
+				StartTime:         startTime,
+			}
+
+			service.CreateAdjustPrice(&adjustprice)
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "保存成功!",
+	})
+}

models/patient_models.go

@@ -779,6 +779,26 @@ func (XtInspectionReference) TableName() string {
 	return "xt_inspection_reference"
 }
 
+type VmXtInspection struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId    int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	RangeType    int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeMin     string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	RangeMax     string `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangeValue   string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+}
+
 type XtInspection struct {
 	ID           int64  `gorm:"column:id" json:"id" form:"id"`
 	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`

models/stock_models.go

@@ -797,4 +797,32 @@ type BloodWarehouseInfo struct {
 	GoodName          string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	PackingPrice      float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	PackingUnit       string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	BuyPrice          float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+}
+
+type XtStockAdjustPrice struct {
+	ID                int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodName          string  `gorm:"column:good_name" json:"good_name" form:"good_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"`
+	BuyPrice          float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	PackingPrice      float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_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"`
+	GoodId            int64   `gorm:"column:good_id" json:"good_id" form:"good_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"`
+}
+
+func (XtStockAdjustPrice) TableName() string {
+	return "xt_stock_adjust_price"
 }

service/patientmanage_service.go

@@ -1659,21 +1659,23 @@ func GetInspectionDetailByProject(project_id int64, patientid int64, inspect_dat
 	return inspection, err
 }
 
-func GetInspectionItemlist(patientid int64, inspect_date []string, projectid []string) (inspection []*models.XtInspection, err error) {
+func GetInspectionItemlist(patientid int64, inspect_date []string, projectid []string) (inspection []*models.VmInspection, err error) {
 
-	db := XTReadDB().Model(&inspection).Where("status = 1")
+	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_inspection_reference as s").Where("s.status = 1")
+	fmt.Println(table)
 	if patientid > 0 {
-		db = db.Where("patient_id = ?", patientid)
+		db = db.Where("x.patient_id = ?", patientid)
 	}
 	if len(inspect_date) > 0 {
-		db = db.Where("inspect_date in(?)", inspect_date)
+		db = db.Where("x.inspect_date in(?)", inspect_date)
 	}
 
 	if len(projectid) > 0 {
-		db = db.Where("project_id in(?)", projectid)
+		db = db.Where("x.project_id in(?)", projectid)
 	}
 
-	err = db.Find(&inspection).Error
+	err = db.Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,t.range_max,t.range_min,t.range_value,t.unit").Joins("left join xt_inspection_reference as t on t.id = x.item_id").Scan(&inspection).Error
 	return inspection, err
 }
 

service/stock_service.go

@@ -4294,6 +4294,12 @@ func GetSearchGoodWarehouseList(keyword string, orgid int64) (info []*models.Blo
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.remark,x.warehousing_order,x.warehousing_unit,x.stock_count,x.license_number,x.warehousing_unit,t.good_name,t.specification_name,x.manufacturer,t.packing_price,t.id").Joins("left join xt_good_information as t on t.id = x.good_id").Where("t.good_name like ? and t.org_id = ?", likeKey, orgid).Order("x.ctime desc").Scan(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.remark,x.warehousing_order,x.warehousing_unit,x.stock_count,x.license_number,x.warehousing_unit,t.good_name,t.specification_name,x.manufacturer,t.packing_price,t.id as good_id,t.packing_unit,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Where("t.good_name like ? and t.org_id = ?", likeKey, orgid).Order("x.ctime desc").Scan(&info).Error
 	return info, err
 }
+
+func CreateAdjustPrice(adjustPrice *models.XtStockAdjustPrice) error {
+
+	err := XTWriteDB().Create(&adjustPrice).Error
+	return err
+}