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 4c898c6..950fbdd 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsHisInfo.java @@ -85,6 +85,12 @@ public class LymsHisInfo implements Serializable { @TableField(value = "doctor") @NotNull(message = "doctor不能为空") private String doctor; + /** + * 医生姓名 + */ + @TableField(value = "hospitalId") + @NotNull(message = "hospitalId不能为空") + private String hospitalId; /** * 上传问诊平台状态。0:未上传 1:已上传 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 5f0a0c8..1bb0a5d 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java @@ -84,6 +84,7 @@ public class GetPatientInfoTask { 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);//时 @@ -156,6 +157,7 @@ public class GetPatientInfoTask { 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);//时 diff --git a/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml index b4dcdf0..e99c856 100644 --- a/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml +++ b/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml @@ -13,6 +13,7 @@ + @@ -23,7 +24,7 @@ id,vcCardNo,name, sex,birthday,phone, - idCard,dept,diagnose, + idCard,dept,hospitalId,diagnose, doctor,up_type,up_time, createdtime