jiangjiazhi / regional-platform

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 27 additions and 0 deletions

...	...	@@ -6,6 +6,7 @@
6	6
7	7	import java.util.Date;
8	8	import java.util.HashMap;
	9	+import java.util.List;
9	10	import java.util.Map;
10	11
11	12	/**
12	13
13	14
...	...	@@ -56,8 +57,16 @@
56	57	private Date diaDate;//诊断时间
57	58	private String diaHospital;//诊断单位
58	59	private String inPerson;//录入人员
	60	+ private List sieveProject;//筛查项目
59	61
	62	+ public List getSieveProject() {
	63	+ return sieveProject;
	64	+ }
60	65
	66	+ public void setSieveProject(List sieveProject) {
	67	+ this.sieveProject = sieveProject;
	68	+ }
	69	+
61	70	public Date getDiaDate() {
62	71	return diaDate;
63	72	}
...	...	@@ -420,6 +429,9 @@
420	429	map.put("diaResult",diaResult);
421	430	map.put("applyWeek",applyWeek);
422	431	map.put("resultDate",DateUtil.getyyyy_MM_dd(resultDate));
	432	+ map.put("CsStatus",CsStatus);
	433	+ map.put("tireNumber",tireNumber);
	434	+ map.put("sieveProject",sieveProject.toString());
423	435	return map;
424	436	}
425	437	}

...	...	@@ -326,6 +326,21 @@
326	326	List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
327	327	if(list != null && list.size() > 0){
328	328	SieveModel sieveModel = list.get(0);
	329	+
	330	+ //产筛项目
	331	+ SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
	332	+ sieveApplyOrderQuery.setParentId(patients.getId());
	333	+ sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
	334	+ List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
	335	+ List sList = new ArrayList();
	336	+ if(applyOrderModels != null && applyOrderModels.size() > 0){
	337	+ SieveApplyOrderModel sieveAppModel = applyOrderModels.get(0);
	338	+ if (StringUtils.isNotEmpty(sieveAppModel.getCheckItem())) {
	339	+ sList = JsonUtil.jkstr2Obj(sieveAppModel.getCheckItem(), List.class);
	340	+ }
	341	+ }
	342	+ diagnosisModel.setSieveProject(sList);
	343	+
329	344	if(sieveModel.getRenShenResult() != null){
330	345	diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString());
331	346	}