|
@@ -114,15 +114,22 @@ public class SiZyFeeService {
|
|
|
continue;
|
|
|
}
|
|
|
uploadingMap.put(overview.getInpatientNo(), staffMap.get(overview.getStaffId()));
|
|
|
+ ResultVo<String> resVo;
|
|
|
try {
|
|
|
- ResultVo<String> resVo = uploadFeeDetail(overview, socketTask);
|
|
|
- sendDuringUpload(overview, resVo.getCode() == ExceptionEnum.SUCCESS.getCode() ?
|
|
|
- resVo.getData() : resVo.getMessage());
|
|
|
- } catch (Exception ignored) {} finally {
|
|
|
+ resVo = uploadFeeDetail(overview, socketTask);
|
|
|
+ } catch (Exception e) {
|
|
|
+ resVo = ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, e.getCause().getMessage());
|
|
|
+ } finally {
|
|
|
uploadingMap.remove(overview.getInpatientNo());
|
|
|
}
|
|
|
+ String msg = resVo.getCode() ==
|
|
|
+ ExceptionEnum.SUCCESS.getCode() ? resVo.getData() : resVo.getMessage();
|
|
|
+ sendDuringUpload(overview, msg);
|
|
|
+ if (overviews.size() == 1) {
|
|
|
+ return resVo;
|
|
|
+ }
|
|
|
}
|
|
|
- return ResultVoUtil.success();
|
|
|
+ return ResultVoUtil.success("上传完成,请点击【上传信息】查看详情。");
|
|
|
}
|
|
|
|
|
|
public ResultVo<String> uploadFeeDetail(Overview o, SocketTask socketTask) {
|