Merge pull request #5 from EQUES-Inc/develop

src/forms/deviation_investigation_report.py

@@ -1,7 +1,8 @@
 import json
 import os
-from datetime import date, datetime, time
-from zoneinfo import ZoneInfo
+from datetime import date, datetime
+from enum import Enum
+from typing import Dict
 
 import streamlit as st
 from dotenv import load_dotenv
@@ -11,12 +12,105 @@ from src.prompts.deviation_investigation_report import (
     deviation_investigation_systemprompt_output_format_instructions,
     deviation_investigation_systemprompt_writing_instructions,
 )
-from src.utils import output_deviation_investigation_report, setup_logger
+from src.utils import replace_text_in_docx, setup_logger
 
 logger = setup_logger(__name__)
 
+MIN_REPORT_NUMBER = 1
+MAX_REPORT_NUMBER = 10
 
-# 未完成
+
+class InvestigationOrMethodStatus(Enum):
+    NOT_SELECTED = ""
+    COMPLETED = "完了"
+    PROPOSED_COMPLETION = "完了の提案"
+    IN_PROGRESS = "対応中"
+    NO_ACTION_NEEDED = "対応不要"
+
+
+class ValidityAssessmentStatus(Enum):
+    NOT_SELECTED = ""
+    COMPLETED = "完了"
+    PROPOSED_COMPLETION = "完了の提案"
+    IN_PROGRESS = "対応中"
+    NO_ACTION_NEEDED = "対応不要"
+    ON_HOLD = "保留"
+
+
+class PresenceOrAbsence(Enum):
+    NOT_SELECTED = ""
+    PRESENCE = "有"
+    ABSENCE = "無"
+
+
+class ActionRequirement(Enum):
+    NOT_SELECTED = ""
+    REQUIRED = "要"
+    NOT_REQUIRED = "不要"
+    ON_HOLD = "保留"
+
+
+class CauseInvestigationClassifications(Enum):
+    NOT_SELECTED = ""
+    PROCEDURE = "手順"
+    EDUCATION_TRAINING = "教育訓練"
+    FACILITIES_EQUIPMENT = "設備/機器"
+    ENVIRONMENT = "環境"
+    PEOPLE_RELATIONSHIPS = "人/関係"
+    CONTROL = "管理"
+    OTHERS = "その他"
+
+
+class CauseInvestigationMethods(Enum):
+    NOT_SELECTED = ""
+    ANALYSIS_5WHY = "5Why分析"
+    CHARACTERISTICS_MAP = "特性要因図"
+    OTHERS = "その他"
+
+
+class DeviationSummaryQuestions(Enum):
+    DEVIATION_SUMMARY = "逸脱概要を記入してください。（どの手順・規格から逸脱したのか）"
+
+
+class CauseInvestigationQuestions(Enum):
+    CONTENT_RESULT = "原因調査の調査内容・結果を記入してください。"
+    DIRECT_CAUSE = "直接原因を記入してください。"
+    ROOT_CAUSE = "根本原因を記入してください。"
+
+
+class ImpactInvestigationQuestions(Enum):
+    IMPACT_ON_THE_LOT = "当該ロットへの影響を記入してください。"
+    IMPACT_ON_OTHERS = "他製品・他ロットへの影響を記入してください。"
+
+
+class RecoveryMeasuresQuestions(Enum):
+    CONTENT = "回復措置の実施内容を記入してください。"
+    RESULT = "回復措置の実施結果を記入してください。"
+
+
+class ProductMeasuresQuestions(Enum):
+    CONTENT = "製品等に対する措置の実施内容を記入してください。"
+    RESULT = "製品等に対する措置の実施結果を記入してください。"
+
+
+class CorrectivePreventiveMeasuresQuestions(Enum):
+    CONTENT = "是正措置・予防措置の実施内容を記入してください。"
+    RESULT = "是正措置・予防措置の実施結果を記入してください。"
+
+
+class ValidityAssessmentQuestions(Enum):
+    CONTENT = "有効性評価内容、有効性確認方法、有効性予定期間を記入してください。"
+    RESULT = "有効性評価結果、有効性実施期間を記入してください。"
+
+
+class OtherMeasuresQuestions(Enum):
+    CONTENT = "その他の措置の実施内容を記入してください。"
+    RESULT = "その他の措置の実施結果を記入してください。"
+
+
+class ExtensionReasonQuestions(Enum):
+    INVESTIGATION = "調査延長の理由を記入してください。"
+    MEASURES = "措置延長の理由を記入してください。"
 
 
 def deviation_investigation_report_form() -> None:
@@ -26,101 +120,475 @@ def deviation_investigation_report_form() -> None:
     open_api_key = os.environ.get("OPENAI_API_KEY")
     client = OpenAI(api_key=open_api_key)
 
+    if "subject" not in st.session_state:
+        st.session_state["subject"] = ""
+    if "control_number" not in st.session_state:
+        st.session_state["control_number"] = ""
+    if "section_name" not in st.session_state:
+        st.session_state["section_name"] = ""
+    if "report_number" not in st.session_state:
+        st.session_state["report_number"] = "1"
+
     for state in ["form_submitted", "document_generated"]:
         if state not in st.session_state:
             st.session_state[state] = False
 
