Merge branch 'develop' into feature-NEWDWH2021-1011-COM_REHABILI

# Conflicts:
#	ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py

ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py

@@ -15,16 +15,14 @@ def exec():
         db.connect()
         logger.debug('##########################')
         logger.debug('START Changing Employee in charge of institution PGM.')
-        # 業務日付を取得
-        syor_date = batch_context.syor_date
         # `emp_chg_inst_lau`をTruncate
         _truncate_emp_chg_inst_lau(db)
         # emp_chg_inst から、`emp_chg_inst_lau`へInsert
         _insert_into_emp_chg_inst_lau_from_emp_chg_inst(db)
-        # vop_hco_merge_vから、emp_chg_inst_lauをUpdate
-        _update_emp_chg_inst_lau_from_vop_hco_merge_v(db, syor_date)
-        # dcf_inst_mergeから、emp_chg_inst_lauをUpdate
-        _update_dcf_inst_merge_from_emp_chg_inst_lau(db, syor_date)
+        # v_inst_merge_tから、emp_chg_inst_lauをUpdate
+        _update_emp_chg_inst_lau_from_v_inst_merge_t(db)
+        # inst_merge_tから、emp_chg_inst_lauをUpdate
+        _update_emp_chg_inst_lau_from_inst_merge_t(db)
         logger.debug('##########################')
         logger.debug('End All Processing PGM.')
     except Exception as e:
@@ -81,8 +79,8 @@ def _insert_into_emp_chg_inst_lau_from_emp_chg_inst(db: Database):
     return
 
 
-def _update_emp_chg_inst_lau_from_vop_hco_merge_v(db: Database, syor_date: str):
-    # vop_hco_merge_vはデータが作られないため、この洗い替え処理は基本空振りする
+def _update_emp_chg_inst_lau_from_v_inst_merge_t(db: Database):
+    # v_inst_merge_tの元となるvop_hco_merge_vはデータが作られないため、この洗い替え処理は基本空振りする
     logger.debug("##########################")
     try:
         select_result = db.execute_select(
@@ -90,93 +88,19 @@ def _update_emp_chg_inst_lau_from_vop_hco_merge_v(db: Database, syor_date: str):
             SELECT
                 COUNT(v_inst_cd) AS row_count
             FROM
-                src05.vop_hco_merge_v
-            WHERE
-                STR_TO_DATE(apply_dt, '%Y-%m-%d') <= :syor_date
-            """,
-            {'syor_date': syor_date}
+                internal05.v_inst_merge_t
+            """
         )
     except Exception as e:
-        logger.debug("Error! `vop_hco_merge_v` Table count error!")
+        logger.debug("Error! `v_inst_merge_t` Table count error!")
         raise e
     count = [row for row in select_result][0]['row_count']
     if count == 0:
-        logger.info('vop_hco_merge_v Table Data is not exists!')
+        logger.info('v_inst_merge_t Table Data is not exists!')
         return
 
-    logger.info('vop_hco_merge_v Table Data is exists!')
-    # vop_hco_merge_v から、emp_chg_inst_lauをUpdateします
-    result = db.execute_select(
-        """
-        SELECT
-            v_inst_cd,
-            v_inst_cd_merg
-        FROM
-            src05.vop_hco_merge_v
-        WHERE
-            STR_TO_DATE(apply_dt, '%Y-%m-%d') <= :syor_date
-        ORDER BY
-            STR_TO_DATE(apply_dt, '%Y-%m-%d') ASC
-        """,
-        {'syor_date': syor_date}
-    )
-    for row in result:
-        v_inst_cd = row['v_inst_cd']
-        v_inst_cd_merge = row['v_inst_cd_merg']
-        try:
-            elapsed_time = ElapsedTime()
-            update_sql = """
-                UPDATE
-                    emp_chg_inst_lau
-                SET
-                    inst_cd = :v_inst_merge,
-                    lua_ope_dt = SYSDATE()
-                WHERE
-                    inst_cd = :v_inst_cd;
-            """
-            update_result = db.execute(
-                update_sql,
-                {'v_inst_cd': v_inst_cd, 'v_inst_cd_merg': v_inst_cd_merge}
-            )
-            logging_sql(logger, update_sql)
-            logger.info(f'Query OK, {update_result.rowcount} rows affected ({elapsed_time.of})')
-        except Exception as e:
-            logger.debug(f"emp_chg_inst_lau v_inst_cd could not set from {v_inst_cd_merge} to {v_inst_cd_merge}!")
-            raise e
-        logger.debug(f"Success! emp_chg_inst_lau v_inst_cd was set from {v_inst_cd} to {v_inst_cd_merge}!")
-        return
-
-
-def _update_dcf_inst_merge_from_emp_chg_inst_lau(db: Database, syor_date: str):
-    # dcf_inst_mergeから、emp_chg_inst_lauをUpdate
-    # Get count from DCF_INST_MERGE
-    logger.debug("##########################")
-    try:
-        select_result = db.execute_select(
-            """
-            SELECT
-                COUNT(dcf_inst_cd) AS row_count
-            FROM
-                src05.dcf_inst_merge
-            WHERE
-                    muko_flg = '0'
-                AND dcf_inst_cd_new IS NOT NULL
-                AND enabled_flg = 'Y'
-                AND STR_TO_DATE(CONCAT(tekiyo_month, '01'), '%Y%m%d') <= :syor_date
-            """,
-            {'syor_date': syor_date}
-        )
-    except Exception as e:
-        logger.debug("Error! Getting Count of dcf_inst_merge was failed!")
-        raise e
-
-    count = [row for row in select_result][0]['row_count']
-    if count == 0:
-        logger.info('dcf_inst_merge Table Data is not exists!')
-        return
-
-    logger.debug('dcf_inst_merge Table Data is exists!')
-    # dcf_inst_mergeから、emp_chg_inst_lauをUpdate
+    logger.info('v_inst_merge_t Table Data is exists!')
+    # v_inst_merge_t から、emp_chg_inst_lauをUpdateします
     logger.debug("##########################")
     logger.debug("#### UPDATE DATA #########")
     logger.debug("##########################")
