jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 66 additions and 1 deletions

...	...	@@ -252,7 +252,12 @@
252	252	model.setHospitalId(hospitalId);
253	253	//通过就诊卡号和医院id查询到医院下面的lis记录
254	254	lises = queryLisData(vcCardNo, "", "",perType, model);
255		- } else {
	255	+ }
	256	+ else if (perType == 3)
	257	+ {
	258	+ lises = queryLisWhfyData(vcCardNo, cardNo,model);
	259	+ }
	260	+ else {
256	261	PatientsQuery patientsQuery = new PatientsQuery();
257	262	String[] strs = new String[]{phone, vcCardNo, cardNo};
258	263	patientsQuery.setPv(strs);
...	...	@@ -451,6 +456,36 @@
451	456	return reportModelList;
452	457
453	458	}
	459	+
	460	+
	461	+ private List<LisReportModel> queryLisWhfyData(String vcCardNo, String cardNo,LisReportQuery model) {
	462	+ List<LisReportModel> reportModelList = new ArrayList<>();
	463	+ //通过就诊卡号和医院id查询到医院下面的lis记录
	464	+ if (StringUtils.isNotEmpty(vcCardNo) \|\| StringUtils.isNotEmpty(cardNo)) {
	465	+ if (StringUtils.isNotEmpty(cardNo))
	466	+ {
	467	+ model.setVcCardNo(cardNo);
	468	+ }
	469	+ List<LisReportModel> lises = lisService.queryLisDataByModel(model);
	470	+ if (CollectionUtils.isNotEmpty(lises)) {
	471	+ reportModelList.addAll(lises);
	472	+ }
	473	+ else
	474	+ {
	475	+ if (StringUtils.isNotEmpty(vcCardNo))
	476	+ {
	477	+ model.setVcCardNo(vcCardNo);
	478	+ }
	479	+ lises = lisService.queryLisDataByModel(model);
	480	+ if (CollectionUtils.isNotEmpty(lises)) {
	481	+ reportModelList.addAll(lises);
	482	+ }
	483	+ }
	484	+ }
	485	+ return reportModelList;
	486	+
	487	+ }
	488	+
454	489
455	490	/**
456	491	* 诸城就诊卡号处理

...	...	@@ -496,6 +496,9 @@
496	496	}
497	497	temp.setBookBuildDate(DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay()));
498	498	temp.setId(archiveModel.getId());
	499	+ temp.setVcCardNo(archiveModel.getVcCardNo());
	500	+ temp.setCardNo(archiveModel.getCertificateNum());
	501	+ temp.setPhone(archiveModel.getPhone());
499	502	historyResults.add(temp);
500	503	}
501	504	}

...	...	@@ -16,6 +16,33 @@
16	16	private String bookBuildHospital;
17	17	//医院ID
18	18	private String hospitalId;
	19	+ private String phone;
	20	+ private String vcCardNo;
	21	+ private String cardNo;
	22	+
	23	+ public String getPhone() {
	24	+ return phone;
	25	+ }
	26	+
	27	+ public void setPhone(String phone) {
	28	+ this.phone = phone;
	29	+ }
	30	+
	31	+ public String getVcCardNo() {
	32	+ return vcCardNo;
	33	+ }
	34	+
	35	+ public void setVcCardNo(String vcCardNo) {
	36	+ this.vcCardNo = vcCardNo;
	37	+ }
	38	+
	39	+ public String getCardNo() {
	40	+ return cardNo;
	41	+ }
	42	+
	43	+ public void setCardNo(String cardNo) {
	44	+ this.cardNo = cardNo;
	45	+ }
19	46
20	47	public String getId() {
21	48	return id;