jiangjiazhi / regional-platform

Commit f860efd60f46de47b7489f32c2ac8391ccaa5c9c

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

产筛

Showing 6 changed files with 130 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java

...	...	@@ -110,6 +110,8 @@
110	110	@Autowired
111	111	private MeasureInfoFacade measureInfoFacade;
112	112
	113	+ @Autowired
	114	+ private SieveFacade sieveFacade;
113	115
114	116	/**
115	117	* 处理区域隐藏建档
116	118
117	119
118	120
...	...	@@ -2078,11 +2080,19 @@
2078	2080	antexListResult.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数
2079	2081	}
2080	2082
2081		- //测量数据
	2083	+
2082	2084	if (patients != null)
2083	2085	{
	2086	+
	2087	+ //测量数据
2084	2088	antexListResult.setMeasureData(measureInfoFacade.getMeasureInfo(patients.getPcerteTypeId(),patients.getCardNo(),hospitalId));
	2089	+
	2090	+ //产筛状态
	2091	+ antexListResult.setSieveStatus(sieveFacade.getSieveStatus(patients.getId(), hospitalId));
2085	2092	}
	2093	+
	2094	+
	2095	+
2086	2096
2087	2097	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
2088	2098	}

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.biz.service.*;
4	4	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	5	import com.lyms.platform.common.enums.OptActionEnums;
	6	+import com.lyms.platform.common.enums.SieveEnums;
6	7	import com.lyms.platform.common.enums.TrackDownDateEnums;
7	8	import com.lyms.platform.common.enums.YnEnums;
8	9	import com.lyms.platform.common.result.BaseListResponse;
...	...	@@ -235,6 +236,93 @@
235	236
236	237	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
237	238	}
	239	+
	240	+
	241	+ public String getSieveStatus(String patientId,String hospitalId)
	242	+ {
	243	+
	244	+ String siveStatus = "";
	245	+ SieveQuery sieveQuery = new SieveQuery();
	246	+ sieveQuery.setYn(YnEnums.YES.getId());
	247	+ sieveQuery.setHospitalId(hospitalId);
	248	+ sieveQuery.setParentId(patientId);
	249	+ //查询产筛list
	250	+ List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
	251	+ if (CollectionUtils.isNotEmpty(list))
	252	+ {
	253	+ SieveModel model = list.get(0);
	254	+ if (model.getZtfx() == null)
	255	+ {
	256	+ SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
	257	+ sieveApplyOrderQuery1.setParentId(patientId);
	258	+ sieveApplyOrderQuery1.setHospitalId(hospitalId);
	259	+ sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
	260	+ List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
	261	+ if (CollectionUtils.isEmpty(list1))
	262	+ {
	263	+ siveStatus = "未产筛";
	264	+ }
	265	+ else
	266	+ {
	267	+ siveStatus = "已申请";
	268	+ }
	269	+ }
	270	+ else
	271	+ {
	272	+ siveStatus = SieveEnums.getTitle(model.getZtfx());
	273	+ }
	274	+ }
	275	+ else
	276	+ {
	277	+ SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
	278	+ sieveApplyOrderQuery1.setParentId(patientId);
	279	+ sieveApplyOrderQuery1.setHospitalId(hospitalId);
	280	+ sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
	281	+ List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
	282	+ if (CollectionUtils.isEmpty(list1))
	283	+ {
	284	+ siveStatus = "未产筛";
	285	+ }
	286	+ else
	287	+ {
	288	+ SieveResultQuery sieveResultQuery = new SieveResultQuery();
	289	+ sieveResultQuery.setParentId(patientId);
	290	+ sieveResultQuery.setYn(YnEnums.YES.getId());
	291	+ List<SieveResultModel> resultModels = sieveService.queryListSieveResult(sieveResultQuery);
	292	+ if (CollectionUtils.isNotEmpty(resultModels))
	293	+ {
	294	+
	295	+ SieveResultModel resultModel = resultModels.get(0);
	296	+
	297	+ List<Integer> slist =new ArrayList<>();
	298	+
	299	+ if(StringUtils.isNotEmpty(resultModel.getTszhz())){
	300	+ slist.add(Integer.valueOf(resultModel.getTszhz()));
	301	+ }
	302	+ if(StringUtils.isNotEmpty(resultModel.getSjgjx())){
	303	+ slist.add(Integer.valueOf(resultModel.getSjgjx()));
	304	+ }
	305	+ if(StringUtils.isNotEmpty(resultModel.getSbst())){
	306	+ slist.add(Integer.valueOf(resultModel.getSbst()));
	307	+ }
	308	+ if(StringUtils.isNotEmpty(resultModel.getDzhpx())){
	309	+ slist.add(Integer.valueOf(resultModel.getDzhpx()));
	310	+ }
	311	+ if(StringUtils.isNotEmpty(resultModel.getStzhz13())){
	312	+ slist.add(Integer.valueOf(resultModel.getStzhz13()));
	313	+ }
	314	+ siveStatus = SieveEnums.getTitle(Collections.max(slist));
	315	+ }
	316	+ else
	317	+ {
	318	+ siveStatus = "已申请";
	319	+ }
	320	+ }
	321	+ }
	322	+
	323	+ return siveStatus;
	324	+ }
	325	+
238	326
239	327	/**
240	328	* 查询产筛列表数据

...	...	@@ -53,8 +53,10 @@
53	53	private UsersService usersService;
54	54	@Autowired
55	55	private OrganizationService organizationService;
	56	+
56	57	@Autowired
57		- private CommonService commonService;
	58	+ private SieveFacade sieveFacade;
	59	+
58	60	@Autowired
59	61	private MatDeliverService matDeliverService;
60	62	@Autowired
...	...	@@ -1811,6 +1813,7 @@
1811	1813	map.put("highriskDesc", data.getHighriskDesc());
1812	1814
1813	1815	map.put("first", (data.getFirst() == null \|\| data.getFirst() == 1) ? "否" : "是");
	1816	+ map.put("sieveStatus", sieveFacade.getSieveStatus(patients.getId(), patients.getHospitalId()));
1814	1817
1815	1818	br.setErrorcode(ErrorCodeConstants.SUCCESS);
1816	1819	br.setErrormsg("成功");
...	...	@@ -2136,6 +2139,9 @@
2136	2139
2137	2140	//补充高危因素
2138	2141	map.put("highriskDesc", data.getHighriskDesc());
	2142	+
	2143	+ //产筛状态
	2144	+ map.put("sieveStatus", sieveFacade.getSieveStatus(patients.getId(), patients.getHospitalId()));
2139	2145
2140	2146	br.setErrorcode(ErrorCodeConstants.SUCCESS);
2141	2147	br.setErrormsg("成功");

...	...	@@ -63,7 +63,19 @@
63	63	private String vcCardNo;
64	64	private String isSieve;
65	65	private String isH = "0";
	66	+
	67	+ private String sieveStatus;
	68	+
66	69	//<!---------基本信息----------->
	70	+
	71	+
	72	+ public String getSieveStatus() {
	73	+ return sieveStatus;
	74	+ }
	75	+
	76	+ public void setSieveStatus(String sieveStatus) {
	77	+ this.sieveStatus = sieveStatus;
	78	+ }
67	79
68	80	private Map<String,Object> measureData;
69	81

...	...	@@ -57,6 +57,17 @@
57	57	//录入人员
58	58	private String publishName;
59	59
	60	+ //诊断结果时间
	61	+ private String diagnosisTime;
	62	+
	63	+ public String getDiagnosisTime() {
	64	+ return diagnosisTime;
	65	+ }
	66	+
	67	+ public void setDiagnosisTime(String diagnosisTime) {
	68	+ this.diagnosisTime = diagnosisTime;
	69	+ }
	70	+
60	71	public Integer getDiaresult() {
61	72	return diaresult;
62	73	}
...	...	@@ -186,6 +197,7 @@
186	197	setDiaTime(sieveModel.getDiaTime());
187	198
188	199	setPublishName(sieveModel.getPublishName());
	200	+ setDiagnosisTime(sieveModel.getDiagnosisTime() == null ? "" : DateUtil.getyyyy_MM_dd(sieveModel.getDiagnosisTime()));
189	201	return this;
190	202	}
191	203	}

...	...	@@ -50,8 +50,6 @@
50	50
51	51	//结果录入时间
52	52	private String resultTime;
53		- //诊断结果时间
54		- private String diagnosisTime;
55	53
56	54	public String getResultTime() {
57	55	return resultTime;
58	56
...	...	@@ -61,14 +59,7 @@
61	59	this.resultTime = resultTime;
62	60	}
63	61
64		- public String getDiagnosisTime() {
65		- return diagnosisTime;
66		- }
67	62
68		- public void setDiagnosisTime(String diagnosisTime) {
69		- this.diagnosisTime = diagnosisTime;
70		- }
71		-
72	63	public String getCspj() {
73	64	return cspj;
74	65	}
...	...	@@ -170,7 +161,6 @@
170	161	setSjgjx(sieveResultModel.getSjgjx());
171	162	setTszhz(sieveResultModel.getTszhz());
172	163	setStzhz13(sieveResultModel.getStzhz13());
173		- setDiagnosisTime(sieveResultModel.getDiagnosisTime() == null ? "" : DateUtil.getyyyy_MM_dd(sieveResultModel.getDiagnosisTime()));
174	164	setResultTime(sieveResultModel.getResultTime() == null ? "" : DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
175	165	return this;
176	166	}