jiangjiazhi / regional-platform

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 18 additions and 4 deletions

...	...	@@ -120,11 +120,12 @@
120	120	.orOperator(Criteria.where("username").is(param.getQueryNo()))));
121	121	}
122	122
	123	+
123	124	if(param.getQueryType() == 1)
124	125	{
125	126	query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
126	127	}
127		- else if (param.getQueryType() == 1)
	128	+ else if (param.getQueryType() == 2)
128	129	{
129	130	query.addCriteria(Criteria.where("sendHospitalId").is(hospitalId));
130	131	if (StringUtils.isNotEmpty(param.getHospitalId()))
...	...	@@ -135,8 +136,12 @@
135	136	String pid = param.getPid();
136	137	if (StringUtils.isNotEmpty(pid)) {
137	138	query.addCriteria(Criteria.where("pid").is(pid));
138		- } String patientId = param.getPatientId();
139		-
	139	+ }
	140	+ String id = param.getId();
	141	+ if (StringUtils.isNotEmpty(id)) {
	142	+ query.addCriteria(Criteria.where("id").is(id));
	143	+ }
	144	+ String patientId = param.getPatientId();
140	145	if (StringUtils.isNotEmpty(patientId)) {
141	146	query.addCriteria(Criteria.where("patientId").is(patientId));
142	147	}

...	...	@@ -4,7 +4,8 @@
4	4
5	5
6	6	public class SmnQueryRequest extends BaseQuery {
7		- private Integer queryType; //1 本机构查询 2 妇幼查询 3 检验机构查询
	7	+ private String id;
	8	+ private Integer queryType = 3; //1 本机构查询 2 妇幼查询 3 检验机构查询
8	9	private String patientId;
9	10	private String pid;
10	11	private String queryNo;//查询号身份证号码，手机号码，姓名
...	...	@@ -22,6 +23,14 @@
22	23	private Integer result; //1 阴性 2 阳性
23	24
24	25	private String checkDate;//检查日期
	26	+
	27	+ public String getId() {
	28	+ return id;
	29	+ }
	30	+
	31	+ public void setId(String id) {
	32	+ this.id = id;
	33	+ }
25	34
26	35	public String getPatientId() {
27	36	return patientId;