jiangjiazhi / regional-platform

Authored by liquanyu almost 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 33 additions and 5 deletions

...	...	@@ -2553,7 +2553,7 @@
2553	2553
2554	2554	private void sortList(List listDate) {
2555	2555	//按照数据排序
2556		- Collections.sort(listDate, new Comparator <SortIn>() {
	2556	+ Collections.sort(listDate, new Comparator<SortIn>() {
2557	2557	@Override
2558	2558	public int compare(SortIn o1, SortIn o2) {
2559	2559	if (o1.getDate() != null && null != o2.getDate() && o1.getDate().after(o2.getDate())) {
...	...	@@ -4102,6 +4102,16 @@
4102	4102	}
4103	4103	} catch (Exception e) {
4104	4104	}
	4105	+
	4106	+
	4107	+ try {
	4108	+ if (StringUtils.isNotEmpty(examinationModel.getSecondaryDiagnosisId())) {
	4109	+ List list = JsonUtil.toList(examinationModel.getSecondaryDiagnosisId(), List.class);
	4110	+ antenatalExaminationResult.setSecondaryDiagnosisId(queryRisk(list, false).getHighRisk());
	4111	+ }
	4112	+ } catch (Exception e) {
	4113	+ }
	4114	+
4105	4115	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
4106	4116	referralApplyOrderQuery.setParentId(examinationModel.getParentId());
4107	4117	antenatalExaminationResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
...	...	@@ -4390,6 +4400,12 @@
4390	4400	}
4391	4401	data.add(map);
4392	4402	}
	4403	+ }
	4404	+ else
	4405	+ {
	4406	+ Map <String, Object> map = new HashMap <>();
	4407	+ map.put("id", i);
	4408	+ data.add(map);
4393	4409	}
4394	4410	}
4395	4411	}

...	...	@@ -531,13 +531,13 @@
531	531
532	532	private String aTSHR;
533	533
534		- private String secondaryDiagnosisId;
	534	+ private List secondaryDiagnosisId;
535	535
536		- public String getSecondaryDiagnosisId() {
	536	+ public List getSecondaryDiagnosisId() {
537	537	return secondaryDiagnosisId;
538	538	}
539	539
540		- public void setSecondaryDiagnosisId(String secondaryDiagnosisId) {
	540	+ public void setSecondaryDiagnosisId(List secondaryDiagnosisId) {
541	541	this.secondaryDiagnosisId = secondaryDiagnosisId;
542	542	}
543	543
544	544
...	...	@@ -1104,10 +1104,22 @@
1104	1104	return nextCheckTime;
1105	1105	}
1106	1106
	1107	+ //次要诊断手入
	1108	+ private String secondaryDiagnosis;
	1109	+
	1110	+
	1111	+ public String getSecondaryDiagnosis() {
	1112	+ return secondaryDiagnosis;
	1113	+ }
	1114	+
	1115	+ public void setSecondaryDiagnosis(String secondaryDiagnosis) {
	1116	+ this.secondaryDiagnosis = secondaryDiagnosis;
	1117	+ }
	1118	+
1107	1119	@Override
1108	1120	public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
1109	1121
1110		- setSecondaryDiagnosisId(destModel.getSecondaryDiagnosisId());
	1122	+ setSecondaryDiagnosis(destModel.getSecondaryDiagnosis());
1111	1123	setZyzlState(destModel.getZyzlState());
1112	1124	if("no".equals(destModel.getZyzlState())){
1113	1125	setZyzlContent(null);