-    if "occurrence_time" not in st.session_state:
-        st.session_state["occurrence_time"] = datetime.now(
-            ZoneInfo("Asia/Tokyo")
-        ).time()
-
-    with st.form("my_form_deviation"):
-        col1, col2 = st.columns(2)
-        with col1:
-            reporter_name = st.text_input("報告者")
-        with col2:
-            report_date = st.date_input("報告日", date.today())
-
-        col2_1, col2_2 = st.columns(2)
-        with col2_1:
-            product_name = st.text_input("品名")
-        with col2_2:
-            lot_number = st.text_input("ロットNo.")
-
-        col1, col2, col3 = st.columns([1, 1, 2])
-        with col1:
-            occurrence_date = st.date_input("発生日", date.today())
-        with col2:
-            st.time_input("発生時間", key="occurrence_time")
-        with col3:
-            occurrence_place = st.text_input("発生場所")
-
-        q = [
-            "Q1 : 逸脱内容を記入してください。（どの手順・規格から逸脱したのか）",
-            "Q2 : 逸脱の発見の経緯を記入してください。",
-            "Q3 : 応急処置とその処置の理由を記入してください。",
-            "Q4 : 品質への影響の調査結果を記入してください。",
-            "Q5 : 原因調査結果について記入してください",
-            "Q6 : 是正措置について記入してください",
-            "Q7 : 予防措置について記入してください",
-        ]
-
-        q_num = len(q)
-
-        input_values = [""] * q_num
-        for k in range(q_num):
-            input_values[k] = st.text_area(q[k], key=f"input_deviatoin_{k}")
-            st.markdown("***")
-
-        shipping_restriction = st.text_area(
-            "Q8 : 出荷の制限について記入してください。",
-            key="shipping_restriction_deviation",
-        )
-        no_shipping_restriction = st.checkbox(
-            "出荷の制限なし", key="check_shipping_restriction"
-        )
-        attached_files = st.text_area(
-            "Q9 : 添付資料名を記入してください。",
-            key="attached_files_deviation",
-        )
-        no_attached_file = st.checkbox("添付資料なし", key="check_attached_file")
-        supplementary_information = st.text_area(
-            "Q10 : 備考があれば記入してください。",
-            key="supplementary_information_deviation",
-        )
-        no_supplementary_information = st.checkbox(
-            "なし", key="check_supplementary_information"
-        )
-        submitted = st.form_submit_button("送信")
-
-        if "contents" not in st.session_state:
-            st.session_state["contents"] = {}
+    col1, col2 = st.columns(2)
+    with col1:
+        st.text_input("件名", key="subject")
+    with col2:
+        st.text_input("管理番号", key="control_number")
+
+    col2_1, col2_2 = st.columns(2)
+    with col2_1:
+        st.text_input("課名", key="section_name")
+    with col2_2:
+        st.selectbox(
+            "報数",
+            [str(i) for i in range(MIN_REPORT_NUMBER, MAX_REPORT_NUMBER + 1)],
+            key="report_number",
+        )
+
+    st.markdown("***")
+
+    st.markdown("**逸脱概要**")
+    if "answer_deviation_summary" not in st.session_state:
+        st.session_state["answer_deviation_summary"] = ""
+
+    st.text_area(
+        DeviationSummaryQuestions.DEVIATION_SUMMARY.value,
+        key="answer_deviation_summary",
+    )
+    st.markdown("***")
+
+    st.markdown("**原因調査**")
+    if "status_cause_investigation" not in st.session_state:
+        st.session_state["status_cause_investigation"] = ""
+    if "answer_cause_investigation_content_result" not in st.session_state:
+        st.session_state["answer_cause_investigation_content_result"] = ""
+    if "answer_cause_investigation_direct_cause" not in st.session_state:
+        st.session_state["answer_cause_investigation_direct_cause"] = ""
+    if "answer_cause_investigation_root_cause" not in st.session_state:
+        st.session_state["answer_cause_investigation_root_cause"] = ""
+    if "cause_investigation_classification" not in st.session_state:
+        st.session_state["cause_investigation_classification"] = ""
+    if "cause_investigation_classification_others" not in st.session_state:
+        st.session_state["cause_investigation_classification_others"] = ""
+    if "cause_investigation_method" not in st.session_state:
+        st.session_state["cause_investigation_method"] = ""
+    if "cause_investigation_method_others" not in st.session_state:
+        st.session_state["cause_investigation_method_others"] = ""
+
+    st.selectbox(
+        "状況",
+        [status.value for status in InvestigationOrMethodStatus],
+        key="status_cause_investigation",
+    )
+
+    if (
+        st.session_state["status_cause_investigation"]
+        != InvestigationOrMethodStatus.NO_ACTION_NEEDED.value
+    ):
+        st.text_area(
+            CauseInvestigationQuestions.CONTENT_RESULT.value,
+            key="answer_cause_investigation_content_result",
+        )
+        st.text_area(
+            CauseInvestigationQuestions.DIRECT_CAUSE.value,
+            key="answer_cause_investigation_direct_cause",
+        )
+        st.text_area(
+            CauseInvestigationQuestions.ROOT_CAUSE.value,
+            key="answer_cause_investigation_root_cause",
+        )
+
+        st.selectbox(
+            "分類",
+            [status.value for status in CauseInvestigationClassifications],
+            key="cause_investigation_classification",
+        )
+        if st.session_state["cause_investigation_classification"] == "その他":
+            st.text_input(
+                "分類を記入してください。",
+                key="cause_investigation_classification_others",
+            )
+        st.selectbox(
+            "手法",
+            [status.value for status in CauseInvestigationMethods],
+            key="cause_investigation_method",
+        )
+        if st.session_state["cause_investigation_method"] == "その他":
+            st.text_input(
+                "手法を記入してください。", key="cause_investigation_method_others"
+            )
+    else:
+        st.session_state["answer_cause_investigation_content_result"] = "なし"
+        st.session_state["answer_cause_investigation_direct_cause"] = "なし"
+        st.session_state["answer_cause_investigation_root_cause"] = "なし"
+
+    st.markdown("***")
+
+    st.markdown("**製品品質（製品・中間製品・原材料）への影響**")
+    if "status_impact_investigation" not in st.session_state:
+        st.session_state["status_impact_investigation"] = ""
+    if "answer_impact_investigation_impact_on_the_lot" not in st.session_state:
+        st.session_state["answer_impact_investigation_impact_on_the_lot"] = ""
+    if "answer_impact_investigation_impact_on_others" not in st.session_state:
+        st.session_state["answer_impact_investigation_impact_on_others"] = ""
+
+    st.selectbox(
+        "状況",
+        [status.value for status in InvestigationOrMethodStatus],
+        key="status_impact_investigation",
+    )
+
+    if (
+        st.session_state["status_impact_investigation"]
+        != InvestigationOrMethodStatus.NO_ACTION_NEEDED.value
+    ):
+        st.text_area(
+            ImpactInvestigationQuestions.IMPACT_ON_THE_LOT.value,
+            key="answer_impact_investigation_impact_on_the_lot",
+        )
+        st.text_area(
+            ImpactInvestigationQuestions.IMPACT_ON_OTHERS.value,
+            key="answer_impact_investigation_impact_on_others",
+        )
+    else:
+        st.session_state["answer_impact_investigation_impact_on_the_lot"] = "なし"
+        st.session_state["answer_impact_investigation_impact_on_others"] = "なし"
+    st.markdown("***")
+
+    st.markdown("**調査の延長申請(原因調査及び製品品質への影響)**")
+    if "investigation_extension" not in st.session_state:
+        st.session_state["investigation_extension"] = ""
+    if "investigation_next_report_date" not in st.session_state:
+        st.session_state["investigation_next_report_date"] = date.today()
+    if "investigation_extension_reason" not in st.session_state:
+        st.session_state["investigation_extension_reason"] = ""
+
+    st.selectbox(
+        "延長申請",
+        [status.value for status in PresenceOrAbsence],
+        key="investigation_extension",
+    )
+
+    if st.session_state["investigation_extension"] == PresenceOrAbsence.PRESENCE.value:
+        st.date_input("次報の報告予定日", key="investigation_next_report_date")
+        st.text_area(
+            ExtensionReasonQuestions.INVESTIGATION.value,
+            key="investigation_extension_reason",
+        )
+    st.markdown("***")
+
+    st.markdown("**回復措置**")
+    if "status_recovery_measures" not in st.session_state:
+        st.session_state["status_recovery_measures"] = ""
+    if "answer_recovery_measure_content" not in st.session_state:
+        st.session_state["answer_recovery_measure_content"] = ""
+    if "answer_recovery_measure_result" not in st.session_state:
+        st.session_state["answer_recovery_measure_result"] = ""
+
+    st.selectbox(
+        "状況",
+        [status.value for status in InvestigationOrMethodStatus],
+        key="status_recovery_measures",
+    )
+
+    if (
+        st.session_state["status_recovery_measures"]
+        != InvestigationOrMethodStatus.NO_ACTION_NEEDED.value
+    ):
+        st.text_area(
+            RecoveryMeasuresQuestions.CONTENT.value,
+            key="answer_recovery_measures_content",
+        )
+        st.text_area(
+            RecoveryMeasuresQuestions.RESULT.value,
+            key="answer_recovery_measures_result",
+        )
+    else:
+        st.session_state["answer_recovery_measures_content"] = "なし"
+        st.session_state["answer_recovery_measures_result"] = "なし"
+    st.markdown("***")
+
+    st.markdown("**製品等に関する措置**")
+    if "status_product_measures" not in st.session_state:
+        st.session_state["status_product_measures"] = ""
+    if "answer_product_measures_content" not in st.session_state:
+        st.session_state["answer_product_measures_content"] = ""
+    if "answer_product_measures_result" not in st.session_state:
+        st.session_state["answer_product_measures_result"] = ""
+    if "special_work_instructions" not in st.session_state:
+        st.session_state["special_work_instructions"] = ""
+
+    st.selectbox(
+        "状況",
+        [status.value for status in InvestigationOrMethodStatus],
+        key="status_product_measures",
+    )
+
+    if (
+        st.session_state["status_product_measures"]
+        != InvestigationOrMethodStatus.NO_ACTION_NEEDED.value
+    ):
+        st.text_area(
+            ProductMeasuresQuestions.CONTENT.value,
+            key="answer_product_measures_content",
+        )
+        st.text_area(
+            ProductMeasuresQuestions.RESULT.value,
+            key="answer_product_measures_result",
+        )
+
+        st.selectbox(
+            "特別作業指図書の添付",
+            [status.value for status in PresenceOrAbsence],
+            key="special_work_instructions",
+        )
+    else:
+        st.session_state["answer_product_measures_content"] = "なし"
+        st.session_state["answer_product_measures_result"] = "なし"
+
+    st.markdown("***")
+
+    st.markdown("**是正措置・予防措置**")
+    if "status_corrective_preventive_measures" not in st.session_state:
+        st.session_state["status_corrective_preventive_measures"] = ""
+    if "corrective_preventive_measures_content" not in st.session_state:
+        st.session_state["corrective_preventive_measures_content"] = ""
+    if "corrective_preventive_measures_result" not in st.session_state:
+        st.session_state["corrective_preventive_measures_result"] = ""
+    if "measures_education_training" not in st.session_state:
+        st.session_state["measures_education_training"] = ""
+    if "measures_education_training_plan" not in st.session_state:
+        st.session_state["measures_education_training_plan"] = date.today()
+
+    st.selectbox(
+        "状況",
+        [status.value for status in InvestigationOrMethodStatus],
+        key="status_corrective_preventive_measures",
+    )
+
+    if (
+        st.session_state["status_corrective_preventive_measures"]
+        != InvestigationOrMethodStatus.NO_ACTION_NEEDED.value
+    ):
+        st.text_area(
+            CorrectivePreventiveMeasuresQuestions.CONTENT.value,
+            key="answer_corrective_preventive_measures_content",
+        )
+        st.text_area(
+            CorrectivePreventiveMeasuresQuestions.RESULT.value,
+            key="answer_corrective_preventive_measures_result",
+        )
+
+        st.selectbox(
+            "教育訓練",
+            [status.value for status in ActionRequirement],
+            key="measures_education_training",
+        )
+        if (
+            st.session_state["measures_education_training"]
+            == ActionRequirement.REQUIRED.value
+        ):
+            st.date_input(
+                "教育訓練の予定日/実施日",
+                key="measures_education_training_plan",
+            )
+    else:
+        st.session_state["answer_corrective_preventive_measures_content"] = "なし"
+        st.session_state["answer_corrective_preventive_measures_result"] = "なし"
+
+    st.markdown("***")
+
+    st.markdown("**有効性評価**")
+    if "status_validity_assessment" not in st.session_state:
+        st.session_state["status_validity_assessment"] = ""
+    if "validity_assessment_content" not in st.session_state:
+        st.session_state["validity_assessment_content"] = ""
+    if "validity_assessment_result" not in st.session_state:
+        st.session_state["validity_assessment_result"] = ""
+
+    st.selectbox(
+        "状況",
+        [status.value for status in ValidityAssessmentStatus],
+        key="status_validity_assessment",
+    )
+
+    if (
+        st.session_state["status_validity_assessment"]
+        != ValidityAssessmentStatus.NO_ACTION_NEEDED.value
+        and st.session_state["status_validity_assessment"]
+        != ValidityAssessmentStatus.ON_HOLD.value
+    ):
+        st.text_area(
+            ValidityAssessmentQuestions.CONTENT.value,
+            key="answer_validity_assessment_content",
+        )
+        st.text_area(
+            ValidityAssessmentQuestions.RESULT.value,
+            key="answer_validity_assessment_result",
+        )
+    else:
+        st.session_state["answer_validity_assessment_content"] = "なし"
+        st.session_state["answer_validity_assessment_result"] = "なし"
+
+    st.markdown("***")
+
+    st.markdown("**その他**")
+    if "status_other_measures" not in st.session_state:
+        st.session_state["status_other_measures"] = ""
+    if "answer_other_measures_content" not in st.session_state:
+        st.session_state["answer_other_measures_content"] = ""
+    if "answer_other_measures_result" not in st.session_state:
+        st.session_state["answer_other_measures_result"] = ""
+
+    st.selectbox(
+        "状況",
+        [status.value for status in InvestigationOrMethodStatus],
+        key="status_other_measures",
+    )
+
+    if (
+        st.session_state["status_other_measures"]
+        != InvestigationOrMethodStatus.NO_ACTION_NEEDED.value
+    ):
+        st.text_area(
+            OtherMeasuresQuestions.CONTENT.value, key="answer_other_measures_content"
+        )
+        st.text_area(
+            OtherMeasuresQuestions.RESULT.value, key="answer_other_measures_result"
+        )
+    else:
+        st.session_state["answer_other_measures_content"] = "なし"
+        st.session_state["answer_other_measures_result"] = "なし"
+    st.markdown("***")
+
+    st.markdown("**措置の延長申請**")
+    if "measures_extension" not in st.session_state:
+        st.session_state["measures_extension"] = ""
+    if "measures_next_report_date" not in st.session_state:
+        st.session_state["measures_next_report_date"] = date.today()
+    if "measures_extension_reason" not in st.session_state:
+        st.session_state["measures_extension_reason"] = ""
+
+    st.selectbox(
+        "延長申請",
+        [status.value for status in PresenceOrAbsence],
+        key="measures_extension",
+    )
+    if st.session_state["measures_extension"] == PresenceOrAbsence.PRESENCE.value:
+        st.date_input("次報の報告予定日", key="measures_next_report_date")
+        st.text_area(
+            ExtensionReasonQuestions.MEASURES.value, key="measures_extension_reason"
+        )
+    st.markdown("***")
+
+    st.markdown("**添付資料の有無**")
+    if "attachment" not in st.session_state:
+        st.session_state["attachment"] = ""
+    if "attached_files" not in st.session_state:
+        st.session_state["attached_files"] = ""
+    st.selectbox(
+        "添付資料",
+        [status.value for status in PresenceOrAbsence],
+        key="attachment",
+    )
+    if st.session_state["attachment"] == PresenceOrAbsence.PRESENCE.value:
+        st.text_area("添付資料名を記入してください。", key="attached_files")
+    st.markdown("***")
+
+    if (
+        st.session_state["attachment"] == PresenceOrAbsence.PRESENCE.value
+        and st.session_state["attached_files"]
+    ) or st.session_state["attachment"] == PresenceOrAbsence.ABSENCE.value:
+        submitted = st.button("送信")
+
+        st.markdown("***")
 
         if submitted:
