Merge branch 'bzq1/pool_278_calculate_formula' of eta_server/eta_api into debug

services/data/edb_info.go

@@ -2435,7 +2435,7 @@ func formatCalculateFormula(calculateFormula string) (ruleTitle string) {
 					tmpDate = tmpCalculateFormula[fLen-1]["d"] + "(含)之后"
 				}
 				if i == fLen-1 {
-					tmpDate = date + "之前"
+					tmpDate = tmpCalculateFormula[1]["d"] + "之前"
 				}
 				if fLen > 2 && i >= 1 && i < fLen-1 {
 					tmpDate = fmt.Sprintf("%s(含)——%s", date, tmpCalculateFormula[i+1]["d"])