|
@@ -76,12 +76,7 @@ import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.nio.file.Files;
|
|
|
import java.nio.file.Paths;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Queue;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* @description: 医保管理服务,包涵项目对照等
|
|
@@ -378,15 +373,17 @@ public class SiManageService {
|
|
|
JSONObject fileinfo = output.getJSONObject("fileinfo");
|
|
|
String filePath = dldService.downloadFile(fileinfo.getString("file_qury_no"), fileinfo.getString("filename"));
|
|
|
Queue<String> queue = SiUtil.readTxtFile(filePath);
|
|
|
- if (null == queue || queue.size() == 0) {
|
|
|
+ if (null == queue || queue.isEmpty()) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "未能成功获取到对账结果。");
|
|
|
}
|
|
|
List<InsSetlDetlChkRslt> list = new ArrayList<>();
|
|
|
- while (queue.size() > 0) {
|
|
|
+ while (!queue.isEmpty()) {
|
|
|
String item = queue.poll();
|
|
|
String[] arr = item.split("\t");
|
|
|
InsSetlDetlChkRslt rslt = new InsSetlDetlChkRslt(arr);
|
|
|
- list.add(rslt);
|
|
|
+ if (!Objects.equals("对账成功", rslt.getMemo())) {
|
|
|
+ list.add(rslt);
|
|
|
+ }
|
|
|
}
|
|
|
return ResultVoUtil.success(list);
|
|
|
}
|