历史数据查询字段修改

master
gongzhenkun 2 years ago
parent e0de3ddf97
commit b0065d9143

@ -138,6 +138,7 @@ public class TRecordServiceImpl implements ITRecordService
@Override @Override
public AjaxResult getHistoryList(TRecord tRecord) public AjaxResult getHistoryList(TRecord tRecord)
{ {
logger.info("get history list param is : {} ", tRecord);
List<TRecord> tRecords = tRecordMapper.selectTRecordList(tRecord); List<TRecord> tRecords = tRecordMapper.selectTRecordList(tRecord);
tRecords.removeIf(o->"0".equals(o.getStatus())); tRecords.removeIf(o->"0".equals(o.getStatus()));
if (CollectionUtils.isEmpty(tRecords)){ if (CollectionUtils.isEmpty(tRecords)){
@ -166,9 +167,9 @@ public class TRecordServiceImpl implements ITRecordService
List<JSONObject> result = records.stream().map(tRecord -> { List<JSONObject> result = records.stream().map(tRecord -> {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
if(StringUtils.isEmpty(tRecord.getUpdateResult2())){ if(StringUtils.isEmpty(tRecord.getUpdateResult2())){
jsonObject = JSONObject.parseObject(tRecord.getAiResult2()); jsonObject = JSONObject.parseObject(tRecord.getAiResult());
}else if(!StringUtils.isEmpty(tRecord.getUpdateResult2())){ }else if(!StringUtils.isEmpty(tRecord.getUpdateResult2())){
jsonObject = JSONObject.parseObject(tRecord.getUpdateResult2()); jsonObject = JSONObject.parseObject(tRecord.getUpdateResult());
} }
return jsonObject; return jsonObject;
}).filter(Objects::nonNull).collect(Collectors.toList()); }).filter(Objects::nonNull).collect(Collectors.toList());
@ -183,7 +184,7 @@ public class TRecordServiceImpl implements ITRecordService
} }
/** /**
* json * json
* *
* @param obj obj * @param obj obj
* @param listName * @param listName

@ -25,7 +25,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTRecordVo"> <sql id="selectTRecordVo">
select id, patient_id, doctor_id, hospital_id, status,ai_result2,update_result2, create_time, update_time, upload_time,response_time from t_record select id,
patient_id,
doctor_id,
hospital_id,
status,
ai_result,
update_result,
ai_result2,
update_result2,
create_time,
update_time,
upload_time,
response_time
from t_record
</sql> </sql>
<sql id="selectTRecordWithResult"> <sql id="selectTRecordWithResult">
SELECT SELECT

Loading…
Cancel
Save