-            if no_shipping_restriction:
-                shipping_restriction = "なし"
-            if no_attached_file:
-                attached_files = "なし"
-            if no_supplementary_information:
-                supplementary_information = "なし"
-
-            # システムプロンプトを作成する
+
             system_prompt = deviation_investigation_systemprompt_writing_instructions
-            for k in range(q_num):
-                system_prompt += q[k]
-                system_prompt += "\n"
+            system_prompt += (
+                f"Q1-1 : {DeviationSummaryQuestions.DEVIATION_SUMMARY.value}\n"
+            )
+            system_prompt += (
+                f"Q2-1 : {CauseInvestigationQuestions.CONTENT_RESULT.value}\n"
+            )
+            system_prompt += (
+                f"Q2-2 : {CauseInvestigationQuestions.DIRECT_CAUSE.value}\n"
+            )
+            system_prompt += f"Q2-3 : {CauseInvestigationQuestions.ROOT_CAUSE.value}\n"
+            system_prompt += (
+                f"Q3-1 : {ImpactInvestigationQuestions.IMPACT_ON_THE_LOT.value}\n"
+            )
+            system_prompt += (
+                f"Q3-2 : {ImpactInvestigationQuestions.IMPACT_ON_OTHERS.value}\n"
+            )
+            system_prompt += f"Q4-1 : {RecoveryMeasuresQuestions.CONTENT.value}\n"
+            system_prompt += f"Q4-2 : {RecoveryMeasuresQuestions.RESULT.value}\n"
+            system_prompt += f"Q5-1 : {ProductMeasuresQuestions.CONTENT.value}\n"
+            system_prompt += f"Q5-2 : {ProductMeasuresQuestions.RESULT.value}\n"
+            system_prompt += (
+                f"Q6-1 : {CorrectivePreventiveMeasuresQuestions.CONTENT.value}\n"
+            )
+            system_prompt += (
+                f"Q6-2 : {CorrectivePreventiveMeasuresQuestions.RESULT.value}\n"
+            )
+            system_prompt += f"Q7-1 : {ValidityAssessmentQuestions.CONTENT.value}\n"
+            system_prompt += f"Q7-2 : {ValidityAssessmentQuestions.RESULT.value}\n"
+            system_prompt += f"Q8-1 : {OtherMeasuresQuestions.CONTENT.value}\n"
+            system_prompt += f"Q8-2 : {OtherMeasuresQuestions.RESULT.value}\n"
+            system_prompt += f"Q9-1 : {ExtensionReasonQuestions.INVESTIGATION.value}\n"
+            system_prompt += f"Q9-2 : {ExtensionReasonQuestions.MEASURES.value}\n"
             system_prompt += (
                 deviation_investigation_systemprompt_output_format_instructions
             )
 
