From a5e76101f2e1e0f1743e3af5f383c13be100fbc9 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Thu, 11 May 2023 14:48:32 +0800 Subject: [PATCH] =?UTF-8?q?changes=20=E4=BF=9D=E5=81=A5=E4=B8=9A=E6=89=93?= =?UTF-8?q?=E5=88=86=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/Router/HealthIndustryRouter.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/APP/Router/HealthIndustryRouter.py b/APP/Router/HealthIndustryRouter.py index b35dba4..dc6f80d 100644 --- a/APP/Router/HealthIndustryRouter.py +++ b/APP/Router/HealthIndustryRouter.py @@ -253,15 +253,21 @@ def func(schemas: ComputeSchemas.ComputeModelReqBody, mongodb: MongoHelper = Dep def score_func_by_number(dict_level, v, w): score_result = dict() - for k1, v1 in dict_level.items(): - if k1 == "0": - score_result['得分'] = 0 + keys = list(dict_level.keys()) + keys.reverse() + for k1 in keys: + v1 = dict_level.get(k1) + if v1 == 0 and v >= v1: + score_result['得分'] = round(int(k1) / 100 * w, 2) score_result['档位'] = score_level(k1) break if v1 and v >= v1: score_result['得分'] = round(int(k1) / 100 * w, 2) score_result['档位'] = score_level(k1) break + if not score_result: + score_result['得分'] = 0 + score_result['档位'] = score_level("0") return score_result test_list = list() @@ -297,8 +303,13 @@ def func(schemas: ComputeSchemas.ComputeModelReqBody, mongodb: MongoHelper = Dep index_dict['得分'] = result.get('得分') index_dict['档位'] = result.get('档位') index_score.append(index_dict) + else: + type(value) except TypeError: raise HTTPException(status_code=400, detail="{}指标值不符合规范".format(index_name)) + for q in index_data: + if q.get('四级指标') not in test_list: + print(q.get('四级指标')) # 汇总得分 total_score = round(sum(item.get('得分') for item in index_score), 2)