@@ -184,29 +108,64 @@ def _update_dcf_inst_merge_from_emp_chg_inst_lau(db: Database, syor_date: str):
         elapsed_time = ElapsedTime()
         update_sql = """
             UPDATE
-                src05.emp_chg_inst_lau el,
-                (
-                    SELECT
-                        dcf_inst_cd,
-                        dcf_inst_cd_new
-                    FROM
-                        src05.dcf_inst_merge
-                    WHERE
-                            muko_flg = '0'
-                        AND dcf_inst_cd_new IS NOT NULL
-                        AND enabled_flg = 'Y'
-                        AND STR_TO_DATE(CONCAT(tekiyo_month, '01'), '%Y%m%d') <= :syor_date
-                ) dm
+                src05.emp_chg_inst_lau el, internal05.v_inst_merge_t vimt
             SET
-                el.inst_cd = dm.dcf_inst_cd_new,
+                el.inst_cd = vimt.v_inst_cd_merge,
                 el.lua_ope_dt = SYSDATE()
             WHERE
-                el.inst_cd = dm.dcf_inst_cd
+                el.inst_cd = vimt.v_inst_cd
         """
-        res = db.execute(
-            update_sql,
-            {'syor_date': syor_date}
-        )
+        res = db.execute(update_sql)
+        logging_sql(logger, update_sql)
+        logger.info(f'Query OK, {res.rowcount} rows affected ({elapsed_time.of})')
+    except Exception as e:
+        logger.debug("emp_chg_inst_lau.v_inst_cd could not set!")
+        raise e
+
+    logger.debug("emp_chg_inst_lau.v_inst_cd was set!")
+
+    return
+
+
+def _update_emp_chg_inst_lau_from_inst_merge_t(db: Database):
+    # inst_merge_tから、emp_chg_inst_lauをUpdate
+    # Get count from INST_MERGE_T
+    logger.debug("##########################")
+    try:
+        select_result = db.execute_select(
+            """
+            SELECT
+                COUNT(dcf_dsf_inst_cd) AS row_count
+            FROM
+                internal05.inst_merge_t
+            """
+        )
+    except Exception as e:
+        logger.debug("Error! Getting Count of internal05.inst_merge_t was failed!")
+        raise e
+
+    count = [row for row in select_result][0]['row_count']
+    if count == 0:
+        logger.info('inst_merge_t Table Data is not exists!')
+        return
+
+    logger.debug('inst_merge_t Table Data is exists!')
+    # inst_merge_tから、emp_chg_inst_lauをUpdate
+    logger.debug("##########################")
+    logger.debug("#### UPDATE DATA #########")
+    logger.debug("##########################")
+    try:
+        elapsed_time = ElapsedTime()
+        update_sql = """
+            UPDATE
+                src05.emp_chg_inst_lau el, internal05.inst_merge_t imt
+            SET
+                el.inst_cd = imt.dup_opp_cd,
+                el.lua_ope_dt = SYSDATE()
+            WHERE
+                el.inst_cd = imt.dcf_dsf_inst_cd
+        """
+        res = db.execute(update_sql)
         logging_sql(logger, update_sql)
         logger.info(f'Query OK, {res.rowcount} rows affected ({elapsed_time.of})')
     except Exception as e:

ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_med_func_valuation_mapper.py

@@ -0,0 +1,100 @@
+from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \
+    UltmarcTableMapper
+from src.batch.ultmarc.utmp_tables.tables.com_med_func_valuation import ComMedFuncValuation
+
+
+class ComMedFuncValuationMapper(UltmarcTableMapper):
+    """レイアウト区分024: COM_医療機器評価 登録処理"""
+
+    # レコード存在確認SQL
+    RECORD_EXISTS_QUERY = """\
+    SELECT
+        COUNT(*) AS count_num
+    FROM
+        src05.com_med_func_valuation
+    WHERE
+        med_func_valuation_cd = :med_func_valuation_cd
+    """
+    # データ登録用SQL
+    INSERT_QUERY = """\
+    INSERT INTO src05.com_med_func_valuation
+    (
+        med_func_valuation_cd,
+        med_func_valuation_name,
+        regist_ymd,
+        update_ymd,
+        delete_ymd,
+        sys_regist_date,
+        regist_prgm_id,
+        sys_update_date,
+        update_prgm_id
+
+    )
+    VALUES (
+        :med_func_valuation_cd,
+        :med_func_valuation_name,
+        :execute_date_str_ymd,
+        :execute_date_str_ymd,
+        NULL,
+        :execute_datetime,
+        :program_name,
+        :execute_datetime,
+        :program_name
+    )
+    """
+
+    UPDATE_QUERY = """\
+    UPDATE
+        src05.com_med_func_valuation
+    SET
+        med_func_valuation_name = :med_func_valuation_name,
+        update_ymd = :execute_date_str_ymd,
+        sys_update_date = :execute_datetime,
+        update_prgm_id = :program_name
+    WHERE
+        med_func_valuation_cd = :med_func_valuation_cd
+    """
+
+    # 修正区分が「C(削除)」の場合の更新SQL
+    LOGICAL_DELETE_QUERY = """\
+    UPDATE
+        src05.com_med_func_valuation
+    SET
+        delete_ymd = :execute_date_str_ymd,
+        sys_update_date = :execute_date_str_ymd,
+        update_prgm_id = :program_name
+    WHERE
+        med_func_valuation_cd = :med_func_valuation_cd
+    """
+    record: ComMedFuncValuation
+
+    def __init__(self, record: list[str], db) -> None:
+        super().__init__(record, db, ComMedFuncValuation)
+        program_name = __name__.split('.')[-1]  # 当モジュール名(現行から変わっている)
+        # モジュール名をクエリパラメータに設定
+        self.query_parameter['program_name'] = program_name
+        # 読み込んだレコード値もクエリパラメータに追加
+        self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()}
+
+    def make_query(self):
+        # 修正区分がC(削除)の場合、論理削除
+        if self.record.maint_flag == 'C':
+            self.queries.append(self.LOGICAL_DELETE_QUERY)
+            return
+
+        # 追加、更新の場合
+        self.queries.append(self.__make_upsert_query())
+        return
+
+    def __make_upsert_query(self):
+        # レコードの存在確認
+        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
+
+        # med_func_valuation_nameが空で無い場合はUpdate
+        if len(self.record.med_func_valuation_name) == 0:
+            return None
+        else:
+            return self.UPDATE_QUERY

ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_regn_critic_pass_mapper.py