-            # ユーザープロンプトを作成する
             user_prompt = ""
-            for k in range(q_num):
-                user_prompt += f"  A{k+1} :  {input_values[k]}"
-                user_prompt += "\n"
+            user_prompt += f"A1-1: {st.session_state['answer_deviation_summary']}\n"
+            user_prompt += f"A2-1: {st.session_state['answer_cause_investigation_content_result']}\n"
+            user_prompt += (
+                f"A2-2: {st.session_state['answer_cause_investigation_direct_cause']}\n"
+            )
+            user_prompt += (
+                f"A2-3: {st.session_state['answer_cause_investigation_root_cause']}\n"
+            )
+            user_prompt += f"A3-1: {st.session_state['answer_impact_investigation_impact_on_the_lot']}\n"
+            user_prompt += f"A3-2: {st.session_state['answer_impact_investigation_impact_on_others']}\n"
+            user_prompt += (
+                f"A4-1: {st.session_state['answer_recovery_measures_content']}\n"
+            )
+            user_prompt += (
+                f"A4-2: {st.session_state['answer_recovery_measures_result']}\n"
+            )
+            user_prompt += (
+                f"A5-1: {st.session_state['answer_product_measures_content']}\n"
+            )
+            user_prompt += (
+                f"A5-2: {st.session_state['answer_product_measures_result']}\n"
+            )
+            user_prompt += f"A6-1: {st.session_state['answer_corrective_preventive_measures_content']}\n"
+            user_prompt += f"A6-2: {st.session_state['answer_corrective_preventive_measures_result']}\n"
+            user_prompt += (
+                f"A7-1: {st.session_state['answer_validity_assessment_content']}\n"
+            )
+            user_prompt += (
+                f"A7-2: {st.session_state['answer_validity_assessment_result']}\n"
+            )
+            user_prompt += (
+                f"A8-1: {st.session_state['answer_other_measures_content']}\n"
+            )
+            user_prompt += f"A8-2: {st.session_state['answer_other_measures_result']}\n"
+            user_prompt += (
+                f"A9-1: {st.session_state['investigation_extension_reason']}\n"
+            )
+            user_prompt += f"A9-2: {st.session_state['measures_extension_reason']}\n"
+
+            logger.info("システムプロンプト（逸脱調査報告書作成用）: " + system_prompt)
+            logger.info("ユーザプロンプト（逸脱調査報告書作成用）: " + user_prompt)
 
-            # OpenAIのAPIを使用して応答を生成
             client = OpenAI(api_key=open_api_key)
             response = client.chat.completions.create(
                 model="gpt-4-0125-preview",
@@ -131,84 +599,440 @@ def deviation_investigation_report_form() -> None:
                 response_format={"type": "json_object"},
                 temperature=0.0,
             )
+            logger.info(
+                "OpenAIからのレスポンス（逸脱調査報告書作成用）: " + str(response)
+            )
             response_text = response.choices[0].message.content
 
-            # 応答をjsonに変換
             response_data = (
                 json.loads(response_text) if response_text is not None else {}
             )
 
-            if isinstance(report_date, (date, datetime)):
-                formatted_date = report_date.strftime("%Y年%m月%d日")
+            if (
+                st.session_state["measures_education_training"]
+                == ActionRequirement.REQUIRED.value
+            ):
+                if isinstance(
+                    st.session_state["measures_education_training_plan"],
+                    (date, datetime),
+                ):
+                    formatted_education_training_plan = st.session_state[
+                        "measures_education_training_plan"
+                    ].strftime("%Y年%m月%d日")
+                else:
+                    formatted_education_training_plan = (
+                        "教育訓練計画が指定されていません。"
+                    )
             else:
-                formatted_date = "報告日が指定されていません。"
+                formatted_education_training_plan = ""
 
