jiangjiazhi / regional-platform

Commit 3be2c2e46636443c9270c42032b7afc2c0dc5020

Authored by liquanyu about 2 years ago

Exists in master and in 3 other branches

建档与优惠券分开功能:添加机构类型orgType字段

Showing 2 changed files with 22 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java

...	...	@@ -1545,13 +1545,11 @@
1545	1545	patientsQuery.setExtEnable(false);
1546	1546
1547	1547	String hospitalId = autoMatchFacade.getHospitalId(userId);
1548		-
	1548	+ //只查询当前医院所在市的所有建档记录
	1549	+ Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
1549	1550	//如果身份证号码不为空就以身份证号码查询
1550	1551	if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) {
1551	1552	patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo());
1552		-
1553		- //只查询当前医院所在市的所有建档记录
1554		- Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
1555	1553	List<String> hids = new ArrayList<>();
1556	1554	if (org != null) {
1557	1555	OrganizationQuery query = new OrganizationQuery();
...	...	@@ -1681,10 +1679,10 @@
1681	1679	if (pat != null) {
1682	1680	BookbuildingRecordResult result = new BookbuildingRecordResult();
1683	1681	if (StringUtils.isNotEmpty(pat.getHospitalId())) {
1684		- Organization org = organizationService.getOrganization(Integer.valueOf(pat.getHospitalId()));
1685		- if (org != null) {
1686		- result.setBookbuildHospital(org.getName());
1687		- result.setHospitalId(String.valueOf(org.getId()));
	1682	+ Organization orgObj = organizationService.getOrganization(Integer.valueOf(pat.getHospitalId()));
	1683	+ if (orgObj != null) {
	1684	+ result.setBookbuildHospital(orgObj.getName());
	1685	+ result.setHospitalId(String.valueOf(orgObj.getId()));
1688	1686	}
1689	1687	}
1690	1688
...	...	@@ -1696,6 +1694,7 @@
1696	1694	}
1697	1695	}
1698	1696
	1697	+
1699	1698	result.setCouponCommunity(comm);
1700	1699	result.setFmTime(DateUtil.getyyyy_MM_dd(pat.getFmDate()));
1701	1700	result.setBookbuildDate(DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));
...	...	@@ -1773,6 +1772,7 @@
1773	1772	// 是否在本医院所在区域建档
1774	1773	mapData.put("rBType", count > 0);
1775	1774	mapData.put("pid", pid);
	1775	+ mapData.put("orgType", org.getType());
1776	1776	mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date()));
1777	1777	list.add(mapData);
1778	1778

...	...	@@ -37,6 +37,20 @@
37	37	//领劵社区
38	38	private String couponCommunity;
39	39
	40	+ /**
	41	+ * 机构类型
	42	+ * 1:卫生与计划生育委员会,2:妇幼保健院/站,3:妇产(科)医院,4:综合医院,5:计生站,6:卫生院,7:卫生所,8:其他
	43	+ */
	44	+ private Integer orgType;
	45	+
	46	+ public Integer getOrgType() {
	47	+ return orgType;
	48	+ }
	49	+
	50	+ public void setOrgType(Integer orgType) {
	51	+ this.orgType = orgType;
	52	+ }
	53	+
40	54	public String getCouponCommunity() {
41	55	return couponCommunity;
42	56	}