diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java index c9e2f7f..18db813 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java @@ -135,20 +135,28 @@ public class PatientController { patient.setCreatedtime(new Date()); patient.setPpasswd(Constant.COMMON_PASSWD); } else { + //今天有这个患者疾病的病例不用添加(这里防止同一天平台重复添加病例疾病) QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("pid", patient.getId()); + queryWrapper.eq("pid", patient2.getId()); Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); calendar.set(Calendar.HOUR_OF_DAY, 00);//时 calendar.set(Calendar.MINUTE, 00);//分 calendar.set(Calendar.SECOND, 00);//秒 queryWrapper.ge("createdtime", calendar.getTime()); - int count = lymsPcaseService.count(queryWrapper); - //如果今天有这个患者病例不用添加(这里防止同一天平台重复添加) - if (count != 0) { - baseResponse.setErrorcode(1); - baseResponse.setErrormsg("今天已经添加过该患者病例。不要重复添加!"); - return baseResponse; + List pcaseList = lymsPcaseService.list(queryWrapper); + for (LymsPcase lymsPcase : pcaseList) { + QueryWrapper illnessQueryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pcid", lymsPcase.getPcid()); + List iids=Arrays.asList(illness.split(",")); + queryWrapper.in("iid", iids); + queryWrapper.ge("createdtime", calendar.getTime()); + int count = lymsIllnessService.count(illnessQueryWrapper); + if (count != 0) { + baseResponse.setErrorcode(1); + baseResponse.setErrormsg("今天已经添加过该患者病例。不要重复添加!"); + return baseResponse; + } } patient.setId(patient2.getId()); patient.setUpdatedtime(new Date()); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java index b3d66d6..91c7919 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java @@ -146,10 +146,17 @@ public class LymsHisInfoServiceImpl extends ServiceImpl pcaseList = lymsPcaseService.list(queryWrapper); + for (LymsPcase lymsPcase : pcaseList) { + QueryWrapper illnessQueryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pcid", lymsPcase.getPcid()); + queryWrapper.in("iid", diagnoseIds); + queryWrapper.ge("createdtime", calendar.getTime()); + int count = lymsIllnessService.count(illnessQueryWrapper); + //如果今天有这个患者病例不用添加(这里防止同一天平台添加后。his有该患者病例。重复添加) + if (count != 0) { + return null; + } } } //添加患者信息及病例