From 9bdfdf3461ce3caf303029be3d44bdc77b18d368 Mon Sep 17 00:00:00 2001 From: Nik Afiq Date: Tue, 28 Nov 2023 17:27:26 +0900 Subject: [PATCH 1/3] "Med Equipment Fix" --- .../concrete/com_prefc_med_equpment_mapper.py | 8 +++++--- .../ultmarc/utmp_tables/tables/com_prefc_med_equpment.py | 1 + 2 files changed, 6 insertions(+), 3 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..d48059af 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,6 +89,10 @@ 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 @@ -97,9 +101,7 @@ class ComPrefcMedEqupmentMapper(UltmarcTableMapper): # 存在する場合は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_equpment.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_prefc_med_equpment.py index 491a0a3f..bacc0435 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 @@ -25,6 +25,7 @@ class ComPrefcMedEqupment(UltmarcTable): # 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]) From 4f4cb464ca81ed21448cd813eca384976679c894 Mon Sep 17 00:00:00 2001 From: Nik Afiq Date: Tue, 28 Nov 2023 18:12:50 +0900 Subject: [PATCH 2/3] =?UTF-8?q?"Med=20Equipment=E3=81=AEcsv=E5=80=A4?= =?UTF-8?q?=E5=A4=89=E6=9B=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_prefc_med_equpment/com_prefc_med_equpment_insert.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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","@" From edbb9a46d23ce595ef6fbf7cceea88d640cd0dd0 Mon Sep 17 00:00:00 2001 From: Nik Afiq Date: Tue, 28 Nov 2023 18:30:51 +0900 Subject: [PATCH 3/3] =?UTF-8?q?"=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=80=81=E6=9B=B4=E6=96=B0=E3=83=95=E3=83=A9?= =?UTF-8?q?=E3=82=B0=E5=88=9D=E6=9C=9F=E5=80=A4=E3=82=92True=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../batch/ultmarc/utmp_tables/tables/com_prefc_med_equpment.py | 3 +++ 1 file changed, 3 insertions(+) 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 bacc0435..c0d90d24 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,6 +23,9 @@ 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