jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 24 additions and 4 deletions

...	...	@@ -121,7 +121,7 @@
121	121	<artifactId>main-data-data</artifactId>
122	122	<version>1.0</version>
123	123	<scope>system</scope>
124		- <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/main-data-1.0-SNAPSHOT.jar</systemPath>
	124	+ <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/mainData.jar</systemPath>
125	125	</dependency>
126	126	<dependency>
127	127	<groupId>base-common-1.0-SNAPSHOT</groupId>

...	...	@@ -846,15 +846,37 @@
846	846	if (CollectionUtils.isNotEmpty(data)) {
847	847	crisis = 0;
848	848	for (RiskColorEnum risk : data) {
849		- crisis = crisis & risk.getId();
	849	+ crisis = crisis \| risk.getId();
850	850	}
851	851	}
852	852	risks.setCrisis(crisis);
853	853	risks.setPublishId(0);
854	854	risks.setPublishName("system-worker");
855	855	risksService.addRisks(risks);
	856	+
	857	+ if(null!=patientId){
	858	+ patientsService.updatePatientCrisis(patientId,risks.getCrisis());
	859	+ }
856	860	}
857	861
	862	+ public static void main(String[] args){
	863	+
	864	+ List<RiskColorEnum> data = new ArrayList<>();
	865	+ data.add(RiskColorEnum.Green);
	866	+ data.add(RiskColorEnum.Orange);
	867	+ Integer
	868	+ crisis=null;
	869	+ if (CollectionUtils.isNotEmpty(data)) {
	870	+ crisis = 0;
	871	+ for (RiskColorEnum risk : data) {
	872	+ crisis = crisis \| risk.getId();
	873	+ }
	874	+ }
	875	+ System.out.print(crisis);
	876	+ }
	877	+
	878	+
	879	+
858	880	private void handlRiskChu(AntExChuModel antExChuModel, Integer patientId) {
859	881
860	882	risksService.deleteRisk(patientId);
861	883
...	...	@@ -1056,12 +1078,10 @@
1056	1078	} catch (Exception e) {
1057	1079	}
1058	1080	}
1059		- System.out.println(colors);
1060	1081	Integer crisis = 0;
1061	1082	for (RiskColorEnum color : colors) {
1062	1083	crisis = crisis \| color.getId();
1063	1084	}
1064		- System.out.println(crisis);
1065	1085	return crisis;
1066	1086	}
1067	1087	}

No preview for this file type