医保对接

controllers/manager_center_api_controller.go

@@ -141,7 +141,6 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	packing_unit := c.GetString("packing_unit")
 	packing_price, _ := c.GetFloat("packing_price")
 	drug_day := c.GetString("drug_day")
-	//hosp_appr_flag
 	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	adminInfo := c.GetAdminUserInfo()

models/drug.go

@@ -75,7 +75,7 @@ type BaseDrugLib struct {
 }
 
 func (BaseDrugLib) TableName() string {
-	return ""
+	return "xt_base_drug"
 }
 
 type DrugUnitSafeguard struct {

service/stock_service.go

@@ -468,7 +468,8 @@ func FindLastDrugWarehousingInfoByID(drug_id int64) (info models.XtDrugWarehouse
 	return info, err
 }
 
-// 出库时先进先出，找出最先入库的批次
+//
+//// 出库时先进先出，找出最先入库的批次
 //func  (drug_id int64) (info models.WarehousingInfo, err error) {
 //	err = readDb.Model(&models.WarehousingInfo{}).Where("drup_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
 //	return info, err
@@ -578,9 +579,6 @@ type Drug struct {
 	MaxUnit         string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinUnit         string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	LastPrice       float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	HospApprFlag    int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	LmtUsedFlag     int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
-	Total           float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (Drug) TableName() string {
@@ -2186,13 +2184,10 @@ func (VMWarehousingInfo) TableName() string {
 }
 
 type GoodInfo struct {
-	ID                int64   `gorm:"column:id" json:"id"`
-	SpecificationName string  `gorm:"column:specification_name" json:"specification_name"`
-	Status            int64   `gorm:"column:status" json:"status"`
-	OrgId             int64   `gorm:"column:org_id" json:"org_id"`
-	GoodName          string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	GoodUnit          int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	ID                int64  `gorm:"column:id" json:"id"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name"`
+	Status            int64  `gorm:"column:status" json:"status"`
+	OrgId             int64  `gorm:"column:org_id" json:"org_id"`
 }
 
 func (GoodInfo) TableName() string {
@@ -2333,13 +2328,14 @@ func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutI
 }
 
 func GetGoodInfomationList(orgid int64, keyword string) (goodInfo []*models.GoodInfo, err error) {
+	key := "%" + keyword + "%"
 	if len(keyword) == 0 {
 		err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
+
 	} else {
-		key := "%" + keyword + "%"
-		err = XTReadDB().Where("org_id = ? and status = 1 and good_name Like ?", orgid, key).Find(&goodInfo).Error
-	}
+		err = XTReadDB().Where("org_id = ? and status = 1 AND good_name like ?", orgid, key).Find(&goodInfo).Error
 
+	}
 	return goodInfo, err
 }
 

service/warhouse_service.go

@@ -419,7 +419,7 @@ package service
 //			Dealer:                  0,
 //			IsSys:                   1,
 //			SysRecordTime:           record_time,
-//			GoodTypeId:              goods.GoodTypeId,
+//			GoodTypeId:              goods..GoodTypeId,
 //			GoodId:                  goods.GoodId,
 //			PatientId:				 patient_id,
 //		}
@@ -494,7 +494,7 @@ package service
 //			Dealer:                  0,
 //			IsSys:                   2,
 //			SysRecordTime:           record_time,
-//			GoodTypeId:              goods.GoodTypeId,
+//			GoodTypeId:              goods..GoodTypeId,
 //			GoodId:                  goods.GoodId,
 //			PatientId:				 patient_id,
 //		}