@@ -0,0 +1,97 @@
+from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \
+    UltmarcTableMapper
+from src.batch.ultmarc.utmp_tables.tables.com_regn_critic_pass import ComRegnCriticPass
+
+
+class ComRegnCriticPassMapper(UltmarcTableMapper):
+    """レイアウト区分026: COM_地域クリティカルパス 登録処理"""
+
+    # レコード存在確認SQL
+    RECORD_EXISTS_QUERY = """\
+    SELECT
+        COUNT(*) AS count_num
+    FROM
+        src05.com_regn_critic_pass
+    WHERE
+        regn_co_critic_pass_cd = :regn_co_critic_pass_cd
+    """
+    # データ登録用SQL
+    INSERT_QUERY = """\
+    INSERT INTO src05.com_regn_critic_pass
+    (
+        regn_co_critic_pass_cd,
+        disease_name_kanji,
+        regist_ymd,
+        delete_ymd,
+        sys_regist_date,
+        regist_prgm_id,
+        sys_update_date,
+        update_prgm_id
+    )
+    VALUES (
+        :regn_co_critic_pass_cd,
+        :disease_name_kanji,
+        :execute_date_str_ymd,
+        NULL,
+        :execute_datetime,
+        :program_name,
+        :execute_datetime,
+        :program_name
+    )
+    """
+
+    UPDATE_QUERY = """\
+    UPDATE
+        src05.com_regn_critic_pass
+    SET
+        disease_name_kanji = :disease_name_kanji,
+        update_ymd = :execute_date_str_ymd,
+        sys_update_date = :execute_datetime,
+        update_prgm_id = :program_name
+    WHERE
+        regn_co_critic_pass_cd = :regn_co_critic_pass_cd
+    """
+
+    # 修正区分が「C(削除)」の場合の更新SQL
+    LOGICAL_DELETE_QUERY = """\
+    UPDATE
+        src05.com_regn_critic_pass
+    SET
+        delete_ymd = :execute_date_str_ymd,
+        sys_update_date = :execute_date_str_ymd,
+        update_prgm_id = :program_name
+    WHERE
+        regn_co_critic_pass_cd = :regn_co_critic_pass_cd
+    """
+    record: ComRegnCriticPass
+
+    def __init__(self, record: list[str], db) -> None:
+        super().__init__(record, db, ComRegnCriticPass)
+        program_name = __name__.split('.')[-1]  # 当モジュール名(現行から変わっている)
+        # モジュール名をクエリパラメータに設定
+        self.query_parameter['program_name'] = program_name
+        # 読み込んだレコード値もクエリパラメータに追加
+        self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()}
+
+    def make_query(self):
+        # 修正区分がC(削除)の場合、論理削除
+        if self.record.maint_flag == 'C':
+            self.queries.append(self.LOGICAL_DELETE_QUERY)
+            return
+
+        # 追加、更新の場合
+        self.queries.append(self.__make_upsert_query())
+        return
+
+    def __make_upsert_query(self):
+        # レコードの存在確認
+        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 len(self.record.disease_name_kanji) == 0:
+            return None
+        else:
+            return self.UPDATE_QUERY

ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_med_func_valuation.py

@@ -0,0 +1,14 @@
+from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable
+
+
+class ComMedFuncValuation(UltmarcTable):
+    """レイアウト区分023: COM_医療機器評価"""
+    maint_flag: str                 # 修正区分
+    med_func_valuation_cd: str      # 医療機器評価コード
+    med_func_valuation_name: str    # 医療機器評価名称（漢字）
+
+    def __init__(self, record: list[str]):
+        super().__init__(record)
+        self.maint_flag = record[2]
+        self.med_func_valuation_cd = record[1]
+        self.med_func_valuation_name = record[5]

ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_regn_critic_pass.py

@@ -0,0 +1,14 @@
+from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable
+
+
+class ComRegnCriticPass(UltmarcTable):
+    """レイアウト区分026: COM_地域クリティカルパス"""
+    maint_flag: str                 # 修正区分
+    regn_co_critic_pass_cd: str     # 地域クリティカルパスコード
+    disease_name_kanji: str         # 疾患名（漢字）
+
+    def __init__(self, record: list[str]):
+        super().__init__(record)
+        self.maint_flag = record[2]
+        self.regn_co_critic_pass_cd = record[1]
+        self.disease_name_kanji = record[5]

ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py

@@ -1,3 +1,7 @@
+
+from src.db.database import Database
+from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \
+    UltmarcTableMapper
 from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_alma_mapper import \
     ComAlmaMapper
 from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_dr_wrkplace_mapper import \
