clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: clinic-v2:e44b29a33cb5d17efddbaa66df77b2847ba57b10
Branches Tags
clinic-v2:master
clinic-v2:fea_tongmingxuan_xinjiangbushu
...
compare: clinic-v2:9d7aa4a040a6be118daa164e5fab0c64665fca67
Branches Tags
clinic-v2:fea_tongmingxuan_xinjiangbushu
clinic-v2:master

2 Commits
e44b29a33c ... 9d7aa4a040

Author SHA1 Message Date
LiJianZhao 9d7aa4a040 Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server 2025-04-24 16:49:27 +08:00
LiJianZhao dd2080fe71 dev 2025-04-24 16:49:18 +08:00
4 changed files with 35 additions and 10 deletions
Show Stats Expand all files Collapse all files

22
src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java
View File

@ -35,4 +35,26 @@ public class ChargeController extends BaseController {
chargeService.completeOrder(id,payType); chargeService.completeOrder(id,payType);
return success(); return success();
} }
@RequestMapping("/socialPrePay")
public Result<Object> 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<Object> 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();
}
} }

3
src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java
View File

@ -60,7 +60,8 @@ public class SocialDiagnoseService {
socialDiagnoseMapper.delete(queryWrapper); socialDiagnoseMapper.delete(queryWrapper);
socialDiagnoseMapper.insert(list, 100); socialDiagnoseMapper.insert(list, 100);
socialDirectoryVersionService.setSocialDirectoryVersion(1307, version_name, list.get(0).getVersionName(), list.size()); socialDirectoryVersionService.setSocialDirectoryVersion(1307, version_name, list.get(0).getVersionName(), list.size());
return list.get(0).getVersionName(); return null;
// return list.get(0).getVersionName();
} }
/** /**

8
src/main/java/com/syjiaer/clinic/server/service/social/SocialItemService.java
View File

@ -67,9 +67,9 @@ public class SocialItemService {
list.add(socialItem); list.add(socialItem);
} }
socialDirectoryVersionService.setSocialDirectoryVersion(1305, version_name, next_version_name, list.size()); socialDirectoryVersionService.setSocialDirectoryVersion(1305, version_name, next_version_name, list.size());
if(list.isEmpty()){ // if(list.isEmpty()){
return next_version_name; // return next_version_name;
} // }
if(!codeList.isEmpty()){ if(!codeList.isEmpty()){
QueryWrapper<SocialItem> queryWrapper = new QueryWrapper<>(); QueryWrapper<SocialItem> queryWrapper = new QueryWrapper<>();
queryWrapper.in("social_code", codeList); queryWrapper.in("social_code", codeList);
@ -78,6 +78,6 @@ public class SocialItemService {
socialItemMapper.insert(list, 100); socialItemMapper.insert(list, 100);
return next_version_name; return null;
} }
} }

12
src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java
View File

@ -26,11 +26,13 @@ class ServerApplicationTests {
private SocialRequest socialRequest; private SocialRequest socialRequest;
@Test @Test
void contextLoads() { void contextLoads() {
chargeService.uploadCostDetails("CO20250424130233778296"); // chargeService.uploadCostDetails("CO20250424130233778296");
String meCode = "AD1537643"; // String meCode = "AD1537643";
String medType = "03"; // String medType = "03";
String in = "310"; // String in = "310";
chargeService.socialPrePay("CO20250424130233778296",medType,meCode,"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 @Test