diff --git a/apps/drug/views.py b/apps/drug/views.py index 1f83b57..0b9a4a6 100644 --- a/apps/drug/views.py +++ b/apps/drug/views.py @@ -231,6 +231,7 @@ def get_drug_info(): def get_drug_manage(): seach_word = request.values.get("seach_word") b_code = request.values.get("b_code") + search_status = request.values.get("search_status") client_id = request.values.get("client_id") func_type = request.values.get("func_type") page = int(request.values.get("page", 1)) @@ -239,7 +240,8 @@ def get_drug_manage(): data_list = BllMedicament().get_drug_list( seach_word=seach_word, b_code=b_code, - client_id=client_id, func_type=func_type, page_param=page_param + client_id=client_id, func_type=func_type, page_param=page_param, + search_status=search_status, ) return jsonify(Utils.true_return(data={"data": Utils.msyql_table_model(data_list), "total_count":page_param.totalRecords})) diff --git a/db_logic/medicament.py b/db_logic/medicament.py index 58a9a07..4f6125c 100644 --- a/db_logic/medicament.py +++ b/db_logic/medicament.py @@ -228,7 +228,7 @@ class BllMedicament(Repository): return self.queryPage(orm_query, pageParam) # 试剂管理 - def get_drug_list(self, client_id, seach_word, b_code, func_type, page_param): + def get_drug_list(self, client_id, seach_word, b_code, func_type, page_param, search_status): filter_base = "" if client_id: filter_base += f" client_id='{client_id}' " @@ -237,6 +237,10 @@ class BllMedicament(Repository): if filter_base: filter_base += " and " filter_base += f" (`name` like '{seach_word}' or english_name like '{seach_word}') " + if search_status and int(search_status): + if filter_base: + filter_base += " and " + filter_base += f" status='{search_status}'" # 搜索bar_code if b_code: if len(b_code) > 10 and str(func_type) == "1": @@ -985,7 +989,7 @@ class BllMedicament(Repository): :return: {"is_liquid": 是否为液体, "use_volume": 液体用量, "use_quality": 固体用量, "net_weight_unit": 单位} """ if not drug.remain: - return + return medicament_variety_obj = BllMedicamentVariety().findEntity( EntityMedicamentVariety.variety_id == drug.variety_id) remain_result = {