-            if isinstance(occurrence_date, date) and isinstance(
-                st.session_state["occurrence_time"], time
+            if (
+                st.session_state["investigation_extension"]
+                == PresenceOrAbsence.PRESENCE.value
             ):
-                print(st.session_state["occurrence_time"])
-                occurrence_datetime = datetime.combine(
-                    occurrence_date, st.session_state["occurrence_time"]
-                ).strftime("%Y年%m月%d日%H時%M分")
-                print(occurrence_datetime)
+                if isinstance(
+                    st.session_state["investigation_next_report_date"], (date, datetime)
+                ):
+                    formatted_investigation_next_report_date = st.session_state[
+                        "investigation_next_report_date"
+                    ].strftime("%Y年%m月%d日")
+                else:
+                    formatted_investigation_next_report_date = (
+                        "次報の報告予定日が指定されていません。"
+                    )
             else:
-                st.error(
-                    "発生日または発生時間の入力が無効です。システムエラーのため、管理者に問い合わせてください。"
-                )
+                formatted_investigation_next_report_date = ""
+
+            if (
+                st.session_state["measures_extension"]
+                == PresenceOrAbsence.PRESENCE.value
+            ):
+                if isinstance(
+                    st.session_state["measures_next_report_date"], (date, datetime)
+                ):
+                    formatted_measures_next_report_date = st.session_state[
+                        "measures_next_report_date"
+                    ].strftime("%Y年%m月%d日")
+                else:
+                    formatted_measures_next_report_date = (
+                        "次報の報告予定日が指定されていません。"
+                    )
+            else:
+                formatted_measures_next_report_date = ""
 
-            # jsonデータを作成
             st.session_state["contents"] = {
-                "報告者": reporter_name,
-                "報告日": formatted_date,
-                "品名": product_name,
-                "ロットNo.": lot_number,
-                "発生日時": occurrence_datetime,
-                "発生場所": occurrence_place,
-                "逸脱内容・発見の経緯": str(response_data["逸脱内容・発見の経緯"]),
-                "応急処置・処置の理由": str(response_data["応急処置・処置の理由"]),
-                "品質への影響の調査結果": str(response_data["品質への影響の調査結果"]),
-                "原因調査結果": str(response_data["原因調査結果"]),
-                "是正措置・予防措置": str(response_data["是正措置・予防措置"]),
-                "出荷の制限": shipping_restriction,
-                "添付資料": attached_files,
-                "備考": supplementary_information,
+                "件名": st.session_state["subject"],
+                "管理番号": st.session_state["control_number"],
+                "課名": st.session_state["section_name"],
+                "報数": f'第{st.session_state["report_number"]}報',
+                "逸脱概要": str(response_data["逸脱概要"]),
+                "原因調査の状況": st.session_state["status_cause_investigation"],
+                "原因調査の調査内容/結果": str(
+                    response_data["原因調査の調査内容/結果"]
+                ),
+                "直接原因": str(response_data["直接原因"]),
+                "根本原因": str(response_data["根本原因"]),
+                "原因調査の分類": st.session_state[
+                    "cause_investigation_classification"
+                ],
+                "原因調査の分類（その他）": st.session_state[
+                    "cause_investigation_classification_others"
+                ],
+                "原因調査の手法": st.session_state["cause_investigation_method"],
+                "原因調査の手法（その他）": st.session_state[
+                    "cause_investigation_method_others"
+                ],
+                "製品品質（製品・中間製品・原材料）への影響調査の状況": st.session_state[
+                    "status_impact_investigation"
+                ],
+                "当該ロットへの影響": str(response_data["当該ロットへの影響"]),
+                "他製品・他ロットへの影響": str(
+                    response_data["他製品・他ロットへの影響"]
+                ),
+                "調査の延長申請(原因調査及び製品品質への影響)": st.session_state[
+                    "investigation_extension"
+                ],
+                "調査延長 次報の報告予定日": formatted_investigation_next_report_date,
+                "調査延長 延長理由": str(response_data["調査延長の理由"]),
+                "回復措置の状況": st.session_state["status_recovery_measures"],
+                "回復措置の実施内容": str(response_data["回復措置の実施内容"]),
+                "回復措置の実施結果": str(response_data["回復措置の実施結果"]),
+                "製品等に対する措置の状況": st.session_state["status_product_measures"],
+                "製品等に対する措置の実施内容": str(
+                    response_data["製品等に対する措置の実施内容"]
+                ),
+                "製品等に対する措置の実施結果": str(
+                    response_data["製品等に対する措置の実施結果"]
+                ),
+                "特別作業指図書の添付": st.session_state["special_work_instructions"],
+                "是正措置/予防措置の状況": st.session_state[
+                    "status_corrective_preventive_measures"
+                ],
+                "是正措置/予防措置の実施内容": str(
+                    response_data["是正措置/予防措置の実施内容"]
+                ),
+                "是正措置/予防措置の実施結果": str(
+                    response_data["是正措置/予防措置の実施結果"]
+                ),
+                "教育訓練": st.session_state["measures_education_training"],
+                "教育訓練の計画（予定日/実施日）": formatted_education_training_plan,
+                "有効性評価の状況": st.session_state["status_validity_assessment"],
+                "有効性評価内容、有効性確認方法、有効性予定期間": str(
+                    response_data["有効性評価内容、有効性確認方法、有効性予定期間"]
+                ),
+                "有効性評価結果、有効性実施期間": str(
+                    response_data["有効性評価結果、有効性実施期間"]
+                ),
+                "その他の措置の状況": st.session_state["status_other_measures"],
+                "その他の措置の実施内容": str(response_data["その他の措置の実施内容"]),
+                "その他の措置の実施結果": str(response_data["その他の措置の実施結果"]),
+                "措置の延長申請": st.session_state["measures_extension"],
+                "措置延長 次報の報告予定日": formatted_measures_next_report_date,
+                "措置延長 延長理由": str(response_data["措置延長の理由"]),
+                "添付資料": st.session_state["attachment"],
+                "添付資料名": st.session_state["attached_files"],
             }
 
             output_deviation_investigation_report(st.session_state["contents"])
             st.session_state["document_generated"] = True
 
-    if st.session_state["document_generated"]:
-        st.markdown("以下の内容を記入した逸脱報告書(.docx)を作成しました。")
+        if st.session_state["document_generated"]:
+            st.markdown("以下の内容を記入した逸脱調査報告書(.docx)を作成しました。")
 
-        with open("data/output_deviation.docx", "rb") as file:
-            st.download_button(
-                label="ダウンロード",
-                data=file,
-                file_name="output_deviation_investigation.docx",
-                mime="application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-            )
+            with open("data/output_deviation_investigation.docx", "rb") as file:
+                st.download_button(
+                    label="ダウンロード",
+                    data=file,
+                    file_name="output_deviation_investigation.docx",
+                    mime="application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+                )
 
-        st.markdown(f'**報告者** : {st.session_state["contents"]["報告者"]}')
-        st.markdown(f'**報告日** : {st.session_state["contents"]["報告日"]}')
-        st.markdown(f'**品名** : {st.session_state["contents"]["品名"]}')
-        st.markdown(f'**ロットNo.** : {st.session_state["contents"]["ロットNo."]}')
-        st.markdown(f'**発生日時** : {st.session_state["contents"]["発生日時"]}')
-        st.markdown(f'**発生場所** : {st.session_state["contents"]["発生場所"]}')
-        st.markdown(
-            f'**逸脱内容・発見の経緯** : {st.session_state["contents"]["逸脱内容・発見の経緯"]}'
-        )
-        st.markdown(
-            f'**応急処置・処置の理由** : {st.session_state["contents"]["応急処置・処置の理由"]}'
-        )
-        st.markdown(
-            f'**品質への影響の調査結果** : {st.session_state["contents"]["品質への影響の調査結果"]}'
-        )
-        st.markdown(
-            f'**原因調査結果** : {st.session_state["contents"]["原因調査結果"]}'
-        )
-        st.markdown(
-            f'**是正措置・予防措置** : {st.session_state["contents"]["是正措置・予防措置"]}'
-        )
-        st.markdown(f'**出荷の制限** : {st.session_state["contents"]["出荷の制限"]}')
-        st.markdown(f'**添付資料** : {st.session_state["contents"]["添付資料"]}')
-        st.markdown(f'**備考** : {st.session_state["contents"]["備考"]}')
+            for key, value in st.session_state["contents"].items():
+                st.markdown(f"**{key}**: {value}")
+
+
+def output_deviation_investigation_report(contents: Dict[str, str]) -> None:
+    template_path = "data/template/template_deviation_investigation.docx"
+
+    cause_complete = "□"
+    cause_complete_suggestion = "□"
+    cause_currently_supporting = "□"
+    cause_no_support_required = "□"
+    impact_complete = "□"
+    impact_complete_suggestion = "□"
+    impact_currently_supporting = "□"
+    impact_no_support_required = "□"
+    recovery_measures_complete = "□"
+    recovery_measures_complete_suggestion = "□"
+    recovery_measures_currently_supporting = "□"
+    recovery_measures_no_support_required = "□"
+    product_measures_complete = "□"
+    product_measures_complete_suggestion = "□"
+    product_measures_currently_supporting = "□"
+    product_measures_no_support_required = "□"
+    corrective_preventive_measures_complete = "□"
+    corrective_preventive_measures_complete_suggestion = "□"
+    corrective_preventive_measures_currently_supporting = "□"
+    corrective_preventive_measures_no_support_required = "□"
+    validity_assessment_complete = "□"
+    validity_assessment_complete_suggestion = "□"
+    validity_assessment_currently_supporting = "□"
+    validity_assessment_no_support_required = "□"
+    validity_assessment_reservation = "□"
+    ohter_measures_complete = "□"
+    ohter_measures_complete_suggestion = "□"
+    ohter_measures_currently_supporting = "□"
+    ohter_measures_no_support_required = "□"
+
+    match contents["原因調査の状況"]:
+        case InvestigationOrMethodStatus.COMPLETED.value:
+            cause_complete = "☑"
+        case InvestigationOrMethodStatus.PROPOSED_COMPLETION.value:
+            cause_complete_suggestion = "☑"
+        case InvestigationOrMethodStatus.IN_PROGRESS.value:
+            cause_currently_supporting = "☑"
+        case InvestigationOrMethodStatus.NO_ACTION_NEEDED.value:
+            cause_no_support_required = "☑"
+    match contents["製品品質（製品・中間製品・原材料）への影響調査の状況"]:
+        case InvestigationOrMethodStatus.COMPLETED.value:
+            impact_complete = "☑"
+        case InvestigationOrMethodStatus.PROPOSED_COMPLETION.value:
+            impact_complete_suggestion = "☑"
+        case InvestigationOrMethodStatus.IN_PROGRESS.value:
+            impact_currently_supporting = "☑"
+        case InvestigationOrMethodStatus.NO_ACTION_NEEDED.value:
+            impact_no_support_required = "☑"
+    match contents["回復措置の状況"]:
+        case InvestigationOrMethodStatus.COMPLETED.value:
+            recovery_measures_complete = "☑"
+        case InvestigationOrMethodStatus.PROPOSED_COMPLETION.value:
+            recovery_measures_complete_suggestion = "☑"
+        case InvestigationOrMethodStatus.IN_PROGRESS.value:
+            recovery_measures_currently_supporting = "☑"
+        case InvestigationOrMethodStatus.NO_ACTION_NEEDED.value:
+            recovery_measures_no_support_required = "☑"
+    match contents["製品等に対する措置の状況"]:
+        case InvestigationOrMethodStatus.COMPLETED.value:
+            product_measures_complete = "☑"
+        case InvestigationOrMethodStatus.PROPOSED_COMPLETION.value:
+            product_measures_complete_suggestion = "☑"
+        case InvestigationOrMethodStatus.IN_PROGRESS.value:
+            product_measures_currently_supporting = "☑"
+        case InvestigationOrMethodStatus.NO_ACTION_NEEDED.value:
+            product_measures_no_support_required = "☑"
+    match contents["是正措置/予防措置の状況"]:
+        case InvestigationOrMethodStatus.COMPLETED.value:
+            corrective_preventive_measures_complete = "☑"
+        case InvestigationOrMethodStatus.PROPOSED_COMPLETION.value:
+            corrective_preventive_measures_complete_suggestion = "☑"
+        case InvestigationOrMethodStatus.IN_PROGRESS.value:
+            corrective_preventive_measures_currently_supporting = "☑"
+        case InvestigationOrMethodStatus.NO_ACTION_NEEDED.value:
+            corrective_preventive_measures_no_support_required = "☑"
+    match contents["有効性評価の状況"]:
+        case ValidityAssessmentStatus.COMPLETED.value:
+            validity_assessment_complete = "☑"
+        case ValidityAssessmentStatus.PROPOSED_COMPLETION.value:
+            validity_assessment_complete_suggestion = "☑"
+        case ValidityAssessmentStatus.IN_PROGRESS.value:
+            validity_assessment_currently_supporting = "☑"
+        case ValidityAssessmentStatus.NO_ACTION_NEEDED.value:
+            validity_assessment_no_support_required = "☑"
+        case ValidityAssessmentStatus.ON_HOLD.value:
+            validity_assessment_reservation = "☑"
+    match contents["その他の措置の状況"]:
+        case InvestigationOrMethodStatus.COMPLETED.value:
+            ohter_measures_complete = "☑"
+        case InvestigationOrMethodStatus.PROPOSED_COMPLETION.value:
+            ohter_measures_complete_suggestion = "☑"
+        case InvestigationOrMethodStatus.IN_PROGRESS.value:
+            ohter_measures_currently_supporting = "☑"
+        case InvestigationOrMethodStatus.NO_ACTION_NEEDED.value:
+            ohter_measures_no_support_required = "☑"
+
+    procedure = "□"
+    education_training = "□"
+    facilities_equipment = "□"
+    environment = "□"
+    people_relationships = "□"
+    control = "□"
+    classification_others = "□"
+    classification_others_content = ""
+    analysis_5why = "□"
+    characteristics = "□"
+    method_others = "□"
+    method_others_content = ""
+
+    match contents["原因調査の分類"]:
+        case CauseInvestigationClassifications.PROCEDURE.value:
+            procedure = "☑"
+        case CauseInvestigationClassifications.EDUCATION_TRAINING.value:
+            education_training = "☑"
+        case CauseInvestigationClassifications.FACILITIES_EQUIPMENT.value:
+            facilities_equipment = "☑"
+        case CauseInvestigationClassifications.ENVIRONMENT.value:
+            environment = "☑"
+        case CauseInvestigationClassifications.PEOPLE_RELATIONSHIPS.value:
+            people_relationships = "☑"
+        case CauseInvestigationClassifications.CONTROL.value:
+            control = "☑"
+        case CauseInvestigationClassifications.OTHERS.value:
+            classification_others = "☑"
+            classification_others_content = contents["原因調査の分類（その他）"]
+
+    match contents["原因調査の手法"]:
+        case CauseInvestigationMethods.ANALYSIS_5WHY.value:
+            analysis_5why = "☑"
+        case CauseInvestigationMethods.CHARACTERISTICS_MAP.value:
+            characteristics = "☑"
+        case CauseInvestigationMethods.OTHERS.value:
+            method_others = "☑"
+            method_others_content = contents["原因調査の手法（その他）"]
+
+    presence_special_work_instructions = "□"
+    absence_special_work_instructions = "□"
+
+    if contents["特別作業指図書の添付"] == PresenceOrAbsence.PRESENCE.value:
+        presence_special_work_instructions = "☑"
+    else:
+        absence_special_work_instructions = "☑"
+
+    presence_education_training = "□"
+    absence_education_training = "□"
+    hold_education_training = "□"
+    training_plan = ""
+
+    if contents["教育訓練"] == ActionRequirement.REQUIRED.value:
+        presence_education_training = "☑"
+        training_plan = contents["教育訓練の計画（予定日/実施日）"]
+    elif contents["教育訓練"] == ActionRequirement.ON_HOLD.value:
+        hold_education_training = "☑"
+    else:
+        absence_education_training = "☑"
+
+    presence_investigation_extension = "□"
+    absence_investigation_extension = "□"
+    investigation_next_report_date = ""
+    investigation_extension_reason = ""
+
+    if (
+        contents["調査の延長申請(原因調査及び製品品質への影響)"]
+        == PresenceOrAbsence.PRESENCE.value
+    ):
+        presence_investigation_extension = "☑"
+        investigation_next_report_date = contents["調査延長 次報の報告予定日"]
+        investigation_extension_reason = contents["調査延長 延長理由"]
+    else:
+        absence_investigation_extension = "☑"
+
+    presence_measures_extension = "□"
+    absence_measures_extension = "□"
+    measures_next_report_date = ""
+    measures_extension_reason = ""
+
+    if contents["措置の延長申請"] == PresenceOrAbsence.PRESENCE.value:
+        presence_measures_extension = "☑"
+        measures_next_report_date = contents["措置延長 次報の報告予定日"]
+        measures_extension_reason = contents["措置延長 延長理由"]
+    else:
+        absence_measures_extension = "☑"
+
+    presence_attachment = "□"
+    absence_attachment = "□"
+    attachment = ""
+
+    if contents["添付資料"] == PresenceOrAbsence.PRESENCE.value:
+        presence_attachment = "☑"
+        attachment = contents["添付資料名"]
+    else:
+        absence_attachment = "☑"
+
+    replacements = {
+        "[subject]": contents["件名"],
+        "[control_number]": contents["管理番号"],
+        "[section_name]": contents["課名"],
+        "[report_number]": contents["報数"],
+        "[deviation_summary]": contents["逸脱概要"],
+        "[cause_complete]": cause_complete,
+        "[cause_complete_suggestion]": cause_complete_suggestion,
+        "[cause_currently_supporting]": cause_currently_supporting,
+        "[cause_no_support_required]": cause_no_support_required,
+        "[investigation_result]": contents["原因調査の調査内容/結果"],
+        "[direct_cause]": contents["直接原因"],
+        "[root_cause]": contents["根本原因"],
+        "[procedure]": procedure,
+        "[education_training]": education_training,
+        "[facilities_equipment]": facilities_equipment,
+        "[environment]": environment,
+        "[people_relationships]": people_relationships,
+        "[control]": control,
+        "[classification_others]": classification_others,
+        "[classification_others_content]": classification_others_content,
+        "[analysis_5why]": analysis_5why,
+        "[characteristics]": characteristics,
+        "[method_others]": method_others,
+        "[method_others_content]": method_others_content,
+        "[impact_complete]": impact_complete,
+        "[impact_complete_suggestion]": impact_complete_suggestion,
+        "[impact_currently_supporting]": impact_currently_supporting,
+        "[impact_no_support_required]": impact_no_support_required,
+        "[impact_on_the_lot]": contents["当該ロットへの影響"],
+        "[impact_on_others]": contents["他製品・他ロットへの影響"],
+        "[presence_investigation_extension]": presence_investigation_extension,
+        "[absence_investigation_extension]": absence_investigation_extension,
+        "[investigation_next_report_date]": investigation_next_report_date,
+        "[investigation_extension_reason]": investigation_extension_reason,
+        "[recovery_measures_complete]": recovery_measures_complete,
+        "[recovery_measures_complete_suggestion]": recovery_measures_complete_suggestion,
+        "[recovery_measures_currently_supporting]": recovery_measures_currently_supporting,
+        "[recovery_measures_no_support_required]": recovery_measures_no_support_required,
+        "[recovery_measures]": contents["回復措置の実施内容"],
+        "[recovery_measures_result]": contents["回復措置の実施結果"],
+        "[product_measures_complete]": product_measures_complete,
+        "[product_measures_complete_suggestion]": product_measures_complete_suggestion,
+        "[product_measures_currently_supporting]": product_measures_currently_supporting,
+        "[product_measures_no_support_required]": product_measures_no_support_required,
+        "[product_measures]": contents["製品等に対する措置の実施内容"],
+        "[product_measures_result]": contents["製品等に対する措置の実施結果"],
+        "[presence_special_work_instructions]": presence_special_work_instructions,
+        "[absence_special_work_instructions]": absence_special_work_instructions,
+        "[corrective_preventive_measures_complete]": corrective_preventive_measures_complete,
+        "[corrective_preventive_measures_complete_suggestion]": corrective_preventive_measures_complete_suggestion,
+        "[corrective_preventive_measures_currently_supporting]": corrective_preventive_measures_currently_supporting,
+        "[corrective_preventive_measures_no_support_required]": corrective_preventive_measures_no_support_required,
+        "[corrective_precautionary_measures]": contents["是正措置/予防措置の実施内容"],
+        "[corrective_precautionary_measures_result]": contents[
+            "是正措置/予防措置の実施結果"
+        ],
+        "[presence_education_training]": presence_education_training,
+        "[absence_education_training]": absence_education_training,
+        "[hold_education_training]": hold_education_training,
+        "[training_plan]": training_plan,
+        "[validity_assessment_complete]": validity_assessment_complete,
+        "[validity_assessment_complete_suggestion]": validity_assessment_complete_suggestion,
+        "[validity_assessment_currently_supporting]": validity_assessment_currently_supporting,
+        "[validity_assessment_no_support_required]": validity_assessment_no_support_required,
+        "[validity_assessment_reservation]": validity_assessment_reservation,
+        "[validity_assessment]": contents[
+            "有効性評価内容、有効性確認方法、有効性予定期間"
+        ],
+        "[validity_assessment_result]": contents["有効性評価結果、有効性実施期間"],
+        "[ohter_measures_complete]": ohter_measures_complete,
+        "[ohter_measures_complete_suggestion]": ohter_measures_complete_suggestion,
+        "[ohter_measures_currently_supporting]": ohter_measures_currently_supporting,
+        "[ohter_measures_no_support_required]": ohter_measures_no_support_required,
+        "[other_measures]": contents["その他の措置の実施内容"],
+        "[other_measures_result]": contents["その他の措置の実施結果"],
+        "[presence_measures_extension]": presence_measures_extension,
+        "[absence_measures_extension]": absence_measures_extension,
+        "[measures_next_report_date]": measures_next_report_date,
+        "[measures_extension_reason]": measures_extension_reason,
+        "[presence_attachment]": presence_attachment,
+        "[absence_attachment]": absence_attachment,
+        "[attachment]": attachment,
+    }
+
+    doc = replace_text_in_docx(template_path, replacements)
+    output_path = "data/output_deviation_investigation.docx"
+    doc.save(output_path)
+    logger.info(f"Document saved to {output_path}")

src/forms/deviation_notification_report.py

@@ -228,7 +228,7 @@ def deviation_notification_report_form() -> None:
                     {"role": "user", "content": user_prompt},
                 ],
                 response_format={"type": "json_object"},
-                temperature=0.85,
+                temperature=0.0,
             )
             logger.info("OpenAIからのレスポンス（逸脱連絡書作成用）: " + str(response))
             response_text = response.choices[0].message.content
@@ -319,8 +319,7 @@ def deviation_notification_report_form() -> None:
             )
 
         for key, value in st.session_state["contents"].items():