@@ -14,11 +18,12 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_pharm_mapper import
     ComPharmMapper
 from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_rehabili_mapper import \
     ComRehabiliMapper
+from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_regn_critic_pass_mapper import \
+    ComRegnCriticPassMapper
+from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_med_func_valuation_mapper import \
+    ComMedFuncValuationMapper
 from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \
     NullMapper
-from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \
-    UltmarcTableMapper
-from src.db.database import Database
 
 # テーブルとのマッピング
 COM_TABLE_LIST = {
@@ -78,9 +83,9 @@ COM_TABLE_LIST = {
     # COM_看護種別
     "023": ComNurseAssrtMapper,
     # COM_医療機能評価
-    "024": NullMapper,
+    "024": ComMedFuncValuationMapper,
     # COM_地域クリティカルパス
-    "026": NullMapper,
+    "026": ComRegnCriticPassMapper,
     # COM_疾患別リハビリテーション科
     "027": ComRehabiliMapper,
     # COM_政策医療

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/com_med_func_valuation_delete.csv

@@ -0,0 +1,8 @@
+"024","01","A","20141113","20141114",""
+"024","02","A","20141113","20141114","一般病院Ｂ"
+"024","03","A","20141113","20141114","精神病院Ａ"
+"024","04","C","20141113","20141114","精神病院Ｂ"
+"024","05","A","20141113","20141114","複合病院Ｂ"
+"024","06","A","20141113","20141114","複合病院Ａ"
+"024","07","A","20141113","20141114","長期療養病院"
+"024","99","C","20141113","20141114","精神病院Ｂ"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/com_med_func_valuation_insert.csv

@@ -0,0 +1,7 @@
+"024","01","A","20141113","20141114","一般病院Ａ"
+"024","02","A","20141113","20141114","一般病院Ｂ"
+"024","03","A","20141113","20141114","精神病院Ａ"
+"024","04","A","20141113","20141114","精神病院Ｂ"
+"024","05","A","20141113","20141114","複合病院Ａ"
+"024","06","A","20141113","20141114","複合病院Ｂ"
+"024","99","A","20141113","20141114","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/com_med_func_valuation_update.csv

@@ -0,0 +1,6 @@
+"024","01","A","20141113","20141114",""
+"024","02","A","20141113","20141114","一般病院Ｂ"
+"024","03","A","20141113","20141114","精神病院Ａ"
+"024","04","A","20141113","20141114","精神病院Ｂ"
+"024","05","A","20141113","20141114","複合病院Ｂ"
+"024","06","A","20141113","20141114","複合病院Ａ"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/db_com_med_func_valuation_before_delete.csv

@@ -0,0 +1,7 @@
+"med_func_valuation_cd","med_func_valuation_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date",update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","一般病院Ａ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati"
+"02","一般病院Ｂ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","clsComMedFuncValuati"
+"03","精神病院Ａ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","clsComMedFuncValuati"
+"04","精神病院Ｂ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","clsComMedFuncValuati"
+"05","複合病院Ｂ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","clsComMedFuncValuati"
+"06","複合病院Ａ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","clsComMedFuncValuati"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/db_com_med_func_valuation_before_update.csv

@@ -0,0 +1,7 @@
+"med_func_valuation_cd","med_func_valuation_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date",update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","一般病院Ａ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati"
+"02","一般病院Ｂ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati"
+"03","精神病院Ａ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati"
+"04","精神病院Ｂ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati"
+"05","複合病院Ａ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati"
+"06","複合病院Ｂ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_delete.csv

@@ -0,0 +1,8 @@
+"med_func_valuation_cd","med_func_valuation_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date",update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","一般病院Ａ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati"
+"02","一般病院Ｂ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:22:50","com_med_func_valuation_mapper"
+"03","精神病院Ａ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:22:50","com_med_func_valuation_mapper"
+"04","精神病院Ｂ","20171024","20171024","20230424","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2023/04/23 10:22:50","com_med_func_valuation_mapper"
+"05","複合病院Ｂ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:22:50","com_med_func_valuation_mapper"
+"06","複合病院Ａ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:22:50","com_med_func_valuation_mapper"
+"07","長期療養病院","20230424","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:22:50","com_med_func_valuation_mapper","2017/10/24 10:22:50","com_med_func_valuation_mapper"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_insert.csv

@@ -0,0 +1,8 @@
+"med_func_valuation_cd","med_func_valuation_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date",update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","一般病院Ａ","20230424","20230424","NULL","NULL","NULL","NULL","NULL","2023/04/23 00:00:00","com_med_func_valuation_mapper","2023/04/23 00:00:00","com_med_func_valuation_mapper"
+"02","一般病院Ｂ","20230424","20230424","NULL","NULL","NULL","NULL","NULL","2023/04/23 00:00:00","com_med_func_valuation_mapper","2023/04/23 00:00:00","com_med_func_valuation_mapper"
+"03","精神病院Ａ","20230424","20230424","NULL","NULL","NULL","NULL","NULL","2023/04/23 00:00:00","com_med_func_valuation_mapper","2023/04/23 00:00:00","com_med_func_valuation_mapper"
+"04","精神病院Ｂ","20230424","20230424","NULL","NULL","NULL","NULL","NULL","2023/04/23 00:00:00","com_med_func_valuation_mapper","2023/04/23 00:00:00","com_med_func_valuation_mapper"
+"05","複合病院Ａ","20230424","20230424","NULL","NULL","NULL","NULL","NULL","2023/04/23 00:00:00","com_med_func_valuation_mapper","2023/04/23 00:00:00","com_med_func_valuation_mapper"
+"06","複合病院Ｂ","20230424","20230424","NULL","NULL","NULL","NULL","NULL","2023/04/23 00:00:00","com_med_func_valuation_mapper","2023/04/23 00:00:00","com_med_func_valuation_mapper"
+"99","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","20230424","20230424","NULL","NULL","NULL","NULL","NULL","2023/04/23 00:00:00","com_med_func_valuation_mapper","2023/04/23 00:00:00","com_med_func_valuation_mapper"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_update.csv

@@ -0,0 +1,7 @@
+"med_func_valuation_cd","med_func_valuation_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date",update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","一般病院Ａ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati"
+"02","一般病院Ｂ","20171024","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","com_med_func_valuation_mapper"
+"03","精神病院Ａ","20171024","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","com_med_func_valuation_mapper"
+"04","精神病院Ｂ","20171024","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","com_med_func_valuation_mapper"
+"05","複合病院Ｂ","20171024","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","com_med_func_valuation_mapper"
+"06","複合病院Ａ","20171024","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","com_med_func_valuation_mapper"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/test_com_med_func_valuation_mapper.py

@@ -0,0 +1,197 @@
+import os.path as path
+from datetime import datetime
+
+import pytest
+
+from src.batch.common.batch_context import BatchContext
+from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_med_func_valuation_mapper
+from src.db.database import Database
+from tests.testing_utility import (assert_table_results,
+                                   create_db_data_from_csv,
+                                   create_delete_sql_with_parameter,
+                                   create_insert_sql_with_parameter,
+                                   create_ultmarc_table_mapper_sut,
+                                   create_ultmarc_test_data_from_csv)
+
+
+class TestComMedFuncValuationMapper:
+    """レイアウト区分024: COM_医療機器評価 """
+
+    db: Database
+    batch_context: BatchContext
+    test_file_path: str = path.dirname(__file__)
+
+    @pytest.fixture(autouse=True, scope='function')
+    def pre_test(self, database: Database):
+        """テスト実行前後処理"""
+        self.batch_context = BatchContext.get_instance()
+        # setup
+        self.db = database
+        self.db.connect()
+        self.db.begin()
+
+        # testing
+        yield
+
+        # teardown
+        self.db.rollback()
+        self.db.disconnect()
+
+    def test_insert_record(self):
+        """
+        Cases:
+            COM_医療機器評価テーブルにレコードを登録する
+        Arranges:
+            - CSVデータを用意し、読み込む
+            - 追加対象となるレコードを削除する
+        Expects:
+            - 登録内容が期待値と一致すること
+        """
+
+        # Arrange
+        # 処理日設定
+        self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d')
+        # テスト用のCSVを読み込む
+        test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_med_func_valuation_insert.csv'))
+        # 一旦全データをDBから削除
+        delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_med_func_valuation', {'1': '1'})
+        self.db.execute(delete_sql, delete_parameter)
+
+        # Act
+        for line_number, line in enumerate(test_dat_file, start=1):
+            sut: com_med_func_valuation_mapper.ComMedFuncValuationMapper = create_ultmarc_table_mapper_sut(line, self.db)
+            assert type(sut) is com_med_func_valuation_mapper.ComMedFuncValuationMapper, f'{line_number}行目:マッパークラスが期通りか'
+
+            sut.make_query()
+            sut.execute_queries()
+
+        # Assert
+        # 期待値ファイルを読み込む
+        expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_med_func_valuation_insert.csv'))
+        primary_keys = [f"'{primary_key['med_func_valuation_cd']}'" for primary_key in expect_data_list]
+        actual_select_sql = f"SELECT * FROM src05.com_med_func_valuation WHERE med_func_valuation_cd IN ({','.join(primary_keys)})"
+        actual_data_list = self.db.execute_select(actual_select_sql)
+        # 期待値検査
+        ignore_columns = ['regist_ymd', 'update_ymd', 'sys_update_date', 'sys_regist_date']
+        assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns)
+        # 動的日付項目の個別確認
+        line_number = 0
+        for actual_row, expect_row in zip(actual_data_list, expect_data_list):
+            line_number += 1
+            for actual_col_name, expect_col_name in zip(actual_row, expect_row):
+                if actual_col_name in ignore_columns:
+                    assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること'
+
+    def test_update_record(self):
+        """
+        Cases:
+            COM_医療機器評価テーブルのレコードを更新する
+        Arranges:
+            - CSVデータを用意し、読み込む
+            - 更新対象となるレコードを登録する
+        Expects:
+            - 登録内容が期待値と一致すること
+        """
+
+        # Arrange
+        # 処理日設定
+        self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d')
+        # テスト用のCSVを読み込む
+        test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_med_func_valuation_update.csv'))
+        # 一旦全データをDBから削除
+        delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_med_func_valuation', {'1': '1'})
+        self.db.execute(delete_sql, delete_parameter)
+        # テストデータをDBに登録
+        # DBデータを読み込む
+        test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_med_func_valuation_before_update.csv'))
+        for test_data in test_sql_data_list:
+            insert_sql, insert_parameter = create_insert_sql_with_parameter(
+                'src05.com_med_func_valuation',
+                test_data.keys(),
+                test_data.values()
+            )
+            self.db.execute(insert_sql, insert_parameter)
+
+        # Act
+        for line_number, line in enumerate(test_dat_file, start=1):
+            sut: com_med_func_valuation_mapper.ComMedFuncValuationMapper = create_ultmarc_table_mapper_sut(line, self.db)
+            assert type(sut) is com_med_func_valuation_mapper.ComMedFuncValuationMapper, f'{line_number}行目:マッパークラスが期通りか'
+            sut.make_query()
+            sut.execute_queries()
+
+        # Assert
+        # 期待値ファイルを読み込む
+        expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_med_func_valuation_update.csv'))
+        primary_keys = [f"'{primary_key['med_func_valuation_cd']}'" for primary_key in expect_data_list]
+        actual_select_sql = f"SELECT * FROM src05.com_med_func_valuation WHERE med_func_valuation_cd IN ({','.join(primary_keys)})"
+        actual_data_list = self.db.execute_select(actual_select_sql)
+        # 期待値検査
+        ignore_columns = ['regist_ymd', 'update_ymd', 'sys_update_date', 'sys_regist_date']
+        assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns)
+        # 動的日付項目の個別確認
+        line_number = 0
+        for actual_row, expect_row in zip(actual_data_list, expect_data_list):
+            line_number += 1
+            for actual_col_name, expect_col_name in zip(actual_row, expect_row):
+                if actual_col_name in ignore_columns:
+                    if expect_row[expect_col_name] is None:
+                        assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと'
+                    else:
+                        assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること'
+
+    def test_logical_delete(self):
+        """
+        Cases:
+            COM_医療機器評価テーブルのレコードを1件論理削除する
+        Arranges:
+            - CSVデータを用意し、読み込む
+            - 削除対象となるレコードを登録する
+        Expects:
+            - 登録内容が期待値と一致すること
+        """
+
+        # Arrange
+        # 処理日設定
+        self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d')
+        # テスト用のCSVを読み込む
+        test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_med_func_valuation_delete.csv'))
+        # 一旦全データをDBから削除
+        delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_med_func_valuation', {'1': '1'})
+        self.db.execute(delete_sql, delete_parameter)
+        # テストデータをDBに登録
+        # DBデータを読み込む
+        test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_med_func_valuation_before_delete.csv'))
+        for test_data in test_sql_data_list:
+            insert_sql, insert_parameter = create_insert_sql_with_parameter(
+                'src05.com_med_func_valuation',
+                test_data.keys(),
+                test_data.values()
+            )
+            self.db.execute(insert_sql, insert_parameter)
+
+        # Act
+        for line_number, line in enumerate(test_dat_file, start=1):
+            sut: com_med_func_valuation_mapper.ComMedFuncValuationMapper = create_ultmarc_table_mapper_sut(line, self.db)
+            assert type(sut) is com_med_func_valuation_mapper.ComMedFuncValuationMapper, f'{line_number}行目:マッパークラスが期通りか'
+            sut.make_query()
+            sut.execute_queries()
+
+        # Assert
+        # 期待値ファイルを読み込む
+        expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_med_func_valuation_delete.csv'))
+        primary_keys = [f"'{primary_key['med_func_valuation_cd']}'" for primary_key in expect_data_list]
+        actual_select_sql = f"SELECT * FROM src05.com_med_func_valuation WHERE med_func_valuation_cd IN ({','.join(primary_keys)})"
+        actual_data_list = self.db.execute_select(actual_select_sql)
+        # 期待値検査
+        ignore_columns = ['regist_ymd', 'update_ymd', 'delete_ymd', 'sys_update_date', 'sys_regist_date']
+        assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns)
+        # 動的日付項目の個別確認
+        line_number = 0
+        for actual_row, expect_row in zip(actual_data_list, expect_data_list):
+            line_number += 1
+            for actual_col_name, expect_col_name in zip(actual_row, expect_row):
+                if actual_col_name in ignore_columns:
+                    if expect_row[expect_col_name] is None:
+                        assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと'
+                    else:
+                        assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること'

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/com_regn_critic_pass_delete.csv

