jiangjiazhi / regional-platform

Commit 3aa0efa0c53d320ae319b0b79bd9ed6f44154486

Authored by liquanyu almost 9 years ago

Exists in master and in 6 other branches

update

Showing 9 changed files with 164 additions and 11 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.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
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java

...	...	@@ -18,5 +18,6 @@
18	18
19	19	List<LisReportItemModel> queryLisItemByModel(LisReportItemModel query);
20	20
	21	+ List<LisReportModel> queryListItems(LisReportModel query);
21	22	}

...	...	@@ -51,6 +51,18 @@
51	51	//检验项集合
52	52	private List<LisReportItemModel> items;
53	53
	54	+
	55	+ //检验明细json
	56	+ private String itemJson;
	57	+
	58	+ public String getItemJson() {
	59	+ return itemJson;
	60	+ }
	61	+
	62	+ public void setItemJson(String itemJson) {
	63	+ this.itemJson = itemJson;
	64	+ }
	65	+
54	66	public String getPhone() {
55	67	return phone;
56	68	}

...	...	@@ -14,5 +14,7 @@
14	14	List<LisReportModel> queryLisDataByModel(LisReportModel model);
15	15
16	16	List<LisReportItemModel> queryLisItemByModel(LisReportItemModel query);
	17	+
	18	+ List<LisReportModel> queryListItems(LisReportModel model);
17	19	}

...	...	@@ -40,11 +40,11 @@
40	40	if (CollectionUtils.isEmpty(dbLis))
41	41	{
42	42	masterLisMapper.saveLisData(model);
43		- List<LisReportItemModel> items = model.getItems();
44		- if (CollectionUtils.isNotEmpty(items))
45		- {
46		- masterLisMapper.saveLisItemsData(items);
47		- }
	43	+// List<LisReportItemModel> items = model.getItems();
	44	+// if (CollectionUtils.isNotEmpty(items))
	45	+// {
	46	+// masterLisMapper.saveLisItemsData(items);
	47	+// }
48	48	}
49	49
50	50	}
...	...	@@ -70,6 +70,11 @@
70	70	public List<LisReportItemModel> queryLisItemByModel(LisReportItemModel query) {
71	71
72	72	return masterLisMapper.queryLisItemByModel(query);
	73	+ }
	74	+
	75	+ @Override
	76	+ public List<LisReportModel> queryListItems(LisReportModel query) {
	77	+ return masterLisMapper.queryListItems(query);
73	78	}
74	79	}

...	...	@@ -21,7 +21,8 @@
21	21	MODIFIED,
22	22	CREATED,
23	23	HOSPITAL_ID,
24		- PHONE
	24	+ PHONE,
	25	+ ITEM_JSON
