历史排班

service/stock_service.go

@@ -3788,7 +3788,7 @@ func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib
 
 func GetSearchDrugListSix(keywords string, orgid int64, storehouse_id int64) (drug []*models.BaseDrugLib, err error) {
 
-	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  and drug_status<>'停用'", orgid)
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  AND find_in_set('停用',x.drug_status) = 0'", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {