diff --git a/backend/pmr_api.py b/backend/pmr_api.py index a9ed7f9..3dea33e 100644 --- a/backend/pmr_api.py +++ b/backend/pmr_api.py @@ -760,18 +760,21 @@ def get_patient_history(cus_code): pre_serial = row.PreSerial # 해당 처방의 약품 목록 조회 + # PS_Type=9 (대체조제 원처방)는 제외 cursor.execute(""" SELECT s.DrugCode, s.Days, s.QUAN, s.QUAN_TIME, + s.PS_Type, g.GoodsName, m.PRINT_TYPE FROM PS_sub_pharm s LEFT JOIN PM_DRUG.dbo.CD_GOODS g ON s.DrugCode = g.DrugCode LEFT JOIN PM_DRUG.dbo.CD_MC m ON s.DrugCode = m.DRUGCODE WHERE s.PreSerial = ? + AND (s.PS_Type IS NULL OR s.PS_Type != '9') ORDER BY s.SUB_SERIAL """, (pre_serial,)) @@ -783,7 +786,8 @@ def get_patient_history(cus_code): 'add_info': med_row.PRINT_TYPE or '', 'dosage': float(med_row.QUAN) if med_row.QUAN else 0, 'frequency': med_row.QUAN_TIME or 0, - 'duration': med_row.Days or 0 + 'duration': med_row.Days or 0, + 'ps_type': med_row.PS_Type or '0' }) # 날짜 포맷