25	26	) VALUES (
26	27	#{lisId},
27	28	#{title},
...	...	@@ -40,7 +41,8 @@
40	41	#{modified},
41	42	#{created},
42	43	#{hospitalId},
43		- #{phone}
	44	+ #{phone},
	45	+ #{itemJson}
44	46	)
45	47
46	48	</insert>
...	...	@@ -138,5 +140,80 @@
138	140	AND HOSPITAL_ID = #{hospitalId}
139	141	</if>
140	142	</select>
	143	+
	144	+
	145	+ <select id="queryListItems" parameterType="com.lyms.platform.permission.model.LisReportModel" resultMap="queryListItemsMap">
	146	+ SELECT
	147	+ LR.LIS_ID,
	148	+ LR.TITLE,
	149	+ LR.TYPE,
	150	+ LR.VCCARDNO,
	151	+ LR.NAME,
	152	+ LR.BHNUM,
	153	+ LR.AGE,
	154	+ LR.SEX,
	155	+ LR.APPLY_TIME,
	156	+ LR.CHECK_TIME,
	157	+ LR.PUBLISH_TIME,
	158	+ LR.APPLY_DOCTOR,
	159	+ LR.APPLY_DEPT,
	160	+ LR.CHECKER,
	161	+ LR.MODIFIED,
	162	+ LR.CREATED,
	163	+ LR.HOSPITAL_ID,
	164	+ LR.PHONE,
	165	+ LI.LIS_ID AS ITEM_LIS_ID,
	166	+ LI.CODE,
	167	+ LI.NAME AS ITEM_NAME,
	168	+ LI.RESULT,
	169	+ LI.RESULT_FLAG,
	170	+ LI.REF,
	171	+ LI.RESULT_TYPE,
	172	+ LI.UNIT,
	173	+ LI.PRINT_ORDER
	174	+ FROM LIS_REPORT_ITEM_TBL LI
	175	+ LEFT JOIN LIS_REPORT_TBL LR
	176	+ ON LR.LIS_ID = LI.LIS_ID
	177	+ WHERE
	178	+ LR.VCCARDNO=#{vcCardNo}
	179	+ AND
	180	+ LR.HOSPITAL_ID=#{hospitalId}
	181	+ AND
	182	+ LI.HOSPITAL_ID=#{hospitalId}
	183	+ </select>
	184	+
	185	+
	186	+ <resultMap id="queryListItemsMap" type="com.lyms.platform.permission.model.LisReportModel" >
	187	+ <id property="lisId" column="LIS_ID"/>
	188	+ <result property="title" column="TITLE"/>
	189	+ <result property="type" column="TYPE"/>
	190	+ <result property="vcCardNo" column="VCCARDNO"/>
	191	+ <result property="name" column="NAME"/>
	192	+ <result property="bhnum" column="BHNUM"/>
	193	+ <result property="age" column="AGE"/>
	194	+ <result property="sex" column="SEX"/>
	195	+ <result property="applyTime" column="APPLY_TIME"/>
	196	+ <result property="checkTime" column="CHECK_TIME"/>
	197	+ <result property="publishTime" column="PUBLISH_TIME"/>
	198	+ <result property="applyDoctor" column="APPLY_DOCTOR"/>
	199	+ <result property="applyDept" column="APPLY_DEPT"/>
	200	+ <result property="checker" column="CHECKER"/>
	201	+ <result property="modified" column="MODIFIED"/>
	202	+ <result property="created" column="CREATED"/>
	203	+ <result property="hospitalId" column="HOSPITAL_ID"/>
	204	+ <result property="phone" column="PHONE"/>
	205	+ <collection property="items" column="ITEM_LIS_ID" ofType="com.lyms.platform.permission.model.LisReportItemModel">
	206	+ <id property="lisId" column="ITEM_LIS_ID"/>
	207	+ <result property="code" column="CODE"/>
	208	+ <result property="name" column="ITEM_NAME"/>
	209	+ <result property="result" column="RESULT"/>
	210	+ <result property="resultFlag" column="RESULT_FLAG"/>
	211	+ <result property="ref" column="REF"/>
	212	+ <result property="resultType" column="RESULT_TYPE"/>
	213	+ <result property="unit" column="UNIT"/>
	214	+ <result property="printOrder" column="PRINT_ORDER"/>
	215	+ <result property="hospitalId" column="HOSPITAL_ID"/>
	216	+ </collection>
	217	+ </resultMap>
141	218	</mapper>

