医保对接

service/his_service.go

@@ -732,9 +732,9 @@ func GetAllDrugLibs(org_id int64) (drugs []*Drugs, err error) {
 func GetAllProjectList(org_id int64, keyword string) (list []*models.HisProject, err error) {
 	if len(keyword) != 0 {
 		key := "%" + keyword + "%"
-		err = readDb.Model(&models.HisProject{}).Where("user_org_id = ?  AND status = 1 AND project_name Like ?", org_id, key).Find(&list).Error
+		err = readDb.Model(&models.HisProject{}).Where("user_org_id = ?  AND status = 1 AND project_name Like ? ", org_id, key).Find(&list).Error
 	} else {
-		err = readDb.Model(&models.HisProject{}).Where("user_org_id = ?  AND status = 1", org_id).Find(&list).Error
+		err = readDb.Model(&models.HisProject{}).Where("user_org_id = ?  AND status = 1 ", org_id).Find(&list).Error
 	}
 
 	return
@@ -2133,7 +2133,6 @@ func GetNewHisOrderList(org_id int64) (order []*models.NewHisOrder, err error) {
 	for _, item := range order {
 		numbers = append(numbers, item.Number)
 	}
-
 	return
 }
 

service/stock_service.go

@@ -2905,10 +2905,10 @@ 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
+		err = XTReadDB().Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodInfo).Error
 
 	} else {
-		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 ? AND  find_in_set('停用',good_status) = 0", orgid, key).Find(&goodInfo).Error
 
 	}
 	return goodInfo, err