-            if key != "ユーザープロンプト":
-                st.markdown(f"**{key}**: {value}")
+            st.markdown(f"**{key}**: {value}")
 
         deviation_notification_user_template_review = f"""
         ## 今回の「逸脱概要」:
@@ -343,7 +342,7 @@ def deviation_notification_report_form() -> None:
                         "content": deviation_notification_user_template_review,
                     },
                 ],
-                temperature=0.7,
+                temperature=0.0,
             )
             review = completion.choices[0].message.content
 

src/prompts/deviation_investigation_report.py

@@ -1,14 +1,29 @@
 deviation_investigation_systemprompt_writing_instructions = """
             ***
-            逸脱内容・発見の経緯:
-            応急処置・処置の理由:
-            品質への影響の調査結果:
-            原因調査結果:
-            是正措置・予防措置:
+            逸脱概要:
+            原因調査の調査内容/結果:
+            直接原因:
+            根本原因:
+            当該ロットへの影響:
+            他製品・他ロットへの影響:
+            回復措置の実施内容:
+            回復措置の実施結果:
+            製品等に対する措置の実施内容:
+            製品等に対する措置の実施結果:
+            是正措置/予防措置の実施内容:
+            是正措置/予防措置の実施結果:
+            有効性評価内容、有効性確認方法、有効性予定期間:
+            有効性評価結果、有効性実施期間:
+            その他の措置の実施内容:
+            その他の措置の実施結果:
+            調査延長の理由:
+            措置延長の理由:
             ***
