From 80d4b0355761a21d9183982826e69c876767bc42 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 10 May 2023 10:26:22 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=82=E8=80=83=E3=80=81=E3=83=AB?= =?UTF-8?q?=E3=83=BC=E3=83=97=E3=81=A7=E9=80=A3=E7=95=AA=E9=A0=85=E7=9B=AE?= =?UTF-8?q?=E3=82=92=E5=87=A6=E7=90=86=E3=81=99=E3=82=8B=E9=83=A8=E5=88=86?= =?UTF-8?q?=E3=81=AE=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_inst_att_mapper.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py index a02f2965..70df59e1 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py @@ -823,19 +823,17 @@ class ComInstAttMapper(UltmarcTableMapper): # 地域連携ｸﾘﾃｨｶﾙﾊﾟｽ if len(self.record.critical_flag) > 0: set_clauses.append('critical_flag = :critical_flag') + # 項目クリア判断 + is_aggregate_item_clear = self.record.critical_flag == '@' + if is_aggregate_item_clear: + self.query_parameter['critical_flag'] = None # 20個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) for i in range(1, 21): num = str(i).zfill(2) # 2桁で0埋め - setting_item = 'critical_code' + num + ' = :critical_code' + num - set_clauses.append(setting_item) - - if self.record.critical_flag == '@': - self.query_parameter['critical_flag'] = None - # 20個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) - for i in range(1, 21): - num = str(i).zfill(2) - setting_item = 'critical_code' + num - self.query_parameter[setting_item] = None + setting_item_name = f'critical_code{num}' + set_clauses.append(f'{setting_item_name} = :{setting_item_name}') + if is_aggregate_item_clear: + self.query_parameter[setting_item_name] = None # 薬剤管理指導料 if len(self.record.drgmgthp_flag) > 0: