jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 8 changed files with 52 additions and 5 deletions

...	...	@@ -13,6 +13,7 @@
13	13	import com.lyms.platform.common.utils.StringUtils;
14	14	import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
15	15	import com.lyms.platform.operate.web.facade.MatDeliverFacade;
	16	+import com.lyms.platform.operate.web.facade.PatientServiceFacade;
16	17	import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
17	18	import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
18	19	import com.lyms.platform.permission.model.Users;
19	20
...	...	@@ -56,8 +57,9 @@
56	57	@Autowired
57	58	private BabyBookbuildingFacade babyBookbuildingFacade;
58	59
	60	+ @Autowired
	61	+ private PatientServiceFacade patientServiceFacade;
59	62
60		-
61	63	@Autowired
62	64	private DzfyHisService dzfyHisService;
63	65
...	...	@@ -632,6 +634,9 @@
632	634	request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
633	635	}
634	636	}
	637	+
	638	+ //标准服务开通
	639	+ request.setSerInfos(patientServiceFacade.defaultServiceOpen());
635	640	babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
636	641
637	642	}catch (Exception e)

...	...	@@ -10,6 +10,7 @@
10	10	import com.lyms.platform.common.utils.StringUtils;
11	11	import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
12	12	import com.lyms.platform.operate.web.facade.MatDeliverFacade;
	13	+import com.lyms.platform.operate.web.facade.PatientServiceFacade;
13	14	import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
14	15	import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
15	16	import com.lyms.platform.permission.model.Users;
16	17
...	...	@@ -50,8 +51,9 @@
50	51	private BabyBookbuildingFacade babyBookbuildingFacade;
51	52
52	53	@Autowired
53		- private DzfyHisService dzfyHisService;
	54	+ private PatientServiceFacade patientServiceFacade;
54	55
	56	+
55	57	private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
56	58
57	59	private static Map<String, List> babyMap = new HashMap<>();
...	...	@@ -654,6 +656,11 @@
654	656	request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
655	657	}
656	658	}*/
	659	+
	660	+
	661	+ //标准服务开通
	662	+ request.setSerInfos(patientServiceFacade.defaultServiceOpen());
	663	+
657	664	babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
658	665
659	666	}catch (Exception e)

...	...	@@ -9,6 +9,7 @@
9	9	import com.lyms.platform.common.utils.StringUtils;
10	10	import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
11	11	import com.lyms.platform.operate.web.facade.MatDeliverFacade;
	12	+import com.lyms.platform.operate.web.facade.PatientServiceFacade;
12	13	import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
13	14	import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
14	15	import com.lyms.platform.permission.model.Users;
15	16
...	...	@@ -48,8 +49,9 @@
48	49	@Autowired
49	50	private BabyBookbuildingFacade babyBookbuildingFacade;
50	51
	52	+ @Autowired
	53	+ private PatientServiceFacade patientServiceFacade;
51	54
52		-
53	55	private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
54	56
55	57	private static Map<String, List> babyMap = new HashMap<>();
...	...	@@ -277,6 +279,10 @@
277	279	request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
278	280	}
279	281	}*/
	282	+
	283	+ //标准服务开通
	284	+ request.setSerInfos(patientServiceFacade.defaultServiceOpen());
	285	+
280	286	babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
281	287
282	288	}catch (Exception e)

...	...	@@ -11,6 +11,7 @@
11	11	import com.lyms.platform.common.utils.StringUtils;
12	12	import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
13	13	import com.lyms.platform.operate.web.facade.MatDeliverFacade;
	14	+import com.lyms.platform.operate.web.facade.PatientServiceFacade;
14	15	import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
15	16	import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
16	17	import com.lyms.platform.permission.model.Users;
...	...	@@ -52,6 +53,9 @@
52	53	private BabyBookbuildingFacade babyBookbuildingFacade;
53	54
54	55	@Autowired
	56	+ private PatientServiceFacade patientServiceFacade;
	57	+
	58	+ @Autowired
55	59	private QhdfyHisService qhdfyHisService;
56	60
57	61	private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
...	...	@@ -813,6 +817,9 @@
813	817	request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
814	818	}
815	819	}
	820	+
	821	+ //标准服务开通
	822	+ request.setSerInfos(patientServiceFacade.defaultServiceOpen());
816	823	babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
817	824	deleteFmHistoryRecord(item.getSyxh());
818	825	}catch (Exception e)

...	...	@@ -14,6 +14,7 @@
14	14	import com.lyms.platform.common.utils.StringUtils;
15	15	import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
16	16	import com.lyms.platform.operate.web.facade.MatDeliverFacade;
	17	+import com.lyms.platform.operate.web.facade.PatientServiceFacade;
17	18	import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
18	19	import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
19	20	import com.lyms.platform.permission.model.Users;
20	21
...	...	@@ -52,9 +53,10 @@
52	53
53	54	@Autowired
54	55	private BabyBookbuildingFacade babyBookbuildingFacade;
	56	+ @Autowired
	57	+ private PatientServiceFacade patientServiceFacade;
55	58
56	59
57		-
58	60	private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
59	61
60	62	private static Map<String, List> babyMap = new HashMap<>();
...	...	@@ -619,6 +621,9 @@
619	621	request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
620	622	}
621	623	}*/
	624	+
	625	+ //标准服务开通
	626	+ request.setSerInfos(patientServiceFacade.defaultServiceOpen());
622	627	babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
623	628
624	629	}catch (Exception e)

...	...	@@ -312,9 +312,10 @@
312	312
313	313
314	314	/**
	315	+ * hospitalDepartmentTest
315	316	* 获取科室
316	317	*/
317		- @RequestMapping(value = "/hospitalDepartmentTest", method = RequestMethod.GET)
	318	+ @RequestMapping(value = "/deptTest", method = RequestMethod.GET)
318	319	@ResponseBody
319	320	public List getDepartment() {
320	321	List<Object> list = new ArrayList<>();

...	...	@@ -778,6 +778,21 @@
778	778	return baseResponse;
779	779	}
780	780
	781	+ /**
	782	+ * 默认服务开通
	783	+ * @return
	784	+ */
	785	+ public List<Map<String, String>> defaultServiceOpen()
	786	+ {
	787	+ //标准服务开通
	788	+ List<Map<String, String>> serInfos = new ArrayList<>();
	789	+ Map<String, String> serMap = new HashMap<>();
	790	+ serMap.put("serType", String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId()));
	791	+ serInfos.add(serMap);
	792	+ return serInfos;
	793	+ }
	794	+
	795	+
781	796
782	797	/**
783	798	* 同步医院医生服务价格配置

...	...	@@ -61,6 +61,7 @@
61	61	// urls.put("area-weixian-api.healthbaby.com.cn:12356","威县");
62	62	urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
63	63	urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼");
	64	+ urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院");
64	65	}
65	66
66	67	@Autowired