|
|
|
@ -275,7 +275,7 @@ class BllMedicament(Repository):
|
|
|
|
|
# 拼接查询条件及分组条件
|
|
|
|
|
filter_base = ""
|
|
|
|
|
if name:
|
|
|
|
|
filter_base = f" where `name` LIKE %'{name}'%"
|
|
|
|
|
filter_base = f" where `name` LIKE '%{name}%'"
|
|
|
|
|
filter_base += " GROUP BY `name`, speci, purity"
|
|
|
|
|
sql_all = sql_all % filter_base
|
|
|
|
|
|
|
|
|
@ -356,7 +356,7 @@ class BllMedicament(Repository):
|
|
|
|
|
filter_sql = f"WHERE record_type={record_type}"
|
|
|
|
|
|
|
|
|
|
if put_in_user_name:
|
|
|
|
|
filter_sql += f" and create_user_name like '{put_in_user_name}'"
|
|
|
|
|
filter_sql += f" and create_user_name like '%{put_in_user_name}%'"
|
|
|
|
|
if start_time and end_time:
|
|
|
|
|
filter_sql += f" and create_date >= '{start_time}' and create_date <= '{end_time}'"
|
|
|
|
|
filter_sql_1 = ''
|
|
|
|
|