|
@@ -91,15 +91,13 @@ def rule6_decorator(f, *args, **kwargs):
|
|
|
predict_line = args[1]
|
|
|
predict_line = f(*args, **kwargs)
|
|
|
idx = predict_line.index('')
|
|
|
- dictionary = ['每份']
|
|
|
try:
|
|
|
if idx == 1:
|
|
|
- for dict in dictionary:
|
|
|
- if '项目' in predict_line[0] and dict in predict_line[2]:
|
|
|
- predict_line[1] = dict
|
|
|
- r = re.split(dict, predict_line[2])
|
|
|
- if len(r) == 2 and r[1]:
|
|
|
- predict_line[2] = r[1]
|
|
|
+ if '项目' in predict_line[0] and '每份' in predict_line[2] and '营养素参考值' in predict_line[2]:
|
|
|
+ predict_line[1] = predict_line[2].split('营养素参考值')[0]
|
|
|
+ r = predict_line[2].split('营养素参考值')
|
|
|
+ if len(r) == 2:
|
|
|
+ predict_line[2] = '营养素参考值'+r[1]
|
|
|
except IndexError as e:
|
|
|
- print('rule1_decorator', e)
|
|
|
+ print('rule6_decorator', e)
|
|
|
return predict_line
|