liquanyu / regional-platform

Commit 6dfa38c188301b65cad6414430f882153def990d

Authored by jiangjiazhi over 7 years ago

1

Showing 1 changed file with 14 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java

...	...	@@ -68,6 +68,8 @@
68	68
69	69	@Autowired
70	70	private OperateLogFacade operateLogFacade;
	71	+ @Autowired
	72	+ private CommonService commonService;
71	73
72	74	/**
73	75	* 增加转诊申请
...	...	@@ -135,10 +137,17 @@
135	137	days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
136	138	}
137	139	referralApplyOrderModel.setLastMenses(patients.getLastMenses());
138		- HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
139		- referralApplyOrderModel.setrRisk(highScoreResult.gethighRiskList());
140		- referralApplyOrderModel.setScore(highScoreResult.getScore());
141		- List lsit = new ArrayList();
	140	+ referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(patients.getRiskFactorId()).split(",")));
	141	+ referralApplyOrderModel.setOtherHighRisk(patients.getoRiskFactor());
	142	+ List<String> rlevel=Collections.emptyList();
	143	+ if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){
	144	+ rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
	145	+ HashSet set =new HashSet(rlevel);
	146	+ rlevel=new ArrayList<String>(set);
	147	+ }
	148	+ referralApplyOrderModel.setrLevel(rlevel);
	149	+ referralApplyOrderModel.setScore(patients.getRiskScore());
	150	+ /* List lsit = new ArrayList();
142	151	List<Map> list = highScoreResult.filter(highScoreResult.getLevel());
143	152	for (Map<String, String> map : list) {
144	153	String name = map.get("name");
...	...	@@ -146,7 +155,7 @@
146	155	lsit.add(name);
147	156	}
148	157	}
149		- referralApplyOrderModel.setrLevel(lsit);
	158	+ referralApplyOrderModel.setrLevel(lsit);*/
150	159	referralApplyOrderModel.setPid(patients.getPid());
151	160	referralApplyOrderModel.setDueWeek(new Date());
152	161	days = DateUtil.daysBetween(patients.getLastMenses(), new Date());