jiangjiazhi / regional-platform

Commit fe98ae00ceef0a8eeeee4ce48c98a822c8bfb38a

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

高危诊断配置

Showing 4 changed files with 42 additions and 13 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java
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/BabyCheckFacade.java

...	...	@@ -470,6 +470,18 @@
470	470	return list;
471	471	}
472	472
	473	+
	474	+ public static Integer getIdByParentId(Integer parentId,String name)
	475	+ {
	476	+ for(JwsChildEnums s : JwsChildEnums.values()) {
	477	+ if (s.getParentId() == parentId && s.getTitle().equals(name))
	478	+ {
	479	+ return s.getId();
	480	+ }
	481	+ }
	482	+ return null;
	483	+ }
	484	+
473	485	public int getId() {
474	486	return id;
475	487	}

...	...	@@ -1022,7 +1022,8 @@
1022	1022	List list2 = null;
1023	1023	boolean isdel = false;
1024	1024	try {
1025		- if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
	1025	+ if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk())
	1026	+ && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
1026	1027	String otherHighRisk = antExChuModel.getOtherHighRisk();
1027	1028	List<Map> otherHighRisks = new ArrayList<>();
1028	1029	if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) {

...	...	@@ -3758,21 +3758,38 @@
3758	3758	if ("yes".equals(map.get("yesOrNo"))) {
3759	3759
3760	3760	List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.jws.getId());
3761		- //循环系统类
3762		- if (map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3") != null)
	3761	+
	3762	+ if (CollectionUtils.isNotEmpty(items))
3763	3763	{
3764		- Map map1 = (Map)map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3");
3765		- if (map1 != null)
	3764	+ //循环系统类
	3765	+ if (map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3") != null)
3766	3766	{
3767		- String checkBox = String.valueOf(map1.get("checkBox"));
3768		- List<String> selecteds = (List<String>)map1.get("selected");
3769		- if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds))
	3767	+ Map map1 = (Map)map.get("26cac65c-a040-4898-b7da-8deed3ba0ec3");
	3768	+ if (map1 != null)
3770	3769	{
3771		- for (String key : selecteds)
	3770	+ String checkBox = String.valueOf(map1.get("checkBox"));
	3771	+ List<String> selecteds = (List<String>)map1.get("selected");
	3772	+ if (StringUtils.isNotEmpty(checkBox) && "true".equals(checkBox) && CollectionUtils.isNotEmpty(selecteds))
3772	3773	{
3773		- if ("".equals(key))
	3774	+ for (String key : selecteds)
3774	3775	{
3775		-
	3776	+ BasicConfig config = basicConfigService.getOneBasicConfigById(key);
	3777	+ if (config != null && StringUtils.isNotEmpty(config.getName()))
	3778	+ {
	3779	+ Integer cid = DiagnoseEnums.JwsChildEnums.getIdByParentId(DiagnoseEnums.DiagnoseDetailItemEnums.JWSXHXTL.getId(), config.getName());
	3780	+ if (cid != null)
	3781	+ {
	3782	+ for (DiagnoseItemModel item : items)
	3783	+ {
	3784	+ if (String.valueOf(cid).equals(item.getValueTwo())
	3785	+ &&
	3786	+ CollectionUtils.isNotEmpty(item.getRiskIds()))
	3787	+ {
	3788	+ list.addAll(item.getRiskIds());
	3789	+ }
	3790	+ }
	3791	+ }
	3792	+ }
3776	3793	}
3777	3794	}
3778	3795	}
...	...	@@ -3780,8 +3797,6 @@
3780	3797	}
3781	3798	}
3782	3799	}
3783		-
3784		-
3785	3800	}
3786	3801
3787	3802	List<Map<String,String>> riskList = diagnoseConfigFacde.getRiskName(list);

...	...	@@ -849,6 +849,7 @@
849	849	base.setMremark(model.getMremark());
850	850	base.setMphone(model.getMphone());
851	851	base.setMname(model.getMname());
	852	+ base.setVcCardNo(model.getVcCardNo());
852	853	}
853	854	}
854	855	return model;