diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java index b27610d..c325540 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryLimitService.java @@ -24,21 +24,21 @@ public class SocialDirectoryLimitService { @Autowired private SocialDirectoryLimitMapper socialDirectoryLimitMapper; /* - * 获取医保限价数据 - * @param updtTime 更新时间 - * @param page 页码 + * 更新医保限价信息 + * @param updtTime 更新时间 + * @param pageNum 页码 */ - public Map getInfo(String updtTime, int page) { + public Map updateSocial(String updtTime, int pageNum) { if (updtTime == null || updtTime.trim().isEmpty()) { // 处理参数为空的情况，这里假设返回一个错误结果 throw new MessageException("参数 updt_time 不能为空"); } IM1318 im1318 = new IM1318(); - System.out.println("正在处理第" + page + "页"); + System.out.println("正在处理第" + pageNum + "页"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); im1318.setUpdtTime(LocalDateTime.parse(updtTime, formatter)); im1318.setValiFlag("1"); - im1318.setPageNum(page); + im1318.setPageNum(pageNum); im1318.setPageSize(1000); OM1318 om1318 = socialRequest.call1318(im1318); System.out.println(1 + "/" + om1318.getPages()); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java index 339dc64..a2dbc1c 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectorySelfService.java @@ -24,24 +24,24 @@ public class SocialDirectorySelfService { @Autowired private SocialDirectorySelfMapper socialDirectorySelfMapper; /* - * 获取自费比例信息 - * @param updtTime 更新时间 - * @param page 页码 + * 更新医保自付比例 + * @param updtTime 更新时间 + * @param pageNum 页码 */ - public Map getInfo(String updtTime, int page) { + public Map updateSocial(String updtTime, int pageNum) { if (updtTime == null) { throw new MessageException("updtTime不能为空"); } IM1319 im1319 = new IM1319(); - System.out.println("正在处理第" + page + "页"); + System.out.println("正在处理第" + pageNum + "页"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); im1319.setUpdtTime(LocalDateTime.parse(updtTime, formatter)); im1319.setSelfpayPropPsnType("310"); im1319.setValiFlag("1"); - im1319.setPageNum(page); + im1319.setPageNum(pageNum); im1319.setPageSize(1000); OM1319 om1319 = socialRequest.call1319(im1319); - System.out.println(page + "/" + om1319.getPages()); + System.out.println(pageNum + "/" + om1319.getPages()); for (int i = 0; i < om1319.getData().size(); i++){ SocialDirectorySelf socialDirectorySelf = new SocialDirectorySelf(); Map map = om1319.getData().get(i); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java index b1941b8..24524a5 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryUpinfoService.java @@ -26,25 +26,24 @@ public class SocialDirectoryUpinfoService { private SocialDirectoryUpinfoMapper socialDirectoryUpinfoMapper; private Logger logger = Logger.getLogger(this.getClass().getName()); - /* - * 获取医保有效期信息 - * @param updtTime 更新时间 - * @param page_num 页码 + * 更新医保有效期 + * @param updtTime 更新时间 + * @param pageNum 页码 */ - public Map getSocialDirectoryUpinfoInfo(String updtTime, int page_num) { + public Map getInfo(String updtTime, int pageNum) { if (updtTime == null) { throw new MessageException("updtTime不能为空"); } IM1312 im1312 = new IM1312(); - logger.info("正在处理第" + page_num + "页"); + logger.info("正在处理第" + pageNum + "页"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); im1312.setUpdtTime(LocalDateTime.parse(updtTime, formatter)); im1312.setValiFlag("1"); - im1312.setPageNum(page_num); + im1312.setPageNum(pageNum); im1312.setPageSize(1000); OM1312 om1312 = socialRequest.call1312(im1312); - System.out.println(page_num + "/" + om1312.getPages()); + System.out.println(pageNum + "/" + om1312.getPages()); List> data = om1312.getData(); for (Map datum : data) { SocialDirectoryUpinfo socialDirectoryUpinfo = new SocialDirectoryUpinfo(); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryVersionService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryVersionService.java index d5162b5..027e255 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryVersionService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryVersionService.java @@ -15,10 +15,9 @@ import java.util.List; public class SocialDirectoryVersionService { @Autowired private SocialDirectoryVersionMapper socialDirectoryVersionMapper; - /* - * 获取当前版本 - * @param type 类型 + * 获取当前版本信息 + * @param type 目录类型 */ public SocialDirectoryVersion getCurrent(int type) { Integer[] type_list = {1301, 1302, 1305, 1306, 1307, 1309, 1314, 1315, 1320, 1321}; @@ -44,12 +43,11 @@ public class SocialDirectoryVersionService { } return socialDirectoryVersion; } - /* * 获取版本列表 + * @param type 目录类型 * @param pageNum 页码 * @param pageSize 每页数量 - * @param type 类型 */ public Page list(int pageNum, int pageSize, int type) { Integer[] type_list = {1301, 1302, 1305, 1306, 1307, 1309}; diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java index ccf1c0b..7b4f6a2 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java @@ -20,11 +20,11 @@ public class SocialUserService { @Autowired private SocialUserMapper socialUserMapper; /* - * 获取社保信息 - * @param im1101 + * 获取医保信息 + * @param im1101 医保入参 */ @Transactional(rollbackFor = Exception.class) - public OM1101 getCustomSocialInfo(IM1101 im1101) { + public OM1101 getSocialInfo(IM1101 im1101) { if (im1101 == null) { throw new MessageException("没有带数据"); }