jiangjiazhi / regional-platform | GitLab

Commit 3144d221ccd35979cc1d78b1263cf03a5902a361

Authored by jiangjiazhi about 9 years ago

1 parent 1eb1323556

Exists in master and in 8 other branches

增加设置parentid

Showing 5 changed files with 13 additions and 5 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/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java

...	...	@@ -395,7 +395,7 @@
395	395	for (Patients patients : list) {
396	396	HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false);
397	397	antexListResult.setRiskFactor(highScoreResult.getHighRisk());
398		- antexListResult.setRiskScore(highScoreResult.getScore() + "");
	398	+ antexListResult.setRiskScore(highScoreResult.getScoreStr());
399	399
400	400	List<AntData> data = new ArrayList<>();
401	401	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
...	...	@@ -650,7 +650,7 @@
650	650	antexListResult.setData(handlAntData(antExChulist, list));
651	651	antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId()));
652	652	antexListResult.setRiskFactor(highScoreResult.getHighRisk());
653		- antexListResult.setRiskScore(highScoreResult.getScore() + "");
	653	+ antexListResult.setRiskScore(highScoreResult.getScoreStr());
654	654	int days = DateUtil.getDays(patients.getLastMenses(), new Date());
655	655	// 28孕周（28+1—28+6）
656	656	if ((days >= 197) && days <= 202) {

...	...	@@ -485,7 +485,7 @@
485	485	}
486	486
487	487	matDeliverListResult.setRiskFactor(highScoreResult.getHighRisk());
488		- matDeliverListResult.setRiskScore(highScoreResult.getScore() + "");
	488	+ matDeliverListResult.setRiskScore(highScoreResult.getScoreStr());
489	489	matDeliverListResult.setTireNumber1(tTireNumber);
490	490	} catch (Exception e) {
491	491	}

...	...	@@ -249,7 +249,7 @@
249	249	try {
250	250	HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(),false);
251	251	patientBaseResult.setRiskFactor(highScoreResult.getHighRisk());
252		- patientBaseResult.setRiskScore(highScoreResult.getScore() + "");
	252	+ patientBaseResult.setRiskScore(highScoreResult.getScoreStr());
253	253	} catch (Exception e) {
254	254	}
255	255	return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);

...	...	@@ -161,7 +161,7 @@
161	161	postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate);
162	162	postReviewListResult.setData(dataList);
163	163	postReviewListResult.setRiskFactor(highScoreResult.getHighRisk());
164		- postReviewListResult.setRiskScore(highScoreResult.getScore()+"");
	164	+ postReviewListResult.setRiskScore(highScoreResult.getScoreStr());
165	165	}
166	166	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postReviewListResult);
167	167	}

...	...	@@ -41,6 +41,14 @@
41	41	return score;
42	42	}
43	43
	44	+
	45	+ public String getScoreStr(){
	46	+ if(null==score){
	47	+ return "";
	48	+ }
	49	+ return score+"";
	50	+ }
	51	+
44	52	public List<String> getLevelId() {
45	53	if (null == level) {
46	54	return Collections.emptyList();