diff --git a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java index c3f292a..390d529 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java @@ -35,4 +35,26 @@ public class ChargeController extends BaseController { chargeService.completeOrder(id,payType); return success(); } + @RequestMapping("/socialPrePay") + public Result socialPrePay(){ + String changeOrderCode = parmsUtil.getString("changeOrderCode"); + String mdtrtCertType = parmsUtil.getString("mdtrtCertType"); + String mdtrtCertNO = parmsUtil.getString("mdtrtCertNO"); + String insutype = parmsUtil.getString("insutype"); + chargeService.uploadCostDetails(changeOrderCode); + chargeService.socialPrePay(changeOrderCode,mdtrtCertType,mdtrtCertNO,insutype); + return success(); + } + + + @RequestMapping("/socialRealPay") + public Result socialRealPay(){ + String changeOrderCode = parmsUtil.getString("changeOrderCode"); + String mdtrtCertType = parmsUtil.getString("mdtrtCertType"); + String mdtrtCertNO = parmsUtil.getString("mdtrtCertNO"); + String insutype = parmsUtil.getString("insutype"); + chargeService.socialRealPay(changeOrderCode,mdtrtCertType,mdtrtCertNO,insutype); + return success(); + } + } diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java index 16e29dd..4f019c9 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java @@ -60,7 +60,8 @@ public class SocialDiagnoseService { socialDiagnoseMapper.delete(queryWrapper); socialDiagnoseMapper.insert(list, 100); socialDirectoryVersionService.setSocialDirectoryVersion(1307, version_name, list.get(0).getVersionName(), list.size()); - return list.get(0).getVersionName(); + return null; +// return list.get(0).getVersionName(); } /** diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java index 171cf39..9c8a81c 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java @@ -67,9 +67,9 @@ public class SocialItemService { list.add(socialItem); } socialDirectoryVersionService.setSocialDirectoryVersion(1305, version_name, next_version_name, list.size()); - if(list.isEmpty()){ - return next_version_name; - } +// if(list.isEmpty()){ +// return next_version_name; +// } if(!codeList.isEmpty()){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("social_code", codeList); @@ -78,6 +78,6 @@ public class SocialItemService { socialItemMapper.insert(list, 100); - return next_version_name; + return null; } } diff --git a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java index 8178f78..3633029 100644 --- a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java +++ b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java @@ -26,11 +26,13 @@ class ServerApplicationTests { private SocialRequest socialRequest; @Test void contextLoads() { - chargeService.uploadCostDetails("CO20250424130233778296"); - String meCode = "AD1537643"; - String medType = "03"; - String in = "310"; - chargeService.socialPrePay("CO20250424130233778296",medType,meCode,"310"); +// chargeService.uploadCostDetails("CO20250424130233778296"); +// String meCode = "AD1537643"; +// String medType = "03"; +// String in = "310"; +// chargeService.socialPrePay("CO20250424130233778296",medType,meCode,"310"); + String meCode = "AD1537643|eZFLx0k4i8izV3NdLvOKRF16BQ6yCj3Cv+PS4dyDK/fy4l30EzRhIDFV5W0E+jZVkPFpsUkVVUU0WX+58IafhGQxzYO25uuEaZkwhDFyPF+RbV14gcURcjR7BjU8m+xWQV1jmrEygKcJ0fbjtdEZrjZRgjNtiz+KCqw5qeWlkvtfcI/pnYeD6Y0CI64KnBGFfMxd9n2pM2GnZp08tJRb/50KnDqwZY1tHLNmiCX0Cnk="; + chargeService.socialRealPay("CO20250424130233778296","03",meCode,"310"); } @Test