@@ -0,0 +1,4 @@
+"026","01","C","20141113","20141114",""
+"026","99","A","20141113","20141114","不明"
+"026","02","A","20141113","20141114","骨折"
+"026","98","C","20141113","20141114",""

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/com_regn_critic_pass_insert.csv

@@ -0,0 +1,3 @@
+"026","01","A","20141113","20141114","大腿骨頸部骨折"
+"026","99","A","20141113","20141114","不明"
+"026","55","A","20141113","20141114","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこくけこあいうえおかきくけこあいうえおかき"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/com_regn_critic_pass_update.csv

@@ -0,0 +1,3 @@
+"026","01","A","20141113","20141114","頸部骨折"
+"026","99","A","20141113","20141114",""
+"026","55","A","20141113","20141114","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこくけこあいうえおかきくけこあいうえおかき"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/db_com_regn_critic_pass_before_delete.csv

@@ -0,0 +1,3 @@
+"regn_co_critic_pass_cd","disease_name_kanji","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","大腿骨頸部骨折","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 11:09:17","clsComRegnCriticPass","2017/10/19 11:09:17","clsComRegnCriticPass"
+"99","不明","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 11:09:17","clsComRegnCriticPass","2017/10/19 11:09:51","clsComRegnCriticPass"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/db_com_regn_critic_pass_before_update.csv

