diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java index 4cf74ab4..9a98ab59 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java @@ -32,7 +32,7 @@ public interface ExternalDao { /** * 查询是否已有主测试记录 */ - ExternalVo.UserInfo motionQueryMemberInfo(@Param("memberid") String memberid, + List motionQueryMemberInfo(@Param("memberid") String memberid, @Param("testData")Date testData, @Param("Title") String Title); diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java index da162796..70cd91ec 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java @@ -233,12 +233,14 @@ public class ExternalServiceImpl implements ExternalService { @Override public int motionAdd(ExternalDto.RtcfInfo rtcfInfoDto) { //查询今日是否已有测试数据, 如有则删除后新增 - ExternalVo.UserInfo userInfo = externalDao.motionQueryMemberInfo(rtcfInfoDto.getUID(), DateUtil.parse(rtcfInfoDto.getTestDate(), "yyyy-MM-dd"), rtcfInfoDto.getTitle()); - if (userInfo != null) { + List userInfos = externalDao.motionQueryMemberInfo(rtcfInfoDto.getUID(), DateUtil.parse(rtcfInfoDto.getTestDate(), "yyyy-MM-dd"), rtcfInfoDto.getTitle()); + if (CollectionUtil.isNotEmpty(userInfos)) { //删除数据 - externalDao.delMain(userInfo.getUID(), "CURRENT_FIT_DATA"); - externalDao.delData(userInfo.getTestID()); - externalDao.delAdvice(userInfo.getTestID()); + for (ExternalVo.UserInfo userInfo : userInfos) { + externalDao.delMain(userInfo.getUID(), "CURRENT_FIT_DATA"); + externalDao.delData(userInfo.getTestID()); + externalDao.delAdvice(userInfo.getTestID()); + } } ExternalDto.RtcfInfo.Advice advice = rtcfInfoDto.getAdvice(); @@ -259,12 +261,14 @@ public class ExternalServiceImpl implements ExternalService { @Override public int motionAddTcf(ExternalDto.BcaData bcaData) { //查询今日是否已有测试数据, 如有则删除后新增 - ExternalVo.UserInfo userInfo = externalDao.motionQueryMemberInfo(bcaData.getUID(), DateUtil.parse(bcaData.getTestDate(), "yyyy-MM-dd"), bcaData.getTitle()); - if (userInfo != null) { + List userInfos = externalDao.motionQueryMemberInfo(bcaData.getUID(), DateUtil.parse(bcaData.getTestDate(), "yyyy-MM-dd"), bcaData.getTitle()); + if (CollectionUtil.isNotEmpty(userInfos)) { //删除数据 - externalDao.delMain(userInfo.getUID(), "CURRENT_BCA_DATA"); - externalDao.delRecord(userInfo.getUID()); - externalDao.delBcaAdvice(userInfo.getUID()); + for (ExternalVo.UserInfo userInfo : userInfos) { + externalDao.delMain(userInfo.getUID(), "CURRENT_BCA_DATA"); + externalDao.delRecord(userInfo.getUID()); + externalDao.delBcaAdvice(userInfo.getUID()); + } } if (bcaData.getData() != null) { diff --git a/acupuncture-system/src/main/resources/mapper/dao/ExternalDao.xml b/acupuncture-system/src/main/resources/mapper/dao/ExternalDao.xml index 0c2bfc6d..65d35e2b 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/ExternalDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/ExternalDao.xml @@ -104,9 +104,9 @@ and t.UID = #{memberid} - - and t.TestDate = #{testData} - + + + and t.Title = #{Title}