-            あなたは、質問に対して入力された情報から、詳しい内容を含んだ逸脱報告書の文章を生成するアシスタントです。\n
+            あなたは、質問に対して入力された情報から、詳しい内容を含んだ逸脱調査報告書の文章を生成するアシスタントです。\n
             上記の形式に従って、入力された情報を当てはめて出力してください。報告書の読みやすさ、明瞭さ、正確さに注意してください。\n
-            変更や必要がないという回答に関してはは特にそのことを記述する必要はありません。特別な記述があった場合にのみ記述してください。
+            基本的に質問は項目と一対一で対応しています。\n
+            入力された内容をそのまま記載するのではなく、正しい日本語表現かどうかに注意し、わかりやすく簡潔な表現に直して記載してください。\n
+            回答が「なし」の場合は「なし」と記入してください。\n
             「だ・である」調で出力してください。\n
             あなたは返答をすべてJSON形式で出力します。\n
             あなたが質問した内容は以下です。\n
@@ -19,12 +34,24 @@ deviation_investigation_systemprompt_output_format_instructions = """
             ***
             出力は以下のjsonテンプレートに従って出力してください。\n
             {
-                "逸脱内容・発見の経緯":"",
-                "応急処置・処置の理由":"",
-                "品質への影響の調査結果": "",
-                "原因調査結果": "",
-                "是正措置・予防措置": ""
+                "逸脱概要": "",
+                "原因調査の調査内容/結果": "",
+                "直接原因": "",
+                "根本原因": "",
+                "当該ロットへの影響": "",
+                "他製品・他ロットへの影響": "",
+                "回復措置の実施内容": "",
+                "回復措置の実施結果": "",
+                "製品等に対する措置の実施内容": "",
+                "製品等に対する措置の実施結果": "",
+                "是正措置/予防措置の実施内容": "",
+                "是正措置/予防措置の実施結果": "",
+                "有効性評価内容、有効性確認方法、有効性予定期間": "",
+                "有効性評価結果、有効性実施期間": "",
+                "その他の措置の実施内容": "",
+                "その他の措置の実施結果": "",
+                "調査延長の理由": "",
+                "措置延長の理由": "",
             }
             ***
-            「です・ます」調ではなく「だ・である」調で出力してください。\n
             """