@@ -0,0 +1,4 @@
+"regn_co_critic_pass_cd","disease_name_kanji","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","大腿骨頸部骨折","20230423","NULL","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","com_regn_critic_pass_mapper","2023/03/24 10:04:58","com_regn_critic_pass_mapper"
+"55","","20230423","NULL","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","com_regn_critic_pass_mapper","2023/03/24 10:04:58","com_regn_critic_pass_mapper"
+"99","不明","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","clsComRegnCriticPass","2023/03/24 10:04:58","clsComRegnCriticPass"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/expect_com_regn_critic_pass_delete.csv

@@ -0,0 +1,4 @@
+"regn_co_critic_pass_cd","disease_name_kanji","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","大腿骨頸部骨折","20171019","NULL","20230420","NULL","NULL","NULL","NULL","2017/10/19 11:09:17","clsComRegnCriticPass","2017/10/19 11:09:17","com_regn_critic_pass_mapper"
+"02","骨折","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 11:18:53","com_regn_critic_pass_mapper","2017/10/19 11:18:53","com_regn_critic_pass_mapper"
+"99","不明","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 11:09:17","clsComRegnCriticPass","2017/10/19 11:09:51","com_regn_critic_pass_mapper"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/expect_com_regn_critic_pass_insert.csv

@@ -0,0 +1,4 @@
+"regn_co_critic_pass_cd","disease_name_kanji","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","大腿骨頸部骨折","20230423","NULL","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","com_regn_critic_pass_mapper","2023/03/24 10:04:58","com_regn_critic_pass_mapper"
+"55","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこくけこあいうえおかきくけこあいうえおかき","20230423","NULL","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","com_regn_critic_pass_mapper","2023/03/24 10:04:58","com_regn_critic_pass_mapper"
+"99","不明","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","com_regn_critic_pass_mapper","2023/03/24 10:04:58","com_regn_critic_pass_mapper"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/expect_com_regn_critic_pass_update.csv

