shiyang / regional-platform

Authored by landong2015 over 8 years ago

Showing 3 changed files with 9 additions and 9 deletions

...	...	@@ -69,7 +69,7 @@
69	69	param.setId(id);
70	70	}else {
71	71	param.setVcCardNo(vcCardNo);
72		- param.setCertificateNum(certificateNum);
	72	+ param.setVcCardNo(certificateNum);
73	73	}
74	74	return premaritalCheckupFacade.getPremaritalCheckup(param);
75	75	}

...	...	@@ -73,10 +73,10 @@
73	73	ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
74	74
75	75	//当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息
76		- if (StringUtils.isNotEmpty(requestParam.getCertificateNum())) {
	76	+ if (StringUtils.isNotEmpty(requestParam.getCardNo())) {
77	77	archiveQuery.setYn(YnEnums.YES.getId());
78	78	archiveQuery.setHospitalId(requestParam.getHospitalId());
79		- archiveQuery.setCertificateNum(requestParam.getCertificateNum());
	79	+ archiveQuery.setCertificateNum(requestParam.getCardNo());
80	80	List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
81	81	if (CollectionUtils.isNotEmpty(modelList)) {
82	82	archiveModel = modelList.get(0);
...	...	@@ -182,7 +182,7 @@
182	182	query.setLimit(request.getLimit());
183	183	query.setNeed("y");
184	184	query.setYn(YnEnums.YES.getId());
185		- query.setCertificateNum(request.getCertificateNum());
	185	+ query.setCertificateNum(request.getCardNo());
186	186	query.setYiXueYiJian(request.getYiXueYiJian());
187	187	query.setPremaritalUpTimeStart(request.getPremaritalUpTimeStart());
188	188	query.setPremaritalUpTimeEnd(request.getPremaritalUpTimeEnd());

...	...	@@ -11,7 +11,7 @@
11	11
12	12	private String id;
13	13	//证件号
14		- private String certificateNum;
	14	+ private String cardNo;
15	15	//就诊卡
16	16	private String vcCardNo;
17	17	//妇女姓名
18	18
...	...	@@ -43,12 +43,12 @@
43	43	this.id = id;
44	44	}
45	45
46		- public String getCertificateNum() {
47		- return certificateNum;
	46	+ public String getCardNo() {
	47	+ return cardNo;
48	48	}
49	49
50		- public void setCertificateNum(String certificateNum) {
51		- this.certificateNum = certificateNum;
	50	+ public void setCardNo(String cardNo) {
	51	+ this.cardNo = cardNo;
52	52	}
53	53
54	54	public String getVcCardNo() {