...	...	@@ -90,8 +90,11 @@
90	90
91	91	public static void main(String[] args) throws Exception {
92	92
	93	+ Map<String,String> map = new HashMap<String, String>();
	94	+ map.put("vcCardNo","C40064690");
	95	+ map.put("sortType","1");
93	96	long start = System.currentTimeMillis();
94		- String s = doPost("https://area-qhd-api.healthbaby.com.cn:18019/findSyncData", new HashMap<String, String>(), "utf-8");
	97	+ String s = doGet("https://area-qhd-api.healthbaby.com.cn:18019/getLisAndRisData", map, "utf-8","luc805966f6591ff8a51e5186cfee32e58e");
95	98	long end = System.currentTimeMillis();
96	99	System.out.print(end -start);
97	100	System.out.println(s);

...	...	@@ -5,10 +5,13 @@
5	5	import com.lyms.platform.common.base.LoginContext;
6	6	import com.lyms.platform.common.result.BaseResponse;
7	7	import com.lyms.platform.common.utils.DateUtil;
	8	+import com.lyms.platform.common.utils.JsonUtil;
8	9	import com.lyms.platform.operate.web.facade.LisFacade;
9	10	import com.lyms.platform.operate.web.request.LisReportModelRequest;
	11	+import com.lyms.platform.permission.model.LisReportItemModel;
10	12	import com.lyms.platform.permission.model.LisReportModel;
11	13	import com.lyms.platform.permission.service.LisService;
	14	+import org.apache.commons.collections.CollectionUtils;
12	15	import org.springframework.beans.factory.annotation.Autowired;
13	16	import org.springframework.stereotype.Controller;
14	17	import org.springframework.web.bind.annotation.*;
...	...	@@ -48,7 +51,12 @@
48	51	for(LisReportModelRequest lisRequest : models)
49	52	{
50	53	LisReportModel model = new LisReportModel();
51		- model.setItems(lisRequest.getItems());
	54	+ List<LisReportItemModel> items = lisRequest.getItems();
	55	+ if (CollectionUtils.isNotEmpty(items))
	56	+ {
	57	+ model.setItemJson(JsonUtil.array2JsonString(items));
	58	+ }
	59	+
52	60	model.setId(lisRequest.getId());
53	61	model.setVcCardNo(lisRequest.getVcCardNo());
54	62	model.setHospitalId(lisRequest.getHospitalId());
...	...	@@ -73,6 +81,40 @@
73	81
74	82	}
75	83	}
	84	+
	85	+
	86	+
	87	+// List<LisReportModel> list = new ArrayList<>();
	88	+// if (models != null && models.size() > 0)
	89	+// {
	90	+// for(LisReportModelRequest lisRequest : models)
	91	+// {
	92	+// LisReportModel model = new LisReportModel();
	93	+// model.setItems(lisRequest.getItems());
	94	+// model.setId(lisRequest.getId());
	95	+// model.setVcCardNo(lisRequest.getVcCardNo());
	96	+// model.setHospitalId(lisRequest.getHospitalId());
	97	+// model.setLisId(lisRequest.getLisId());
	98	+// model.setAge(lisRequest.getAge());
	99	+// model.setName(lisRequest.getName());
	100	+// model.setBhnum(lisRequest.getBhnum());
	101	+// model.setPhone(lisRequest.getPhone());
	102	+// model.setSex(lisRequest.getSex());
	103	+// model.setTitle(lisRequest.getTitle());
	104	+// model.setType(lisRequest.getType());
	105	+// model.setChecker(lisRequest.getChecker());
	106	+// model.setApplyDept(lisRequest.getApplyDept());
	107	+// model.setApplyDoctor(lisRequest.getApplyDoctor());
	108	+// model.setApplyTime(DateUtil.parseYMDHMS(lisRequest.getApplyTime()));
	109	+// model.setPublishTime(DateUtil.parseYMDHMS(lisRequest.getPublishTime()));
	110	+// model.setModified(DateUtil.parseYMDHMS(lisRequest.getModified()));
	111	+// model.setCreated(DateUtil.parseYMDHMS(lisRequest.getCreated()));
	112	+// model.setCheckTime(DateUtil.parseYMDHMS(lisRequest.getCheckTime()));
	113	+//
	114	+// list.add(model);
	115	+//
	116	+// }
	117	+// }
76	118
77	119	return lisService.saveLisData(list);
78	120	}

...	...	@@ -303,7 +303,7 @@
303	303	if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && StringUtils.isNotEmpty(pat.getHospitalId()))
304	304	{
305	305
306		- //获取lis记录中医院的名称
	306	+ //获取医院的名称
307	307	String hospitalName = hIdNames.get(pat.getHospitalId());
308	308	if (!StringUtils.isNotEmpty(hospitalName))
309	309	{
...	...	@@ -347,7 +347,13 @@
347	347	query.setLisId(lis.getLisId());
348	348	query.setHospitalId(lis.getHospitalId());
349	349	//查询lis每项详情
350		- List<LisReportItemModel> items = lisService.queryLisItemByModel(query);
	350	+ List<LisReportItemModel> items = null;
	351	+ if (StringUtils.isNotEmpty(lis.getItemJson()))
	352	+ {
	353	+ items = JsonUtil.toList(lis.getItemJson(),LisReportItemModel.class);
	354	+ }
	355	+
	356	+ //List<LisReportItemModel> items = lisService.queryLisItemByModel(query);
351	357	if (CollectionUtils.isNotEmpty(items))
352	358	{
353	359	for (LisReportItemModel checkItem : items)

...	...	@@ -5,6 +5,9 @@
5	5	*/
6	6	import java.util.*;
7	7	import java.util.Map.Entry;
	8	+
	9	+import com.lyms.platform.common.pojo.SyncDataModel;
	10	+import com.lyms.platform.common.utils.JsonUtil;
8	11	import org.apache.http.HttpEntity;
9	12	import org.apache.http.HttpResponse;
10	13	import org.apache.http.NameValuePair;
...	...	@@ -54,6 +57,8 @@
54	57
55	58	long start = System.currentTimeMillis();
56	59	String s = doPost("https://area-qhd-api.healthbaby.com.cn:18019/findSyncData", new HashMap<String, String>(), "utf-8");
	60	+
	61	+ List<SyncDataModel> list = JsonUtil.toList(s, SyncDataModel.class);
57	62	long end = System.currentTimeMillis();
58	63	System.out.print(end -start);
59	64	System.out.println(s);