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 121961f..0f67df9 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java @@ -107,6 +107,12 @@ public class PatientController { if(StringUtils.isEmpty(patientInfo.getPname())){ patientInfo.setPname(null); } + if(StringUtil.isNotEmpty(patientInfo.getSynthesisQuery())){ + queryWrapper.and(wrapper -> wrapper .like("pname", patientInfo.getSynthesisQuery()) + .or().eq("mobile", patientInfo.getSynthesisQuery()) + .or().eq("enrolmentPhone", patientInfo.getSynthesisQuery()) + .or().eq("idno", patientInfo.getSynthesisQuery())); + } Page patientPagePage = patientInfoService.page(page, queryWrapper); List pLst = patientInfoService.list(queryWrapper); int daiCnt = pLst.parallelStream().mapToInt(PatientInfo::getCcnt).sum();//待使用数量 diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/PatientInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/PatientInfo.java index 2bad298..ef1b899 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/PatientInfo.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/PatientInfo.java @@ -74,10 +74,15 @@ public class PatientInfo implements Serializable { private Integer cid; /** - * 手机号 + * 病例手机号 */ @TableField(value = "mobile") private String mobile; + /** + * 注册手机号 + */ + @TableField(value = "enrolmentPhone") + private String enrolmentPhone; /** * 填写医院id @@ -142,7 +147,11 @@ public class PatientInfo implements Serializable { */ @TableField(value = "gzopenid") private String gzopenid; - + /** + * 综合查询(姓名/电话/身份证) + */ + @TableField(exist = false) + private String synthesisQuery; @TableField(exist = false)