src/utils.py

@@ -118,54 +118,6 @@ def output_deviation_notification_report(contents: Dict[str, str]) -> None:
     logger.info(f"Document saved to {output_path}")
 
 
-def output_deviation_investigation_report(contents: Dict[str, str]) -> None:
-    template_path = "data/template/template_deviation_investigation.docx"
-
-    if contents["出荷の制限"] == "なし":
-        yes_sr = "□"
-        no_sr = "☑"
-        shipping_restriction = ""
-    else:
-        yes_sr = "☑"
-        no_sr = "□"
-        shipping_restriction = contents["出荷の制限"]
-
-    if contents["添付資料"] == "なし":
-        yes_af = "□"
-        no_af = "☑"
-        attached_file = ""
-    else:
-        yes_af = "☑"
-        no_af = "□"
-        attached_file = contents["添付資料"]
-
-    replacements = {
-        "[reporter_name]": contents["報告者"],
-        "[report_date]": contents["報告日"],
-        "[product_name]": contents["品名"],
-        "[lot_number]": contents["ロットNo."],
-        "[occurrence_datetime]": contents["発生日時"],
-        "[occurrence_place]": contents["発生場所"],
-        "[deviation_discovery]": contents["逸脱内容・発見の経緯"],
-        "[first_aid_reason]": contents["応急処置・処置の理由"],
-        "[impact_on_quality]": contents["品質への影響の調査結果"],
-        "[cause_investigation]": contents["原因調査結果"],
-        "[corrective_preventive_measures]": contents["是正措置・予防措置"],
-        "[yes_sr]": yes_sr,
-        "[no_sr]": no_sr,
-        "[shipping_restriction]": shipping_restriction,
-        "[yes_af]": yes_af,
-        "[no_af]": no_af,
-        "[attached_file]": attached_file,
-        "[supplementary_information]": contents["備考"],
-    }
-
-    doc = replace_text_in_docx(template_path, replacements)
-    output_path = "data/output_deviation_investigation.docx"
-    doc.save(output_path)
-    logger.info(f"Document saved to {output_path}")
-
-
 def replace_text_in_docx(template_path: str, replacements: Dict[str, str]) -> Any:
     """
     ドキュメント内の指定されたテキストを置き換える