jiangjiazhi / regional-platform

Commit 7ed5e249ff2f0010f13687966faa4092ac4b31cd

Authored by dongqin over 6 years ago

Exists in master and in 6 other branches

同步历史数据

Showing 3 changed files with 66 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.alibaba.fastjson.JSONObject;
3	4	import com.lyms.hospitalapi.lcdcf.LcdcfFmService;
4	5	import com.lyms.hospitalapi.lcdcf.LcdcfHisModel;
5	6	import com.lyms.hospitalapi.lcdcf.LcdcfHisService;
...	...	@@ -2072,6 +2073,41 @@
2072	2073	String streetPostRest = getAddressNameById(streetPostRestId);
2073	2074	matdeliverFollowListResult.setPostpartumAddress(provincePostRest + cityPostRest + areaPostRest + streetPostRest + addressPostRest);
2074	2075	}
	2076	+
	2077	+ // 添加高危等级、失败原因
	2078	+ String riskLevelId = patient.getRiskLevelId();
	2079	+ List<Map<String, Object>> objects = new ArrayList<>();
	2080	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskLevelId)) {
	2081	+ List<String> ids = JsonUtil.toList(riskLevelId, String.class);
	2082	+ for (String id : ids) {
	2083	+ String s = HosptialHighRiskFacade.colorMap.get(id);
	2084	+ HashMap<String, Object> map = new HashMap<>();
	2085	+ map.put("color", s);
	2086	+ map.put("id", id);
	2087	+ objects.add(map);
	2088	+ }
	2089	+ }
	2090	+ matdeliverFollowListResult.setHighRiskLevels(objects);
	2091	+
	2092	+ List<MatdeliverFollowModel> followModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(patient.getPid())), MatdeliverFollowModel.class);
	2093	+ // 1-无人接听电话、2-拒绝访视、3-其他
	2094	+ String contactReasonStr = "";
	2095	+ if (CollectionUtils.isNotEmpty(followModels)) {
	2096	+ MatdeliverFollowModel model = followModels.get(followModels.size() - 1);
	2097	+ Integer contactReason = model.getContactReason();
	2098	+ if (contactReason != null) {
	2099	+ if (contactReason == 1) {
	2100	+ contactReasonStr = "无人接听电话";
	2101	+ }
	2102	+ if (contactReason == 2) {
	2103	+ contactReasonStr = "拒绝访视";
	2104	+ }
	2105	+ if (contactReason == 3) {
	2106	+ contactReasonStr = "其他";
	2107	+ }
	2108	+ }
	2109	+ }
	2110	+ matdeliverFollowListResult.setCauseFailure(contactReasonStr);
2075	2111	}
2076	2112
2077	2113	matdeliverFollowListResult.setTaoCheng(isTaocheng);
...	...	@@ -2082,6 +2118,7 @@
2082	2118	listResponse.setObject(matdeliverFollowListResults);
2083	2119	return listResponse;
2084	2120	}
	2121	+
2085	2122
2086	2123	/**
2087	2124	* 获取name 根据id

...	...	@@ -200,7 +200,9 @@
200	200	List<Map> towns = new ArrayList<>();
201	201
202	202	//所有数据由原来的baseConfing ==> Organization
203		- List<String> hospPermissions = areaCountFacade.getCurrentUserHospPermissions(id, null, null, null);
	203	+ //List<String> hospPermissions = areaCountFacade.getCurrentUserHospPermissions(id, null, null, null);
	204	+ List<String> hospPermissions = new ArrayList<>();
	205	+ hospPermissions.add(id.toString());
204	206	if (CollectionUtils.isNotEmpty(hospPermissions)) {
205	207	List<Organization> organizations = organizationService.getOrganizationByHosps(hospPermissions);
206	208	if (CollectionUtils.isNotEmpty(organizations)) {

...	...	@@ -145,6 +145,32 @@
145	145	*/
146	146	private String postpartumAddress;
147	147
	148	+ /**
	149	+ * 高危等级
	150	+ */
	151	+ private List<Map<String, Object>> highRiskLevels;
	152	+
	153	+ /**
	154	+ * 失败原因
	155	+ */
	156	+ private String causeFailure;
	157	+
	158	+ public List<Map<String, Object>> getHighRiskLevels() {
	159	+ return highRiskLevels;
	160	+ }
	161	+
	162	+ public void setHighRiskLevels(List<Map<String, Object>> highRiskLevels) {
	163	+ this.highRiskLevels = highRiskLevels;
	164	+ }
	165	+
	166	+ public String getCauseFailure() {
	167	+ return causeFailure;
	168	+ }
	169	+
	170	+ public void setCauseFailure(String causeFailure) {
	171	+ this.causeFailure = causeFailure;
	172	+ }
	173	+
148	174	public boolean isTaoCheng() {
149	175	return isTaoCheng;
150	176	}