jiangjiazhi / regional-platform

Commit b98ebb66ef65926838914fdde5873e9d47d19c8d

Authored by gengxiaokai over 8 years ago

Exists in master and in 6 other branches

四川南充医院Lis接口更新

Showing 3 changed files with 23 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java

...	...	@@ -231,8 +231,8 @@
231	231
232	232
233	233
234		- public List<CheckResponse> queryLisCheckList(String cardNo){
235		- SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd ");
	234	+ public static List<CheckResponse> queryLisCheckList(String cardNo){
	235	+ SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd");
236	236	List<CheckResponse> result = new ArrayList<>();
237	237	Calendar c = Calendar.getInstance();
238	238	SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
...	...	@@ -260,7 +260,8 @@
260	260	CheckResponse CheckResponse=new CheckResponse();
261	261	CheckResponse.setHospitalName("四川省南充市中心医院");
262	262	CheckResponse.setName(nczxyyxq2.getData().get姓名());
263		- CheckResponse.setModified(formatter.parse(nczxyyxq2.getData().get报告时间()));
	263	+ String s=nczxyyxq2.getData().get报告时间().substring(0,10);
	264	+ CheckResponse.setModified(formatter.parse(s));
264	265	CheckResponse.setType(1);
265	266	CheckResponse.setTitle(nczxyyxq2.getData().get申请项目());
266	267	CheckResponse.setAge(nczxyyxq2.getData().get年龄());

...	...	@@ -9,6 +9,7 @@
9	9	import com.lyms.platform.common.utils.DateUtil;
10	10	import com.lyms.platform.common.utils.ExceptionUtils;
11	11	import com.lyms.platform.common.utils.JsonUtil;
	12	+import com.lyms.platform.common.utils.PropertiesUtils;
12	13	import com.lyms.platform.operate.web.facade.LisFacade;
13	14	import com.lyms.platform.operate.web.request.LisReportModelRequest;
14	15	import com.lyms.platform.permission.model.LisReportItemModel;
...	...	@@ -34,6 +35,8 @@
34	35	private LisService lisService;
35	36	@Autowired
36	37	private LisFacade lisFacade;
	38	+
	39	+ public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
37	40
38	41	/**
39	42	* 保存各个医院上传上来的lis数据，该数据保存在mysql数据库

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.lyms.hospitalapi.Nczxyy.NczxyyLisService;
3	4	import com.lyms.hospitalapi.pojo.CheckByDate;
4	5	import com.lyms.hospitalapi.pojo.CheckItemResponse;
5	6	import com.lyms.hospitalapi.pojo.CheckResponse;
...	...	@@ -56,6 +57,8 @@
56	57	@Qualifier("commonThreadPool")
57	58	private ThreadPoolTaskExecutor commonThreadPool;
58	59
	60	+ public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
	61	+
59	62	/**
60	63	* 获取lis和ris检验报告
61	64	* @param vcCardNo 就诊卡号
...	...	@@ -67,7 +70,12 @@
67	70	if(1 == sortType){
68	71	List<CheckResponse> result = new ArrayList<>();
69	72	//获取lis数据
70		- result.addAll(queryLisCheckList(vcCardNo,phone,userId));
	73	+ if("7".equals(HIS_VERSION)){
	74	+ //根据调用接口获取四川南充中心医院的Lis数据
	75	+ result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo));
	76	+ }else{
	77	+ result.addAll(queryLisCheckList(vcCardNo,phone,userId));
	78	+ }
71	79	//result.addAll(queryPacsCheckList(cardNo));
72	80	List<String> keyList = new ArrayList<>();
73	81	// 去重
...	...	@@ -150,7 +158,13 @@
150	158	}
151	159	}else{
152	160	List<CheckResponse> result = new ArrayList<CheckResponse>();
153		- result.addAll(queryLisCheckList(vcCardNo,phone,userId));
	161	+ if("7".equals(HIS_VERSION)){
	162	+ //根据调用接口获取四川南充中心医院的Lis数据
	163	+ result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo));
	164	+ }else{
	165	+ result.addAll(queryLisCheckList(vcCardNo,phone,userId));
	166	+ }
	167	+
154	168	//result.addAll(queryPacsCheckList(cardNo));
155	169	List<String> keyList = new ArrayList<>();
156	170	List<String> listtype=new ArrayList<>();