yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修改小程序长者端绑定护理单元时，护理单元未设置缴费金额时的提示语 

2、统一资源上传接口 兼容pad端
This commit is contained in:
1378012178@qq.com 2026-04-01 11:21:19 +08:00
parent 8da55ea63b
commit 33e48c8111
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
View File

@ -202,12 +202,13 @@ public class ElderApi {
} finally { } finally {
DynamicDataSourceContextHolder.clear(); DynamicDataSourceContextHolder.clear();
} }
result.setNuId(nuId);
if (orgInfo != null && StringUtils.isNotBlank(orgInfo.getString("payableAmount"))) { if (orgInfo != null && StringUtils.isNotBlank(orgInfo.getString("payableAmount"))) {
result.setPayableAmount(new BigDecimal(orgInfo.getString("payableAmount"))); result.setPayableAmount(new BigDecimal(orgInfo.getString("payableAmount")));
System.out.println("2222222222222222222222:" + orgInfo); System.out.println("2222222222222222222222:" + orgInfo);
} else { } else {
result.setNuCanUse("1"); result.setNuCanUse("1");
result.setMsg("护理单元暂时无法绑定"); result.setMsg("未设置缴费金额");
return Result.ok(result); return Result.ok(result);
} }
@ -215,7 +216,6 @@ public class ElderApi {
if (baseInfo == null) { if (baseInfo == null) {
return Result.ok(null); return Result.ok(null);
} }
result.setNuId(nuId);
result.setNuStatus(baseInfo.getStatus());//使用状态 0未使用 1占用 2入住 3退住 4留床 result.setNuStatus(baseInfo.getStatus());//使用状态 0未使用 1占用 2入住 3退住 4留床
//===！！！如果改变绑定规则 业务端同时也需要修改！！！=== //===！！！如果改变绑定规则 业务端同时也需要修改！！！===

13
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
View File

@ -453,13 +453,18 @@ public class CommonController {
//验证文件名称、大小是否可具备存储“资格” //验证文件名称、大小是否可具备存储“资格”
{ {
boolean contains = redisUtil.sGet("canuploadparams").contains(file.getOriginalFilename() + "-" + fileSize); boolean contains = redisUtil.sGet("canuploadparams").contains(file.getOriginalFilename() + "-" + fileSize);
if (!contains) { String[] s = file.getOriginalFilename().split("_");
boolean containsSub = false;
if (s.length > 1) {
containsSub = redisUtil.sGet("canuploadparams").contains(file.getOriginalFilename().split("_")[1] + "-" + fileSize);
}
if (contains || containsSub) {
//删除set中元素
redisUtil.setRemove("canuploadparams", file.getOriginalFilename() + "-" + fileSize);
} else {
result.setMessage("上传失败！"); result.setMessage("上传失败！");
result.setSuccess(false); result.setSuccess(false);
return result; return result;
} else {
//删除set中元素
redisUtil.setRemove("canuploadparams", file.getOriginalFilename() + "-" + fileSize);
} }
} }
String savePath = ""; String savePath = "";