|
|
@@ -76,14 +76,14 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
|
|
|
JSONArray sensorList = JSONObject.parseArray(b.getSensorJson());
|
|
|
for(int x=0;x<sensorList.size();x++){
|
|
|
JSONObject jsonObj=sensorList.getJSONObject(x);
|
|
|
- String unit = jsonObj.get("unit")+"";
|
|
|
+ String unit = jsonObj.getString("unit");
|
|
|
if(StringUtils.isNotBlank(unit)){
|
|
|
- sensorStr.append(jsonObj.get("describe")+":"+jsonObj.get("value")+""+jsonObj.get("unit")+" ");
|
|
|
+ sensorStr.append(jsonObj.getString("describe")+":"+jsonObj.getString("value")+jsonObj.getString("unit"));
|
|
|
}else{
|
|
|
- sensorStr.append(jsonObj.get("describe")+":"+jsonObj.get("value")+" ");
|
|
|
+ sensorStr.append(jsonObj.getString("describe")+":"+jsonObj.getString("value"));
|
|
|
}
|
|
|
// sensorStr.append(jsonObj.get("describe")+":"+jsonObj.get("value")+""+jsonObj.get("unit")==null?"":jsonObj.get("unit")+" ");
|
|
|
- if(StringUtils.isNotNull(jsonObj.get("funNum")) && (jsonObj.get("funNum")+"").equals("huoyan")){
|
|
|
+ if(StringUtils.isNotNull(jsonObj.getString("funNum")) && (jsonObj.getString("funNum")).equals("huoyan")){
|
|
|
if(!a.getClosePlan()){
|
|
|
a.setClosePlan(true);
|
|
|
}
|