From 34a63c2630f179c4e82fb23ff9fec26f19d5a6c3 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 28 Nov 2023 10:22:55 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20COM=5F=E9=83=BD=E9=81=93=E5=BA=9C?= =?UTF-8?q?=E7=9C=8C=E5=8C=BB=E7=99=82=E6=A9=9F=E8=83=BD=E6=83=85=E5=A0=B1?= =?UTF-8?q?(=E7=96=BE=E6=82=A3=E6=B2=BB=E7=99=82)=E3=81=AE=E6=96=B0?= =?UTF-8?q?=E8=A6=8F=E7=99=BB=E9=8C=B2=E6=99=82=E3=81=AB=E3=80=81=E5=89=8D?= =?UTF-8?q?=E5=B9=B4=E4=BB=B6=E6=95=B0=E3=81=AB@=E3=83=9E=E3=83=BC?= =?UTF-8?q?=E3=82=AF=E3=81=8C=E6=B8=A1=E3=81=A3=E3=81=A6=E3=81=8F=E3=82=8B?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AE=E8=80=83=E6=85=AE=E6=BC=8F=E3=82=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=EF=BC=88=E6=A8=AA=E5=B1=95=E9=96=8B?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_prefc_med_equpment_mapper.py | 9 ++++++--- .../utmp_tables/tables/com_prefc_med_dis_treat.py | 4 ++-- .../ultmarc/utmp_tables/tables/com_prefc_med_equpment.py | 4 ++++ .../com_prefc_med_equpment_insert.csv | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_equpment_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_equpment_mapper.py index 4d345900..193fa0a1 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_equpment_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_equpment_mapper.py @@ -89,17 +89,20 @@ class ComPrefcMedEqupmentMapper(UltmarcTableMapper): return def __make_upsert_query(self): + # 修正のレコードだった場合はNULLに変換する + if self.record.bed_num == '@': + self.query_parameter['bed_num'] = None + # レコードの存在確認 record_count = self.db.execute_select(self.RECORD_EXISTS_QUERY, self.query_parameter) + # 存在しない場合はInsert if record_count[0]['count_num'] == 0: return self.INSERT_QUERY # 存在する場合はUpdate # 病床数が空の場合は更新しない - if self.record.bed_num is not None: - if self.record.bed_num == '@': - self.query_parameter['bed_num'] = None + if self.record.is_bed_num_not_empty: return self.UPDATE_QUERY else: return None diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_prefc_med_dis_treat.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_prefc_med_dis_treat.py index 979e40a9..5185e84a 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_prefc_med_dis_treat.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_prefc_med_dis_treat.py @@ -7,7 +7,7 @@ class ComPrefcMedDisTreat(UltmarcTable): dcfhp_code: str # DCFｺｰﾄﾞ（施設ｺｰﾄﾞ） dcfhp_yobi: str # DCFｺｰﾄﾞ（予備） treatment_code: str # 疾患治療ｺｰﾄﾞ - pre_num: str # 前年比 + pre_num: str # 前年件数 adddel_div: str # 追加削除区分 maint_flag: str # 修正区分 @@ -23,7 +23,7 @@ class ComPrefcMedDisTreat(UltmarcTable): self.adddel_div = record[6] self.pre_num = record[9] - # Update判断フラグ。数値が空の場合は更新しない。 + # Update判断フラグ。前年件数が空の場合は更新しない。 self.is_pre_num_not_empty = True # smallint型のカラム値は、空文字で渡ってきた場合はNULLに変換する diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_prefc_med_equpment.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_prefc_med_equpment.py index 491a0a3f..0e2e4a44 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_prefc_med_equpment.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_prefc_med_equpment.py @@ -23,8 +23,12 @@ class ComPrefcMedEqupment(UltmarcTable): self.adddel_div = record[6] self.bed_num = record[9] + # Update判断フラグ。病床数が空の場合は更新しない。 + self.is_bed_num_not_empty = True + # smallint型のカラム値は、空文字で渡ってきた場合はNULLに変換する self.bed_num = self.bed_num if len(self.bed_num) > 0 else None + self.is_bed_num_not_empty = self.bed_num is not None # DCFDSF施設コード self.dcfdsf_inst_code = ''.join([self.dcfhp_id, self.dcfhp_code, self.dcfhp_yobi]) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_equpment/com_prefc_med_equpment_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_equpment/com_prefc_med_equpment_insert.csv index b5882b97..83362ab7 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_equpment/com_prefc_med_equpment_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_equpment/com_prefc_med_equpment_insert.csv @@ -3,4 +3,4 @@ "133","00","9901649","","A","009","2","20141113","20141114","3" "133","00","9901679","","A","015","2","20141113","20141114","" "133","00","9904439","","A","006","2","20141113","20141114","" -"133","00","9929798","","A","010","2","20141113","20141114","" +"133","00","9929798","","A","010","2","20141113","20141114","@"