changpengfei / talkonline

Authored by shiyang over 3 years ago

Exists in master

Showing 2 changed files with 17 additions and 2 deletions

...	...	@@ -107,6 +107,12 @@
107	107	if(StringUtils.isEmpty(patientInfo.getPname())){
108	108	patientInfo.setPname(null);
109	109	}
	110	+ if(StringUtil.isNotEmpty(patientInfo.getSynthesisQuery())){
	111	+ queryWrapper.and(wrapper -> wrapper .like("pname", patientInfo.getSynthesisQuery())
	112	+ .or().eq("mobile", patientInfo.getSynthesisQuery())
	113	+ .or().eq("enrolmentPhone", patientInfo.getSynthesisQuery())
	114	+ .or().eq("idno", patientInfo.getSynthesisQuery()));
	115	+ }
110	116	Page<PatientInfo> patientPagePage = patientInfoService.page(page, queryWrapper);
111	117	List<PatientInfo> pLst = patientInfoService.list(queryWrapper);
112	118	int daiCnt = pLst.parallelStream().mapToInt(PatientInfo::getCcnt).sum();//待使用数量

...	...	@@ -74,10 +74,15 @@
74	74	private Integer cid;
75	75
76	76	/**
77		- * 手机号
	77	+ * 病例手机号
78	78	*/
79	79	@TableField(value = "mobile")
80	80	private String mobile;
	81	+ /**
	82	+ * 注册手机号
	83	+ */
	84	+ @TableField(value = "enrolmentPhone")
	85	+ private String enrolmentPhone;
81	86
82	87	/**
83	88	* 填写医院id
...	...	@@ -142,7 +147,11 @@
142	147	*/
143	148	@TableField(value = "gzopenid")
144	149	private String gzopenid;
145		-
	150	+ /**
	151	+ * 综合查询（姓名/电话/身份证）
	152	+ */
	153	+ @TableField(exist = false)
	154	+ private String synthesisQuery;
146	155
147	156
148	157	@TableField(exist = false)