changes 保健业打分模型

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)