jiangjiazhi / regional-platform

Authored by liquanyu almost 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 68 additions and 2 deletions

...	...	@@ -359,6 +359,59 @@
359	359	}
360	360	return list;
361	361	}
	362	+
	363	+
	364	+
	365	+ /**
	366	+ * 用于承德和衡水
	367	+ * 访视状态
	368	+ */
	369	+ public enum StatusEnum1 {
	370	+ DFS(1, "待访视"), YFS(2, "本机构已访视"), BXQ(3, "本辖区已访视");
	371	+ private int id;
	372	+ private String name;
	373	+
	374	+ StatusEnum1(int id, String name) {
	375	+ this.id = id;
	376	+ this.name = name;
	377	+ }
	378	+
	379	+ public int getId() {
	380	+ return id;
	381	+ }
	382	+
	383	+ public void setId(int id) {
	384	+ this.id = id;
	385	+ }
	386	+
	387	+ public String getName() {
	388	+ return name;
	389	+ }
	390	+
	391	+ public void setName(String name) {
	392	+ this.name = name;
	393	+ }
	394	+
	395	+ public static String getTitle(Integer id) {
	396	+ for (StatusEnum1 e:values()) {
	397	+ if (e.getId() == id) {
	398	+ return e.getName();
	399	+ }
	400	+ }
	401	+ return "";
	402	+ }
	403	+ }
	404	+ public static List getStatusEnums1() {
	405	+ List<Object> list = new ArrayList<>();
	406	+ for (StatusEnum1 enums : StatusEnum1.values()) {
	407	+ Map<String, Object> resultMap = new HashMap<>();
	408	+ resultMap.put("id", enums.getId());
	409	+ resultMap.put("name", enums.getName());
	410	+ list.add(resultMap);
	411	+ }
	412	+ return list;
	413	+ }
	414	+
362	415	/**
363	416	* 访视是否结案
364	417	*/

...	...	@@ -1956,6 +1956,15 @@
1956	1956	matDeliverQuery.setProvincePostRestId(matdeliverFollowRequest.getProvincePostRestId());
1957	1957	matDeliverQuery.setCityPostRestId(matdeliverFollowRequest.getCityPostRestId());
1958	1958	matDeliverQuery.setAreaPostRestId(matdeliverFollowRequest.getAreaPostRestId());
	1959	+
	1960	+ if (matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 2)
	1961	+ {
	1962	+ matDeliverQuery.setFsHospitalId(hospitalId);
	1963	+ }
	1964	+ else if(matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 1)
	1965	+ {
	1966	+ matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus());
	1967	+ }
1959	1968	}
1960	1969	else
1961	1970	{
...	...	@@ -1966,6 +1975,8 @@
1966	1975	matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId());
1967	1976	}
1968	1977	}
	1978	+
	1979	+ matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus());
1969	1980	}
1970	1981
1971	1982	matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult());
...	...	@@ -1976,7 +1987,7 @@
1976	1987
1977	1988
1978	1989	matDeliverQuery.setVisitAffirm(matdeliverFollowRequest.getVisitAffirm());
1979		- matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus());
	1990	+
1980	1991	matDeliverQuery.setMakeType(matdeliverFollowRequest.getMakeType());
1981	1992	List<MaternalDeliverModel> maternalDeliverModelList;
1982	1993

...	...	@@ -97,6 +97,8 @@
97	97	map.put("visitResult", PostpartumFollowMakeEnums.getResultEnum());
98	98	//访视状态（1-待访视、2-已访视）
99	99	map.put("visitStatus", PostpartumFollowMakeEnums.getStatusEnum());
	100	+ //承德衡水访视状态
	101	+ map.put("visitStatus1", PostpartumFollowMakeEnums.getStatusEnum());
100	102	//访视类型
101	103	map.put("followType", PostpartumFollowMakeEnums.getTypeEnum());
102	104	//异常

...	...	@@ -54,7 +54,7 @@
54	54	urls.put("area-dz-api.healthbaby.com.cn:12356","德州");
55	55	urls.put("area-qhd-api.healthbaby.com.cn:18019","秦皇岛");
56	56	// urls.put("area-nc-api.healthbaby.com.cn:12356","南充");
57		- urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵");
	57	+ //urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵");
58	58	urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院");
59	59	// urls.put("area-hengshui-api.healthbaby.com.cn:8787","衡水区域");
60	60	urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成");