|
@@ -21,7 +21,6 @@ import thyyxxk.webserver.entity.examinations.lisdock.ItemResult;
|
|
|
import thyyxxk.webserver.entity.examinations.lisdock.PushResultParam;
|
|
|
import thyyxxk.webserver.utils.Md5Util;
|
|
|
import thyyxxk.webserver.utils.ResultVoUtil;
|
|
|
-import thyyxxk.webserver.utils.StringUtil;
|
|
|
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.ExecutionException;
|
|
@@ -37,8 +36,6 @@ public class LisDockService {
|
|
|
private final static String IMG_URL_PREFIX = "http://staticweb.hnthyy.cn/inspections/";
|
|
|
private static final String GET_CUSTOMER_INFO = "https://api.hnocc.com/commonInterface/selectUserInfo"; // 线上
|
|
|
private static final String PUSH_RESULT = "https://api.hnocc.com/commonInterface/pushResult"; // 线上
|
|
|
-// private static final String GET_CUSTOMER_INFO = "http://api.ingeye.com/commonInterface/selectUserInfo"; // 测试
|
|
|
-// private static final String PUSH_RESULT = "http://api.ingeye.com/commonInterface/pushResult"; // 测试
|
|
|
private final InspectionsDao dao;
|
|
|
private final InspectionsService service;
|
|
|
private final static String STOOL_CULTURE = "JK01";
|
|
@@ -152,7 +149,7 @@ public class LisDockService {
|
|
|
itemResults.add(results);
|
|
|
}
|
|
|
}
|
|
|
- result.setItemResult(itemResults);
|
|
|
+ result.setItemResults(itemResults);
|
|
|
String reportUrl = html2image(result);
|
|
|
if (null == reportUrl) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "生成检验报告图片失败!");
|