Merge branch 'dev' of http://47.100.44.39:10001/pengxiong/fund_report into dev

app/service/portfolio_diagnose.py

@@ -1105,12 +1105,15 @@ class PortfolioDiagnose(object):
             except Exception:
                 pass
 
+        evaluation_dict = {'name': fund_name, 'data': ret}
+
         if objective:
-            evaluation_dict = {'name': fund_name, 'data': ret}
             if fund_id in self.abandon_fund_score + self.abandon_fund_corr:
                 evaluation_dict['status'] = "换仓"
             elif fund_id in self.portfolio:
                 evaluation_dict['status'] = "保留"
+        else:
+            evaluation_dict['status'] = ""
         return evaluation_dict
 
     def old_portfolio_evaluation(self, objective=False):
@@ -1126,8 +1129,6 @@ class PortfolioDiagnose(object):
             repr(e)
             return None
 
-
-
     def propose_fund_evaluation(self, ):
         try:
             result = []