diff --git a/app/api/v1/app_valuations/app_valuations.py b/app/api/v1/app_valuations/app_valuations.py index 5e920f9..0877959 100644 --- a/app/api/v1/app_valuations/app_valuations.py +++ b/app/api/v1/app_valuations/app_valuations.py @@ -119,12 +119,7 @@ async def _perform_valuation_calculation(user_id: int, data: UserValuationCreate input_data_by_b2 = await _extract_calculation_params_b2(data) # 提取 风险调整系数B3 计算参数 input_data_by_b3 = await _extract_calculation_params_b3(data) - if infringement_score == 10.0: - input_data_by_b3["lawsuit_status"] = "无诉讼状态" - if 0 < infringement_score < 4.0: - input_data_by_b3["lawsuit_status"] = "已解决诉讼" - else: - input_data_by_b3["lawsuit_status"] = "未解决诉讼" + input_data_by_b3["lawsuit_status"]=infringement_score # 提取 市场估值C 参数 input_data_by_c = await _extract_calculation_params_c(data) diff --git a/app/utils/calculation_engine/risk_adjustment_b3/sub_formulas/risk_adjustment_b3.py b/app/utils/calculation_engine/risk_adjustment_b3/sub_formulas/risk_adjustment_b3.py index 6969437..2f276f8 100644 --- a/app/utils/calculation_engine/risk_adjustment_b3/sub_formulas/risk_adjustment_b3.py +++ b/app/utils/calculation_engine/risk_adjustment_b3/sub_formulas/risk_adjustment_b3.py @@ -110,14 +110,14 @@ class RiskAdjustmentB3Calculator: return: float: 法律风险评分 (0-10) """ - lawsuit_scores = { - "无诉讼": 10.0, - "已解决诉讼": 7.0, - "未解决诉讼": 0.0 - } - - return lawsuit_scores.get(lawsuit_status, 0.0) + # lawsuit_scores = { + # "无诉讼": 10.0, + # "已解决诉讼": 7.0, + # "未解决诉讼": 0.0 + # } + # return lawsuit_scores.get(lawsuit_status, 0.0) + return float(lawsuit_status) def calculate_inheritance_risk(self, inheritor_ages: List[int]) -> float: """ 计算传承风险