jiangjiazhi / regional-platform

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 7 other branches

Showing 2 changed files with 23 additions and 1 deletions

...	...	@@ -1762,7 +1762,19 @@
1762	1762	if (CollectionUtils.isNotEmpty(list)) {
1763	1763	patients = list.get(0);
1764	1764	}
1765		- } else {
	1765	+ } else if(StringUtils.isNotEmpty(queryRequest.getBarCode())){
	1766	+ PatientCheckTicket checkTicket =patientCheckTicketService.getTicket(queryRequest.getBarCode());
	1767	+ if(null!=checkTicket){
	1768	+ Patients patients1 = patientsService.findOnePatientById(checkTicket.getPatientId());
	1769	+ if(null!=patients1){
	1770	+ if(StringUtils.isNotEmpty(patients1.getSource())){
	1771	+ patients= patientsService.findOnePatientById(patients1.getSource());
	1772	+ }else{
	1773	+ patients=patients1;
	1774	+ }
	1775	+ }
	1776	+ }
	1777	+ }else {
1766	1778	patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, groupsFacade.findGroupHospital(userId,false), 1, false, null, og.getbStatus() == 1);
1767	1779	//查询产妇数据
1768	1780	// patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false);

...	...	@@ -23,6 +23,16 @@
23	23
24	24	private String patientId;
25	25
	26	+ private String barCode;
	27	+
	28	+ public String getBarCode() {
	29	+ return barCode;
	30	+ }
	31	+
	32	+ public void setBarCode(String barCode) {
	33	+ this.barCode = barCode;
	34	+ }
	35	+
26	36	public String getPatientId() {
27	37	return patientId;
28	38	}