diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java index fb1fb9c..9279c3f 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java @@ -113,6 +113,14 @@ public class LymsHisInfo implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull(message = "createdtime不能为空") private Date createdtime; + + /** + * his系统时间 + */ + @TableField(value = "created") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date created; + /** * 筛选开始时间 */ diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java index 9ca5d12..d1b3c5a 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java @@ -154,17 +154,30 @@ public class GetPatientInfoTask { //添加到数据后续页面处理 LymsHisInfo hisInfoMap = (LymsHisInfo) BeanUtils.mapToObject(map, LymsHisInfo.class);//map转对象 if (null != hisInfoMap) { - //今天添加过不需要重复添加 + //his系统时间同一天添加过不需要重复添加 QueryWrapper qurey = new QueryWrapper(); - qurey.eq("idCard", hisInfoMap.getIdcard()); - qurey.eq("diagnose", hisInfoMap.getDiagnose()); - qurey.eq("hospitalId", hisInfoMap.getHospitalId()); - 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);//秒 - qurey.gt("createdtime", calendar.getTime()); + if(StringUtil.isNotEmpty(hisInfoMap.getIdcard())){ + qurey.eq("idCard", hisInfoMap.getIdcard()); + qurey.eq("diagnose", hisInfoMap.getDiagnose()); + qurey.eq("hospitalId", hisInfoMap.getHospitalId()); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(hisInfoMap.getCreated());//接收到的his系统时间判断 + calendar.set(Calendar.HOUR_OF_DAY, 00);//时 + calendar.set(Calendar.MINUTE, 00);//分 + calendar.set(Calendar.SECOND, 00);//秒 + qurey.gt("created", calendar.getTime()); + }else {//没有身份证用姓名电话判断 + qurey.eq("name", hisInfoMap.getName()); + qurey.eq("phone", hisInfoMap.getPhone()); + qurey.eq("diagnose", hisInfoMap.getDiagnose()); + qurey.eq("hospitalId", hisInfoMap.getHospitalId()); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(hisInfoMap.getCreated());//接收到的his系统时间判断 + calendar.set(Calendar.HOUR_OF_DAY, 00);//时 + calendar.set(Calendar.MINUTE, 00);//分 + calendar.set(Calendar.SECOND, 00);//秒 + qurey.gt("created", calendar.getTime()); + } List list = lymsHisInfoService.list(qurey); if (CollectionUtils.isEmpty(list)) { hisInfoMap.setBirthday(StringUtil.isNotEmpty(hisInfoMap.getBirthday()) ? StringUtil.leftTruncate(hisInfoMap.getBirthday(), ' ') : null); diff --git a/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml index e99c856..b526667 100644 --- a/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml +++ b/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml @@ -18,6 +18,7 @@ + @@ -25,7 +26,7 @@ id,vcCardNo,name, sex,birthday,phone, idCard,dept,hospitalId,diagnose, - doctor,up_type,up_time, + doctor,up_type,up_time,created, createdtime