jiangjiazhi / regional-platform

Authored by Administrator almost 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 16 additions and 0 deletions

...	...	@@ -1438,6 +1438,7 @@
1438	1438	patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
1439	1439	patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
1440	1440	patientManagerQueryModel.setId(patients.getId());
	1441	+ patientManagerQueryModel.setLowerHairOgrId(StringUtils.isNotEmpty(patients.getLowerHairOgrId()) ? organizationService.getOrganizationName(patients.getLowerHairOgrId()) : "");
1441	1442	if (patients.getSendCareMan() != null) {
1442	1443	if ("0".equals(patients.getSendCareMan())) {
1443	1444	patientManagerQueryModel.setSendCareMan("未发放");
...	...	@@ -1447,6 +1448,7 @@
1447	1448	patientManagerQueryModel.setSendCareMan("补发");
1448	1449	}
1449	1450	}
	1451	+
1450	1452	patientManagerQueryModelList.add(patientManagerQueryModel);
1451	1453	}
1452	1454	}

...	...	@@ -49,6 +49,11 @@
49	49	private String sendCareMan;
50	50
51	51	/**
	52	+ * 母子保健手册下发机构id
	53	+ */
	54	+ private String lowerHairOgrId;
	55	+
	56	+ /**
52	57	* @auther HuJiaqi
53	58	* @createTime 2016年12月20日 14时42分
54	59	* @discription 居住地
...	...	@@ -81,6 +86,15 @@
81	86	private String cardNo;
82	87
83	88	private String id;
	89	+
	90	+
	91	+ public String getLowerHairOgrId() {
	92	+ return lowerHairOgrId;
	93	+ }
	94	+
	95	+ public void setLowerHairOgrId(String lowerHairOgrId) {
	96	+ this.lowerHairOgrId = lowerHairOgrId;
	97	+ }
84	98
85	99	public String getSendCareMan() {
86	100	return sendCareMan;