nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"NULL変換を関数化・csvファイルデータが集合項目確認対応できるようにサンプルデータを追加"

Browse Source
This commit is contained in:
Nik Afiq 2023-11-29 17:05:53 +09:00
parent 7deebe6208
commit aa4a099a12
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_base_mapper.py
View File

@ -201,17 +201,7 @@ class ComPrefcMedBaseMapper(UltmarcTableMapper):
**self.record.to_sql_parameter(),
}
def make_query(self):
# 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除
if self.record.maint_flag == "B" and self.record.adddel_div == "1":
self.queries.append(self.PHYSICAL_DELETE_QUERY)
return
# 追加、更新の場合
self.queries.append(self.__make_upsert_query())
return
def __make_upsert_query(self):
def clear_query_parameter(self):
# 修正のレコードだった場合はNULLに変換する
# 情報年月日
if self.record.info_date == "@":
@ -324,6 +314,21 @@ class ComPrefcMedBaseMapper(UltmarcTableMapper):
self.query_parameter["stay_avg_sum"] = None
self.query_parameter["stay_avg_from"] = None
self.query_parameter["stay_avg_to"] = None
return
def make_query(self):
# 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除
if self.record.maint_flag == "B" and self.record.adddel_div == "1":
self.queries.append(self.PHYSICAL_DELETE_QUERY)
return
# 追加、更新の場合
self.queries.append(self.__make_upsert_query())
return
def __make_upsert_query(self):
# 修正のレコードだった場合はNULLに変換する
self.clear_query_parameter()
# レコードの存在確認
record_count = self.db.execute_select(
@ -482,3 +487,6 @@ class ComPrefcMedBaseMapper(UltmarcTableMapper):
update_columns += ","
update_query = self.UPDATE_QUERY.format(update_columns=update_columns)
return update_query
def __clear_query_parameter(self):
self

11
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/com_prefc_med_base_insert.csv
View File

@ -1,7 +1,8 @@
"132","00","9900146",,"A","2","20141113","20141114","20140624",,"1",,,,,,"1","1",,,,,,,,,,,,,,"18.8",,,,,,,,"20130401","20140331","49.8","20130401","20140331",,,,,,,,,,,,,,,,,,,,"39.3",,,,,,,,"20130401","20140331"
"132","00","9900194",,"A","2","20141113","20141114","20121101","http://www.hospital.misawa.aomori.jp/","1","1","1","0","20100401","20110331","1","1","1","1","1","1","1","1","1","1","1","1","1","1","3","205.4",,,,,,,,"20100401","20110331","468.1","20100401","20110331","8.3","20100401","20110331",,,,,,,,,,,,,,,,,"18.7",,,,,,"0.0",,"20100401","20110331"
"132","00","9900194",,"A","2","20141113","20141114","20121101",http://www.hospital.misawa.aomori.jp/,"1",1,1,0,20100401,20110331,"1","1",1,1,1,1,1,1,1,1,1,1,1,1,3,"205.4",,,,,,,,"20100401","20110331","468.1","20100401","20110331",8.3,20100401,20110331,,,,,,,,,,,,,,,,,"18.7",,,,,,0.0,,"20100401","20110331"
"132","00","9901649",,"A","2","20141113","20141114",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
"132","00","9901679",,"A","2","20141113","20141114","20140627","http://www.kai-sei-kai.com/","1",,,,,,"1","1","1","1","1",,"1",,,,,"1",,"1","2","58.5","229.2","102.3","131.3",,,,,"20130401","20140331","96.0","20130401","20140331",,,,,,,,,,,,,,,,,,,,"20.4","641.3","533.2","749.2",,,,,"20130401","20140331"
"132","00","9929798",,"A","2","20141113","20141114","20130611","http://www.urakawa.jrc.or.jp/","1",,,,,,"1","1","1","1","1",,"1",,,,,,,"1","1","114.6","46.6",,,"39.9","0.0","0.0",,"20120401","20130331","481.6","20120401","20130331","16.2","20120401","20130331",,,,,,,,,,,,,,,,,"15.6","555.3",,,"169.4","0.0","0.0",,"20120401","20130331"
"132","99","9999999","88","A","2","20141113","20141114","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@"
"132","99","9999999","99","A","2","20141113","20141114","20130611","aaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbz","1","2","3","4444","20150101","20160101","1","1","1","1","1","1","1","1","1","1","1","1","1","1","123","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","20120401","20130331","12345.6","20120401","20130331","12345.6","20120401","20130331","123467","123467","123467","123467","123467","123467","123467","123467","20200202","20200202","123467","20200202","20200202","123467","20200202","20200202","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","20120401","20130331"
"132","00","9901679",,"A","2","20141113","20141114","20140627",http://www.kai-sei-kai.com/,"1",,,,,,"1","1",1,1,1,,1,,,,,1,,1,2,"58.5",229.2,102.3,131.3,,,,,"20130401","20140331","96.0","20130401","20140331",,,,,,,,,,,,,,,,,,,,"20.4",641.3,533.2,749.2,,,,,"20130401","20140331"
"132","00","9929798",,"A","2","20141113","20141114","20130611",http://www.urakawa.jrc.or.jp/,"1",,,,,,"1","1",1,1,1,,1,,,,,,,1,1,"114.6",46.6,,,39.9,0.0,0.0,,"20120401","20130331","481.6","20120401","20130331",16.2,20120401,20130331,,,,,,,,,,,,,,,,,"15.6",555.3,,,169.4,0.0,0.0,,"20120401","20130331"
"132","99","9999999",88,"A","2","20141113","20141114","@",@,"@",@,@,@,@,@,"@","@",@,@,@,@,@,@,@,@,@,@,@,@,@,"@",@,@,@,@,@,@,@,"@","@","@","@","@",@,@,@,@,@,@,@,@,@,@,@,@,@,@,@,@,@,@,@,"@",@,@,@,@,@,@,@,"@","@"
"132","99","9999999",89,"A","2","20141113","20141114","@",@,"@",@,@,4444,20100401,20110331,"@","@",@,@,@,@,@,@,1,1,1,@,@,@,12345,"@",146.6,114.5,39.2,679.4,753.1,951.3,0.0,"20120401","20130331","@","20220430","20220517",@,20230623,20230707,@,147258,369147,258369,987654,321789,753159,842862,20200202,20200220,@,20220222,20230330,@,20060606,20070707,"@",159.3,25.6,154.1,35.1,397.8,65.7,62.5,"19980430","19990501"
"132","99","9999999",99,"A","2","20141113","20141114","20130611",aaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbz,"1",2,3,4444,20150101,20160101,"1","1",1,1,1,1,1,1,1,1,1,1,1,1,123,"12345.6",12345.6,12345.6,12345.6,12345.6,12345.6,12345.6,12345.6,"20120401","20130331","12345.6","20120401","20130331",12345.6,20120401,20130331,123467,123467,123467,123467,123467,123467,123467,123467,20200202,20200202,123467,20200202,20200202,123467,20200202,20200202,"12345.6",12345.6,12345.6,12345.6,12345.6,12345.6,12345.6,12345.6,"20120401","20130331"

1 132 00 9900146 A 2 20141113 20141114 20140624 1 1 1 18.8 20130401 20140331 49.8 20130401 20140331 39.3 20130401 20140331
2 132 00 9900194 A 2 20141113 20141114 20121101 http://www.hospital.misawa.aomori.jp/ 1 1 1 0 20100401 20110331 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3 205.4 20100401 20110331 468.1 20100401 20110331 8.3 20100401 20110331 18.7 0.0 20100401 20110331
3 132 00 9901649 A 2 20141113 20141114
4 132 00 9901679 A 2 20141113 20141114 20140627 http://www.kai-sei-kai.com/ 1 1 1 1 1 1 1 1 1 2 58.5 229.2 102.3 131.3 20130401 20140331 96.0 20130401 20140331 20.4 641.3 533.2 749.2 20130401 20140331
5 132 00 9929798 A 2 20141113 20141114 20130611 http://www.urakawa.jrc.or.jp/ 1 1 1 1 1 1 1 1 1 114.6 46.6 39.9 0.0 0.0 20120401 20130331 481.6 20120401 20130331 16.2 20120401 20130331 15.6 555.3 169.4 0.0 0.0 20120401 20130331
6 132 99 9999999 88 A 2 20141113 20141114 @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @
7 132 99 9999999 99 89 A 2 20141113 20141114 20130611 @ aaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbz @ 1 @ 2 @ 3 @ 4444 20150101 20100401 20160101 20110331 1 @ 1 @ 1 @ 1 @ 1 @ 1 @ 1 @ 1 @ 1 1 1 1 @ 1 @ 1 @ 123 12345 12345.6 @ 12345.6 146.6 12345.6 114.5 12345.6 39.2 12345.6 679.4 12345.6 753.1 12345.6 951.3 12345.6 0.0 20120401 20130331 12345.6 @ 20120401 20220430 20130331 20220517 12345.6 @ 20120401 20230623 20130331 20230707 123467 @ 123467 147258 123467 369147 123467 258369 123467 987654 123467 321789 123467 753159 123467 842862 20200202 20200202 20200220 123467 @ 20200202 20220222 20200202 20230330 123467 @ 20200202 20060606 20200202 20070707 12345.6 @ 12345.6 159.3 12345.6 25.6 12345.6 154.1 12345.6 35.1 12345.6 397.8 12345.6 65.7 12345.6 62.5 20120401 19980430 20130331 19990501
8 132 99 9999999 99 A 2 20141113 20141114 20130611 aaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbz 1 2 3 4444 20150101 20160101 1 1 1 1 1 1 1 1 1 1 1 1 1 1 123 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 20120401 20130331 12345.6 20120401 20130331 12345.6 20120401 20130331 123467 123467 123467 123467 123467 123467 123467 123467 20200202 20200202 123467 20200202 20200202 123467 20200202 20200202 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 20120401 20130331

1
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/expect_com_prefc_med_base_insert.csv
View File

@ -5,4 +5,5 @@
"009901679","20140627","http://www.kai-sei-kai.com/","1",,,,,,"1","1","1","1","1",,"1",,,,,"1",,"1","2","58.5","229.2","102.3","131.3",,,,,"20130401","20140331","96.0","20130401","20140331",,,,,,,,,,,,,,,,,,,,"20.4","641.3","533.2","749.2",,,,,"20130401","20140331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper"
"009929798","20130611","http://www.urakawa.jrc.or.jp/","1",,,,,,"1","1","1","1","1",,"1",,,,,,,"1","1","114.6","46.6",,,"39.9","0.0","0.0",,"20120401","20130331","481.6","20120401","20130331","16.2","20120401","20130331",,,,,,,,,,,,,,,,,"15.6","555.3",,,"169.4","0.0","0.0",,"20120401","20130331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper"
"99999999988","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","20130331","NULL","NULL","NULL","NULL","NULL","2000/05/09 20:39:15","com_prefc_med_base_mapper","2000/05/09 20:39:15","com_prefc_med_base_mapper"
"99999999989","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","20130331","NULL","NULL","NULL","NULL","NULL","2000/05/09 20:39:15","com_prefc_med_base_mapper","2000/05/09 20:39:15","com_prefc_med_base_mapper"
"99999999999","20130611","aaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbz","1","2","3","4444","20150101","20160101","1","1","1","1","1","1","1","1","1","1","1","1","1","1","123","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","20120401","20130331","12345.6","20120401","20130331","12345.6","20120401","20130331","123467","123467","123467","123467","123467","123467","123467","123467","20200202","20200202","123467","20200202","20200202","123467","20200202","20200202","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","20120401","20130331","20130331","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper"

1 dcf_dsf_inst_cd info_date home_page hppre_flg expre_flg trial_flg trial_contcount trialwhet_from trialwhet_to equipment_flg cos_disease_flg cos_surgery specialclinic_flg establishment_flg critical_flg cop_system sys_exists_flg sys_inspection sys_prescription sys_reserv icduse_flg echart_flg fulltime_flg fulltime_count ge_patient_avg mt_patient_avg mc_patient_avg ca_patient_avg pys_patient_avg tub_patient_avg inf_patient_avg patient_avg_sum patient_avg_from patient_avg_to cl_patient_avg cl_patient_avg_from cl_patient_avg_to hm_patient_avg hm_patient_avg_from hm_patient_avg_to ge_patient_ex mt_patient_ex mc_patient_ex ca_patient_ex pys_patient_ex tub_patient_ex inf_patient_ex patient_ex_sum patient_ex_from patient_ex_to cl_patient_ex cl_patient_ex_from cl_patient_ex_to hm_patient_ex hm_patient_ex_from hm_patient_ex_to ge_stay_avg mt_stay_avg mc_stay_avg ca_stay_avg pys_stay_avg tub_stay_avg inf_stay_avg stay_avg_sum stay_avg_from stay_avg_to regist_ymd update_ymd regist_date create_user update_date update_user sys_regist_date regist_prgm_id sys_update_date update_prgm_id
5 009901679 20140627 http://www.kai-sei-kai.com/ 1 1 1 1 1 1 1 1 1 2 58.5 229.2 102.3 131.3 20130401 20140331 96.0 20130401 20140331 20.4 641.3 533.2 749.2 20130401 20140331 20230510 NULL NULL NULL NULL NULL 2023/05/09 20:39:15 com_prefc_med_base_mapper 2023/05/09 20:39:15 com_prefc_med_base_mapper
6 009929798 20130611 http://www.urakawa.jrc.or.jp/ 1 1 1 1 1 1 1 1 1 114.6 46.6 39.9 0.0 0.0 20120401 20130331 481.6 20120401 20130331 16.2 20120401 20130331 15.6 555.3 169.4 0.0 0.0 20120401 20130331 20230510 NULL NULL NULL NULL NULL 2023/05/09 20:39:15 com_prefc_med_base_mapper 2023/05/09 20:39:15 com_prefc_med_base_mapper
7 99999999988 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 20130331 NULL NULL NULL NULL NULL 2000/05/09 20:39:15 com_prefc_med_base_mapper 2000/05/09 20:39:15 com_prefc_med_base_mapper
8 99999999989 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 20130331 NULL NULL NULL NULL NULL 2000/05/09 20:39:15 com_prefc_med_base_mapper 2000/05/09 20:39:15 com_prefc_med_base_mapper
9 99999999999 20130611 aaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbz 1 2 3 4444 20150101 20160101 1 1 1 1 1 1 1 1 1 1 1 1 1 1 123 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 20120401 20130331 12345.6 20120401 20130331 12345.6 20120401 20130331 123467 123467 123467 123467 123467 123467 123467 123467 20200202 20200202 123467 20200202 20200202 123467 20200202 20200202 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 12345.6 20120401 20130331 20130331 NULL NULL NULL NULL NULL 2023/05/09 20:39:15 com_prefc_med_base_mapper 2023/05/09 20:39:15 com_prefc_med_base_mapper