|
@@ -370,14 +370,10 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
}
|
|
}
|
|
checkDetailWordVO.setContent(chtestcontent+entestcontent);
|
|
checkDetailWordVO.setContent(chtestcontent+entestcontent);
|
|
String testresult = "";
|
|
String testresult = "";
|
|
- String testdata = "";
|
|
|
|
if (StringUtils.isNotBlank(detailDo.getTestresult())){
|
|
if (StringUtils.isNotBlank(detailDo.getTestresult())){
|
|
testresult = resultType.stream().filter(dictDo -> detailDo.getTestresult().contains(dictDo.getString("VALUE"))).findFirst().get().getString("NAME").toString();
|
|
testresult = resultType.stream().filter(dictDo -> detailDo.getTestresult().contains(dictDo.getString("VALUE"))).findFirst().get().getString("NAME").toString();
|
|
}
|
|
}
|
|
- if (StringUtils.isNotBlank(detailDo.getTestdata())){
|
|
|
|
- testdata = detailDo.getTestdata();
|
|
|
|
- }
|
|
|
|
- checkDetailWordVO.setResult(testresult+testdata);
|
|
|
|
|
|
+ checkDetailWordVO.setResult(testresult);
|
|
String testnotes = "";
|
|
String testnotes = "";
|
|
if (StringUtils.isNotBlank(detailDo.getTestnotes())){
|
|
if (StringUtils.isNotBlank(detailDo.getTestnotes())){
|
|
testnotes = detailDo.getTestnotes();
|
|
testnotes = detailDo.getTestnotes();
|