|
@@ -476,8 +476,11 @@ def jsonResToDict(json_res):
|
|
|
conditionObj = json.loads(conditionInfo)
|
|
|
|
|
|
defaultValue = '0'
|
|
|
+ default = 'lt'
|
|
|
if "value" in factor:
|
|
|
defaultValue = str(factor["value"])
|
|
|
+ if "condition" in factor:
|
|
|
+ default = factor["condition"]
|
|
|
# if defaultValue == '':
|
|
|
# defaultValue = '0'
|
|
|
|
|
@@ -487,7 +490,7 @@ def jsonResToDict(json_res):
|
|
|
"bsm": factorBsm,
|
|
|
"conditionInfo": {
|
|
|
"spatial_type": conditionObj["spatial_type"],
|
|
|
- "default": factor["condition"],
|
|
|
+ "default": default,
|
|
|
"hasValue": conditionObj["hasValue"],
|
|
|
"defaultValue": defaultValue,
|
|
|
"unit": conditionObj["unit"],
|