jiangjiazhi / regional-platform

Commit 2679267a9b23eb08e4a18a9c4b6f481a3fb13474

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

增加字段

Showing 3 changed files with 52 additions and 17 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/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -115,13 +115,13 @@
115	115	patientsQuery.setCardNo(exListQueryRequest.getCardNo());
116	116	patientsQuery.setYn(YnEnums.YES.getId());
117	117	patientsQuery.setPhone(exListQueryRequest.getPhone());
118		- AntexListResult antexListResult=new AntexListResult();
	118	+ AntexListResult antexListResult = new AntexListResult();
119	119	//获取所有的建档记录
120	120	List<Patients> list = patientsService.queryPatient(patientsQuery);
121		- List listDate = new ArrayList();
	121	+ List listDate = new ArrayList();
122	122	int i = 0;
123	123	if (CollectionUtils.isNotEmpty(list)) {
124		- antexListResult.convertToResult(null,list.get(0),null);
	124	+ antexListResult.convertToResult(null, list.get(0), null);
125	125	for (Patients patients : list) {
126	126	List<AntData> data = new ArrayList<>();
127	127	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
128	128
...	...	@@ -173,12 +173,12 @@
173	173	i++;
174	174	//分娩记录
175	175	if (CollectionUtils.isNotEmpty(modelList)) {
176		- data.add(new AntData(modelList.get(0),patients.getLastMenses()));
	176	+ data.add(new AntData(modelList.get(0), patients.getLastMenses()));
177	177	}
178	178	//产后复查记录
179		- List<PostReviewModel> reviewModels=postReviewService.findWithList(postReviewQuery);
180		- if(CollectionUtils.isNotEmpty(reviewModels)){
181		- for(PostReviewModel postReviewModel:reviewModels){
	179	+ List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
	180	+ if (CollectionUtils.isNotEmpty(reviewModels)) {
	181	+ for (PostReviewModel postReviewModel : reviewModels) {
182	182	data.add(new AntData(postReviewModel));
183	183	}
184	184	}
185	185
...	...	@@ -318,9 +318,14 @@
318	318	antenatalExaminationResult.convertToResult(examinationModel);
319	319	try {
320	320	List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class);
321		- antenatalExaminationResult.setRiskFactor(list1);
	321	+ antenatalExaminationResult.setRiskFactor(queryRisk(list1));
322	322	} catch (Exception e) {
323	323	}
	324	+ try {
	325	+ List list = JsonUtil.toList(examinationModel.getDiagnosis(), List.class);
	326	+ antenatalExaminationResult.setDiagnosis(queryRisk(list));
	327	+ } catch (Exception e) {
	328	+ }
324	329	object = antenatalExaminationResult;
325	330	} else {
326	331	//查询初诊数据
327	332
...	...	@@ -334,10 +339,42 @@
334	339	antExChuModel = antExChuModels.get(0);
335	340	}
336	341	antexChuResult.convertToResult(antExChuModel);
	342	+ try {
	343	+ List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class);
	344	+ antexChuResult.setDiagnosis(queryRisk(list));
	345	+ } catch (Exception e) {
	346	+ }
	347	+ try {
	348	+ List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
	349	+ antexChuResult.setHighrisk(queryRisk(list1));
	350	+ } catch (Exception e) {
	351	+
	352	+ }
337	353	object = antexChuResult;
338	354	}
339	355
340	356	return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	357	+ }
	358	+
	359	+ private List queryRisk(List<String> id) {
	360	+ BasicConfigQuery
	361	+ basicConfigQuery = new BasicConfigQuery();
	362	+ List data = new ArrayList();
	363	+ if (CollectionUtils.isNotEmpty(id)) {
	364	+ for (String i : id) {
	365	+ basicConfigQuery.setId(i);
	366	+ List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
	367	+ if (CollectionUtils.isNotEmpty(basicConfigs)) {
	368	+ for (BasicConfig basicConfig : basicConfigs) {
	369	+ Map<String, Object> map = new HashMap<>();
	370	+ map.put("id", basicConfig.getId());
	371	+ map.put("name", basicConfig.getName());
	372	+ data.add(map);
	373	+ }
	374	+ }
	375	+ }
	376	+ }
	377	+ return data;
341	378	}
342	379
343	380	public BaseResponse getEnums() {

...	...	@@ -54,7 +54,7 @@
54	54	//其他高危
55	55	private Map otherRisk;
56	56	//诊断
57		- private String diagnosis;
	57	+ private List diagnosis;
58	58	//分类
59	59	private String type;
60	60	//异常
...	...	@@ -72,7 +72,6 @@
72	72
73	73	@Override
74	74	public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
75		- setDiagnosis(destModel.getDiagnosis());
76	75	setEdema(destModel.getEdema());
77	76	setParentId(destModel.getParentId());
78	77	setNextCheckDate(destModel.getNextCheckDate());
79	78
...	...	@@ -179,11 +178,11 @@
179	178	this.currentDueDate = currentDueDate;
180	179	}
181	180
182		- public String getDiagnosis() {
	181	+ public List getDiagnosis() {
183	182	return diagnosis;
184	183	}
185	184
186		- public void setDiagnosis(String diagnosis) {
	185	+ public void setDiagnosis(List diagnosis) {
187	186	this.diagnosis = diagnosis;
188	187	}
189	188

...	...	@@ -123,7 +123,7 @@
123	123	// 其他高危
124	124	private Map otherHighRisk;
125	125	// 诊断
126		- private String diagnosis;
	126	+ private List diagnosis;
127	127	//处理意见
128	128	private String treatOpinion;
129	129	//指导意见
130	130
...	...	@@ -346,12 +346,11 @@
346	346	this.chgOther = chgOther;
347	347	}
348	348
349		-
350		- public String getDiagnosis() {
	349	+ public List getDiagnosis() {
351	350	return diagnosis;
352	351	}
353	352
354		- public void setDiagnosis(String diagnosis) {
	353	+ public void setDiagnosis(List diagnosis) {
355	354	this.diagnosis = diagnosis;
356	355	}
357	356
...	...	@@ -869,7 +868,7 @@
869	868	setPlacentas(antExChuModel.getPlacentas());
870	869	setHighriskSocre(antExChuModel.getHighriskSocre());
871	870	setOtherHighRisk(JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class));
872		- setDiagnosis(antExChuModel.getDiagnosis());
	871	+// setDiagnosis(antExChuModel.getDiagnosis());
873	872	setTreatOpinion(antExChuModel.getTreatOpinion());
874	873	setDirOpinion(antExChuModel.getDirOpinion());
875	874	setProdDoctor(antExChuModel.getProdDoctor());