@@ -0,0 +1,4 @@
+"regn_co_critic_pass_cd","disease_name_kanji","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
+"01","頸部骨折","20230423","20230423","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","com_regn_critic_pass_mapper","2023/03/24 10:04:58","com_regn_critic_pass_mapper"
+"55","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこくけこあいうえおかきくけこあいうえおかき","20230423","20230423","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","com_regn_critic_pass_mapper","2023/03/24 10:04:58","com_regn_critic_pass_mapper"
+"99","不明","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","clsComRegnCriticPass","2023/03/24 10:04:58","clsComRegnCriticPass"

ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/test_com_regn_critic_pass_mapper.py

@@ -0,0 +1,197 @@
+import os.path as path
+from datetime import datetime
+
+import pytest
+
+from src.batch.common.batch_context import BatchContext
+from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_regn_critic_pass_mapper
+from src.db.database import Database
+from tests.testing_utility import (assert_table_results,
+                                   create_db_data_from_csv,
+                                   create_delete_sql_with_parameter,
+                                   create_insert_sql_with_parameter,
+                                   create_ultmarc_table_mapper_sut,
+                                   create_ultmarc_test_data_from_csv)
+
+
+class TestComRegnCriticPassMapper:
+    """レイアウト区分026: COM_地域連携クリティカルパス"""
+
+    db: Database
+    batch_context: BatchContext
+    test_file_path: str = path.dirname(__file__)
+
+    @pytest.fixture(autouse=True, scope='function')
+    def pre_test(self, database: Database):
+        """テスト実行前後処理"""
+        self.batch_context = BatchContext.get_instance()
+        # setup
+        self.db = database
+        self.db.connect()
+        self.db.begin()
+
+        # testing
+        yield
+
+        # teardown
+        self.db.rollback()
+        self.db.disconnect()
+
+    def test_insert_record(self):
+        """
+        Cases:
+            COM_地域連携クリティカルパス校テーブルにレコードを登録する
+        Arranges:
+            - CSVデータを用意し、読み込む
+            - 追加対象となるレコードを削除する
+        Expects:
+            - 登録内容が期待値と一致すること
+        """
+
+        # Arrange
+        # 処理日設定
+        self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d')
+        # テスト用のCSVを読み込む
+        test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_regn_critic_pass_insert.csv'))
+        # 一旦全データをDBから削除
+        delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_regn_critic_pass', {'1': '1'})
+        self.db.execute(delete_sql, delete_parameter)
+
+        # Act
+        for line_number, line in enumerate(test_dat_file, start=1):
+            sut: com_regn_critic_pass_mapper.ComRegnCriticPassMapper = create_ultmarc_table_mapper_sut(line, self.db)
+            assert type(sut) is com_regn_critic_pass_mapper.ComRegnCriticPassMapper, f'{line_number}行目:マッパークラスが期通りか'
+
+            sut.make_query()
+            sut.execute_queries()
+
+        # Assert
+        # 期待値ファイルを読み込む
+        expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_regn_critic_pass_insert.csv'))
+        primary_keys = [f"'{primary_key['regn_co_critic_pass_cd']}'" for primary_key in expect_data_list]
+        actual_select_sql = f"SELECT * FROM src05.com_regn_critic_pass WHERE regn_co_critic_pass_cd IN ({','.join(primary_keys)})"
+        actual_data_list = self.db.execute_select(actual_select_sql)
+        # 期待値検査
+        ignore_columns = ['regist_ymd', 'sys_update_date', 'sys_regist_date']
+        assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns)
+        # 動的日付項目の個別確認
+        line_number = 0
+        for actual_row, expect_row in zip(actual_data_list, expect_data_list):
+            line_number += 1
+            for actual_col_name, expect_col_name in zip(actual_row, expect_row):
+                if actual_col_name in ['regist_ymd', 'sys_regist_date', 'sys_update_date']:
+                    assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること'
+
+    def test_update_record(self):
+        """
+        Cases:
+            COM_地域連携クリティカルパス校テーブルのレコードを更新する
+        Arranges:
+            - CSVデータを用意し、読み込む
+            - 更新対象となるレコードを登録する
+        Expects:
+            - 登録内容が期待値と一致すること
+        """
+
+        # Arrange
+        # 処理日設定
+        self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d')
+        # テスト用のCSVを読み込む
+        test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_regn_critic_pass_update.csv'))
+        # 一旦全データをDBから削除
+        delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_regn_critic_pass', {'1': '1'})
+        self.db.execute(delete_sql, delete_parameter)
+        # テストデータをDBに登録
+        # DBデータを読み込む
+        test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_regn_critic_pass_before_update.csv'))
+        for test_data in test_sql_data_list:
+            insert_sql, insert_parameter = create_insert_sql_with_parameter(
+                'src05.com_regn_critic_pass',
+                test_data.keys(),
+                test_data.values()
+            )
+            self.db.execute(insert_sql, insert_parameter)
+
+        # Act
+        for line_number, line in enumerate(test_dat_file, start=1):
+            sut: com_regn_critic_pass_mapper.ComRegnCriticPassMapper = create_ultmarc_table_mapper_sut(line, self.db)
+            assert type(sut) is com_regn_critic_pass_mapper.ComRegnCriticPassMapper, f'{line_number}行目:マッパークラスが期通りか'
+            sut.make_query()
+            sut.execute_queries()
+
+        # Assert
+        # 期待値ファイルを読み込む
+        expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_regn_critic_pass_update.csv'))
+        primary_keys = [f"'{primary_key['regn_co_critic_pass_cd']}'" for primary_key in expect_data_list]
+        actual_select_sql = f"SELECT * FROM src05.com_regn_critic_pass WHERE regn_co_critic_pass_cd IN ({','.join(primary_keys)})"
+        actual_data_list = self.db.execute_select(actual_select_sql)
+        # 期待値検査
+        ignore_columns = ['regist_ymd', 'update_ymd', 'sys_update_date', 'sys_regist_date']
+        assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns)
+        # 動的日付項目の個別確認
+        line_number = 0
+        for actual_row, expect_row in zip(actual_data_list, expect_data_list):
+            line_number += 1
+            for actual_col_name, expect_col_name in zip(actual_row, expect_row):
+                if actual_col_name in ignore_columns:
+                    if expect_row[expect_col_name] is None:
+                        assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと'
+                    else:
+                        assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること'
+
+    def test_logical_delete(self):
+        """
+        Cases:
+            COM_地域連携クリティカルパス校テーブルのレコードを1件論理削除する
+        Arranges:
+            - CSVデータを用意し、読み込む
+            - 削除対象となるレコードを登録する
+        Expects:
+            - 登録内容が期待値と一致すること
+        """
+
+        # Arrange
+        # 処理日設定
+        self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d')
+        # テスト用のCSVを読み込む
+        test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_regn_critic_pass_delete.csv'))
+        # 一旦全データをDBから削除
+        delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_regn_critic_pass', {'1': '1'})
+        self.db.execute(delete_sql, delete_parameter)
+        # テストデータをDBに登録
+        # DBデータを読み込む
+        test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_regn_critic_pass_before_delete.csv'))
+        for test_data in test_sql_data_list:
+            insert_sql, insert_parameter = create_insert_sql_with_parameter(
+                'src05.com_regn_critic_pass',
+                test_data.keys(),
+                test_data.values()
+            )
+            self.db.execute(insert_sql, insert_parameter)
+
+        # Act
+        for line_number, line in enumerate(test_dat_file, start=1):
+            sut: com_regn_critic_pass_mapper.ComRegnCriticPassMapper = create_ultmarc_table_mapper_sut(line, self.db)
+            assert type(sut) is com_regn_critic_pass_mapper.ComRegnCriticPassMapper, f'{line_number}行目:マッパークラスが期通りか'
+            sut.make_query()
+            sut.execute_queries()
+
+        # Assert
+        # 期待値ファイルを読み込む
+        expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_regn_critic_pass_delete.csv'))
+        primary_keys = [f"'{primary_key['regn_co_critic_pass_cd']}'" for primary_key in expect_data_list]
+        actual_select_sql = f"SELECT * FROM src05.com_regn_critic_pass WHERE regn_co_critic_pass_cd IN ({','.join(primary_keys)})"
+        actual_data_list = self.db.execute_select(actual_select_sql)
+        # 期待値検査
+        ignore_columns = ['regist_ymd', 'update_ymd', 'delete_ymd', 'sys_update_date', 'sys_regist_date']
+        assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns)
+        # 動的日付項目の個別確認
+        line_number = 0
+        for actual_row, expect_row in zip(actual_data_list, expect_data_list):
+            line_number += 1
+            for actual_col_name, expect_col_name in zip(actual_row, expect_row):
+                if actual_col_name in ignore_columns:
+                    if expect_row[expect_col_name] is None:
+                        assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと'
+                    else:
+                        assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること'

rds_mysql/stored_procedure/src05/v_inst_merge_t_create.sql

@@ -40,7 +40,8 @@ BEGIN
 			fcl_name,
 			fcl_kn_name,
 			fmt_addr,
-			prft_cd
+			prft_cd,
+			fcl_type
 		)
 	SELECT
 		vhmv.v_inst_cd,
@@ -48,7 +49,8 @@ BEGIN
 		fmv.fcl_name,
 		fmv.fcl_kn_name,
 		fmv.fmt_addr,
-		fmv.prft_cd
+		fmv.prft_cd,
+		fmv.fcl_type
 	FROM
 		src05.vop_hco_merge_v vhmv,
 		src05.fcl_mst_v fmv
@@ -66,7 +68,6 @@ BEGIN
 	WHERE
 		vhmv.v_inst_cd_merg = fmv.v_inst_cd
 		AND STR_TO_DATE(vhmv.apply_dt, '%Y-%m-%d') <= src05.get_syor_date()
-		AND ((fmv.fcl_type IN ('A1','A0')) OR fmv.fcl_type BETWEEN '20' AND '29')
 		AND fmv.rec_sts_kbn != '9';
 
 	call medaca_common.put_info_log(schema_name, procedure_name, procedure_args,