jiangjiazhi / regional-platform

Commit ad2898e6afdc0e585872b30c778b14f07ffbd143

Authored by hujiaqi over 8 years ago

Exists in master and in 8 other branches

中文转换

Showing 4 changed files with 167 additions and 48 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.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/result/ChildbirthManagerQueryModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java

...	...	@@ -204,18 +204,18 @@
204	204	List<Map<String, Object>> list = new ArrayList<>();
205	205	for (NewBabyManagerQueryModel newBabyManagerQueryModel : newBabyManagerQueryModelList) {
206	206	Map<String, Object> map = BeanUtils.objectToObjectMap(newBabyManagerQueryModel);
207		- Integer sex = newBabyManagerQueryModel.getSex();
208		- if (new Integer(0).equals(sex)) {
	207	+ String sex = newBabyManagerQueryModel.getSex();
	208	+ if ("0".equals(sex)) {
209	209	map.put("sex", "女");
210	210	}
211		- if (new Integer(1).equals(sex)) {
	211	+ if ("1".equals(sex)) {
212	212	map.put("sex", "男");
213	213	}
214		- Integer highRisk = newBabyManagerQueryModel.getHighRisk();
215		- if (new Integer(0).equals(highRisk)) {
	214	+ String highRisk = newBabyManagerQueryModel.getHighRisk();
	215	+ if ("0".equals(highRisk)) {
216	216	map.put("highRisk", "健康");
217	217	}
218		- if (new Integer(1).equals(highRisk)) {
	218	+ if ("1".equals(highRisk)) {
219	219	map.put("highRisk", "高危");
220	220	}
221	221	String dueType = newBabyManagerQueryModel.getDueType();

...	...	@@ -21,6 +21,7 @@
21	21	import com.lyms.platform.pojo.*;
22	22	import com.lyms.platform.query.*;
23	23	import org.apache.commons.collections.CollectionUtils;
	24	+import org.apache.commons.collections.MapUtils;
24	25	import org.apache.commons.lang.StringUtils;
25	26	import org.apache.commons.lang.math.NumberUtils;
26	27	import org.slf4j.Logger;
27	28
...	...	@@ -929,14 +930,14 @@
929	930	patientsQuery.setName(childbirthManagerRequest.getUserName());
930	931	patientsQuery.setYn(YnEnums.YES.getId());
931	932	patientsQuery.setType(3);
932		- patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
	933	+ // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
933	934	patientsQuery.setCardNo(childbirthManagerRequest.getCardNo());
934	935	patientsQuery.setPhone(childbirthManagerRequest.getPhone());
935	936	patientsQuery.setHusbandPhone(childbirthManagerRequest.getHusbandPhone());
936	937	// 分娩方式去另外一张表查
937	938	List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
938	939	List<String> parentIdList = new ArrayList<>();
939		- if (patientsList == null \|\| patientsList.size() == 0) {
	940	+ if (CollectionUtils.isEmpty(patientsList)) {
940	941	// 没有查到，直接抛出
941	942	childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
942	943	childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
...	...	@@ -953,7 +954,7 @@
953	954	matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
954	955	matDeliverQuery.setNeed("Need");
955	956	List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
956		- if (maternalDeliverModelList == null \|\| maternalDeliverModelList.size() == 0) {
	957	+ if (CollectionUtils.isEmpty(maternalDeliverModelList)) {
957	958	// 没有查到，直接抛出
958	959	childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
959	960	childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
960	961
961	962
962	963
963	964
...	...	@@ -972,33 +973,45 @@
972	973	try {
973	974	childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
974	975	} catch (Exception e) {
975		- // 什么都不干
	976	+ // 什么都不干，这么干是为了避开原始数据的问题
976	977	}
977	978	childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
978	979	// 查询活产数
979	980	BabyModelQuery babyModelQuery = new BabyModelQuery();
980	981	babyModelQuery.setYn(YnEnums.YES.getId());
981	982	babyModelQuery.setParentId(patients.getId());
982		- babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
983		- try {
984		- childbirthManagerQueryModel.setLivingNumber(babyService.queryBabyWithQuery(babyModelQuery).size());
985		- } catch (Exception e) {
986		- // 什么都不干
	983	+ List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
	984	+ int i = 0;
	985	+ if (CollectionUtils.isNotEmpty(babyModelList)) {
	986	+ for (BabyModel babyModel : babyModelList) {
	987	+ if (RenShenJieJuEnums.O.getId().equals(babyModel.getPregnancyOut())) {
	988	+ i++;
	989	+ }
	990	+ }
987	991	}
	992	+ childbirthManagerQueryModel.setLivingNumber(i);
988	993
989	994	// 开始拼装自定义查询结果
990	995	// 胎方位，胎心率，胎先露
991	996	// 这个泛型不会出错，传入的就是这个
992	997	@SuppressWarnings("unchecked")
993	998	List<MatDeliverAddRequest.Placenta> placentaList = maternalDeliverModel.getPlacentas();
994		- if (placentaList != null && placentaList.size() > 0) {
	999	+ if (CollectionUtils.isNotEmpty(placentaList)) {
995	1000	String fetalPosition = "";
996	1001	String heartRate = "";
997	1002	String fetalPresentation = "";
998		- for (MatDeliverAddRequest.Placenta placenta : placentaList) {
999		- fetalPosition += placenta.getFetalPosition() + ",";
1000		- heartRate += placenta.getHeartRate().toString() + ",";
1001		- fetalPresentation += placenta.getFetalPresentation() + ",";
	1003	+ try {
	1004	+ for (MatDeliverAddRequest.Placenta placenta : placentaList) {
	1005	+ for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) {
	1006	+ if (fetalPositionEnums.getId().equals(placenta.getFetalPosition())) {
	1007	+ fetalPosition += fetalPositionEnums.getName() + ",";
	1008	+ }
	1009	+ }
	1010	+ heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString() + ",";
	1011	+ fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation() + ",";
	1012	+ }
	1013	+ } catch (Exception e) {
	1014	+ // 什么都不干，这么干是为了避开原始数据的问题
1002	1015	}
1003	1016	childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1));
1004	1017	childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1));
1005	1018
1006	1019
1007	1020
1008	1021
1009	1022
1010	1023
...	...	@@ -1006,32 +1019,118 @@
1006	1019	}
1007	1020	// 第一产程，第二产程，第三产程
1008	1021	Map<String, Map<String, String>> prodprocessMap = JsonUtil.getDoubleMap(maternalDeliverModel.getProdprocess());
1009		- if (prodprocessMap != null && prodprocessMap.size() > 0) {
	1022	+ if (MapUtils.isNotEmpty(prodprocessMap)) {
1010	1023	Map<String, String> prodprocessOne = prodprocessMap.get("one");
1011		- if (prodprocessOne != null && prodprocessOne.size() > 0) {
	1024	+ if (MapUtils.isNotEmpty(prodprocessOne)) {
1012	1025	childbirthManagerQueryModel.setProdprocessOne("h:" + prodprocessOne.get("h") + "," + "m:" + prodprocessOne.get("m"));
1013	1026	}
1014	1027	Map<String, String> prodprocessTwo = prodprocessMap.get("two");
1015		- if (prodprocessTwo != null && prodprocessTwo.size() > 0) {
	1028	+ if (MapUtils.isNotEmpty(prodprocessTwo)) {
1016	1029	childbirthManagerQueryModel.setProdprocessTwo("h:" + prodprocessTwo.get("h") + "," + "m:" + prodprocessTwo.get("m"));
1017	1030	}
1018	1031	Map<String, String> prodprocessThree = prodprocessMap.get("three");
1019		- if (prodprocessThree != null && prodprocessThree.size() > 0) {
	1032	+ if (MapUtils.isNotEmpty(prodprocessThree)) {
1020	1033	childbirthManagerQueryModel.setProdprocessThree("h:" + prodprocessThree.get("h") + "," + "m:" + prodprocessThree.get("m"));
1021	1034	}
1022	1035	}
1023	1036	// 总产程
1024	1037	Map<String, String> totalprocessMap = JsonUtil.getMap(maternalDeliverModel.getTotalprocess());
1025		- if (totalprocessMap != null && totalprocessMap.size() > 0) {
	1038	+ if (MapUtils.isNotEmpty(totalprocessMap)) {
1026	1039	childbirthManagerQueryModel.setTotalprocess("h:" + totalprocessMap.get("h") + "," + "m:" + totalprocessMap.get("m"));
1027	1040	}
1028	1041	// 收缩压，舒张压
1029	1042	Map<String, String> chBpMap = JsonUtil.getMap(maternalDeliverModel.getChBp());
1030		- if (chBpMap != null && chBpMap.size() > 0) {
	1043	+ if (MapUtils.isNotEmpty(chBpMap)) {
1031	1044	childbirthManagerQueryModel.setChBpSsy1(chBpMap.get("ssy"));
1032	1045	childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy"));
1033	1046	}
1034		-
	1047	+ // 胎盘娩出方式，胎盘大小，胎盘重量，脐带长度，脐带是否异常，脐带异常类型
	1048	+ List<MaternalDeliverModel.ExtPlacenta> extPlacentaList = maternalDeliverModel.getExtPlacentas();
	1049	+ if (CollectionUtils.isNotEmpty(extPlacentaList)) {
	1050	+ String tpmcType = "";
	1051	+ String tpSize = "";
	1052	+ String tpWeight = "";
	1053	+ String umbilicalCordLength = "";
	1054	+ String umbilicalCordEx = "";
	1055	+ String umbilicalCordExType = "";
	1056	+ try {
	1057	+ for (MaternalDeliverModel.ExtPlacenta extPlacenta : extPlacentaList) {
	1058	+ for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()) {
	1059	+ if (tpmcTypeEnums.getId().equals(extPlacenta.getTpmcType())) {
	1060	+ tpmcType += tpmcTypeEnums.getName() + ",";
	1061	+ }
	1062	+ }
	1063	+ tpSize += extPlacenta.getTpSize() == null ? "" : extPlacenta.getTpSize() + ",";
	1064	+ tpWeight += extPlacenta.getTpWeight() == null ? "" : extPlacenta.getTpWeight() + ",";
	1065	+ umbilicalCordLength += extPlacenta.getUmbilicalCordLength() == null ? "" : extPlacenta.getUmbilicalCordLength() + ",";
	1066	+ umbilicalCordEx += extPlacenta.getUmbilicalCordEx() == null ? "" : extPlacenta.getUmbilicalCordEx() + ",";
	1067	+ umbilicalCordExType += extPlacenta.getUmbilicalCordExType() == null ? "" : extPlacenta.getUmbilicalCordExType() + ",";
	1068	+ }
	1069	+ } catch (Exception e) {
	1070	+ // 什么都不干，这么干是为了避开原始数据的问题
	1071	+ }
	1072	+ childbirthManagerQueryModel.setTpmcType(tpmcType.length() == 0 ? "" : tpmcType.substring(0, tpmcType.length() - 1));
	1073	+ childbirthManagerQueryModel.setTpSize(tpSize.length() == 0 ? "" : tpSize.substring(0, tpSize.length() - 1));
	1074	+ childbirthManagerQueryModel.setTpWeight(tpWeight.length() == 0 ? "" : tpWeight.substring(0, tpWeight.length() - 1));
	1075	+ childbirthManagerQueryModel.setUmbilicalCordLength(umbilicalCordLength.length() == 0 ? "" : umbilicalCordLength.substring(0, umbilicalCordLength.length() - 1));
	1076	+ childbirthManagerQueryModel.setUmbilicalCordEx(umbilicalCordEx.length() == 0 ? "" : umbilicalCordEx.substring(0, umbilicalCordEx.length() - 1));
	1077	+ childbirthManagerQueryModel.setUmbilicalCordExType(umbilicalCordExType.length() == 0 ? "" : umbilicalCordExType.substring(0, umbilicalCordExType.length() - 1));
	1078	+ }
	1079	+ // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形
	1080	+ if (CollectionUtils.isNotEmpty(babyModelList)) {
	1081	+ String pregnancyOut = "";
	1082	+ String sex = "";
	1083	+ String babyWeight = "";
	1084	+ String babyHeight = "";
	1085	+ String apgarScorePf1 = "";
	1086	+ String apgarScorePf5 = "";
	1087	+ String apgarScorePf10 = "";
	1088	+ String asphyxiaM = "";
	1089	+ String babyHealthy = "";
	1090	+ String malformation = "";
	1091	+ try {
	1092	+ for (BabyModel babyModel : babyModelList) {
	1093	+ for (RenShenJieJuEnums renShenJieJuEnums : RenShenJieJuEnums.values()) {
	1094	+ if (renShenJieJuEnums.getId().equals(babyModel.getPregnancyOut())) {
	1095	+ pregnancyOut += renShenJieJuEnums.getName() + ",";
	1096	+ }
	1097	+ }
	1098	+ for (SexEnum sexEnum : SexEnum.values()) {
	1099	+ if (sexEnum.getId().equals(babyModel.getSex())) {
	1100	+ sex += sexEnum.getText() + ",";
	1101	+ }
	1102	+ }
	1103	+ babyWeight += babyModel.getBabyWeight() == null ? "" : babyModel.getBabyWeight() + ",";
	1104	+ babyHeight += babyModel.getBabyHeight() == null ? "" : babyModel.getBabyHeight() + ",";
	1105	+ asphyxiaM += babyModel.getAsphyxiaM() == null ? "" : babyModel.getAsphyxiaM() + ",";
	1106	+ babyHealthy += babyModel.getBabyHealthy() == null ? "" : babyModel.getBabyHealthy() + ",";
	1107	+ malformation += babyModel.getMalformation() == null ? "" : babyModel.getMalformation() + ",";
	1108	+ Map<String, String> map = JsonUtil.getMap(babyModel.getApgarScore());
	1109	+ if (MapUtils.isNotEmpty(map)) {
	1110	+ apgarScorePf1 += map.get("pf1") == null ? "" : map.get("pf1") + ",";
	1111	+ apgarScorePf5 += map.get("pf5") == null ? "" : map.get("pf5") + ",";
	1112	+ apgarScorePf10 += map.get("pf10") == null ? "" : map.get("pf10") + ",";
	1113	+ }
	1114	+ }
	1115	+ } catch (Exception e) {
	1116	+ // 什么都不干，这么干是为了避开原始数据的问题
	1117	+ }
	1118	+ childbirthManagerQueryModel.setPregnancyOut(pregnancyOut.length() == 0 ? "" : pregnancyOut.substring(0, pregnancyOut.length() - 1));
	1119	+ childbirthManagerQueryModel.setSex(sex.length() == 0 ? "" : sex.substring(0, sex.length() - 1));
	1120	+ childbirthManagerQueryModel.setBabyWeight(babyWeight.length() == 0 ? "" : babyWeight.substring(0, babyWeight.length() - 1));
	1121	+ childbirthManagerQueryModel.setBabyHeight(babyHeight.length() == 0 ? "" : babyHeight.substring(0, babyHeight.length() - 1));
	1122	+ childbirthManagerQueryModel.setApgarScorePf1(apgarScorePf1.length() == 0 ? "" : apgarScorePf1.substring(0, apgarScorePf1.length() - 1));
	1123	+ childbirthManagerQueryModel.setApgarScorePf5(apgarScorePf5.length() == 0 ? "" : apgarScorePf5.substring(0, apgarScorePf5.length() - 1));
	1124	+ childbirthManagerQueryModel.setApgarScorePf10(apgarScorePf10.length() == 0 ? "" : apgarScorePf10.substring(0, apgarScorePf10.length() - 1));
	1125	+ childbirthManagerQueryModel.setAsphyxiaM(asphyxiaM.length() == 0 ? "" : asphyxiaM.substring(0, asphyxiaM.length() - 1));
	1126	+ childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1));
	1127	+ childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1));
	1128	+ }
	1129	+ try {
	1130	+ childbirthManagerQueryModel.setFmHospital(organizationService.getOrganization(Integer.valueOf(maternalDeliverModel.getFmHospital())).getName());
	1131	+ } catch (Exception e) {
	1132	+ // 什么都不干，这么干是为了避开原始数据的问题
	1133	+ }
1035	1134	// 拼装自定义查询结果结束
1036	1135
1037	1136	childbirthManagerQueryModelList.add(childbirthManagerQueryModel);
...	...	@@ -1080,7 +1179,26 @@
1080	1179	newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModelList.get(0).getDeliverDoctor())).getName());
1081	1180	}
1082	1181	} catch (Exception e) {
1083		- // 什么都不干
	1182	+ // 什么都不干，这么干是为了避开原始数据的问题
	1183	+ }
	1184	+ for (SexEnum sexEnum : SexEnum.values()) {
	1185	+ if (sexEnum.getId().equals(babyModel.getSex())) {
	1186	+ newBabyManagerQueryModel.setSex(sexEnum.getText());
	1187	+ }
	1188	+ }
	1189	+ Integer highRisk = babyModel.getHighRisk();
	1190	+ if (new Integer(0).equals(highRisk)) {
	1191	+ newBabyManagerQueryModel.setHighRisk("健康");
	1192	+ }
	1193	+ if (new Integer(1).equals(highRisk)) {
	1194	+ newBabyManagerQueryModel.setHighRisk("高危");
	1195	+ }
	1196	+ String dueType = newBabyManagerQueryModel.getDueType();
	1197	+ if ("1".equals(dueType)) {
	1198	+ newBabyManagerQueryModel.setDueType("顺产");
	1199	+ }
	1200	+ if ("2".equals(dueType)) {
	1201	+ newBabyManagerQueryModel.setDueType("刨宫产");
1084	1202	}
1085	1203	newBabyManagerQueryModelList.add(newBabyManagerQueryModel);
1086	1204	}

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+
3	4	/**
4	5	* @auther HuJiaqi
5	6	* @createTime 2016年12月07日 15时51分
...	...	@@ -303,7 +304,7 @@
303	304	* @createTime 2016年12月09日 15时59分
304	305	* @discription 儿童性别
305	306	*/
306		- private Integer sex;
	307	+ private String sex;
307	308
308	309	/**
309	310	* @auther HuJiaqi
...	...	@@ -359,7 +360,7 @@
359	360	* @createTime 2016年12月09日 16时00分
360	361	* @discription 畸形
361	362	*/
362		- private Integer malformation;
	363	+ private String malformation;
363	364	// 新生儿信息结束
364	365
365	366	// 院内信息开始
366	367
...	...	@@ -705,11 +706,11 @@
705	706	this.pregnancyOut = pregnancyOut;
706	707	}
707	708
708		- public Integer getSex() {
	709	+ public String getSex() {
709	710	return sex;
710	711	}
711	712
712		- public void setSex(Integer sex) {
	713	+ public void setSex(String sex) {
713	714	this.sex = sex;
714	715	}
715	716
716	717
...	...	@@ -769,11 +770,11 @@
769	770	this.babyHealthy = babyHealthy;
770	771	}
771	772
772		- public Integer getMalformation() {
	773	+ public String getMalformation() {
773	774	return malformation;
774	775	}
775	776
776		- public void setMalformation(Integer malformation) {
	777	+ public void setMalformation(java.lang.String malformation) {
777	778	this.malformation = malformation;
778	779	}
779	780

...	...	@@ -20,7 +20,7 @@
20	20	* @discription 娩出时间
21	21	*/
22	22	private String birthHM;
23		-
	23	+
24	24	/**
25	25	* @auther HuJiaqi
26	26	* @createTime 2016年12月08日 10时54分
...	...	@@ -33,7 +33,7 @@
33	33	* @createTime 2016年12月08日 10时54分
34	34	* @discription 性别
35	35	*/
36		- private Integer sex;
	36	+ private String sex;
37	37
38	38	/**
39	39	* @auther HuJiaqi
...	...	@@ -47,7 +47,7 @@
47	47	* @createTime 2016年12月08日 10时56分
48	48	* @discription 是否高危
49	49	*/
50		- private Integer highRisk;
	50	+ private String highRisk;
51	51
52	52	/**
53	53	* @auther HuJiaqi
54	54
55	55
56	56
57	57
58	58
59	59
...	...	@@ -62,49 +62,49 @@
62	62	* @discription 分娩方式
63	63	*/
64	64	private String dueType;
65		-
	65	+
66	66	/**
67	67	* @auther HuJiaqi
68	68	* @createTime 2016年12月08日 10时56分
69	69	* @discription 出生身长/cm
70	70	*/
71	71	private String babyHeight;
72		-
	72	+
73	73	/**
74	74	* @auther HuJiaqi
75	75	* @createTime 2016年12月08日 10时57分
76	76	* @discription 出生体重/g
77	77	*/
78	78	private String babyWeight;
79		-
	79	+
80	80	/**
81	81	* @auther HuJiaqi
82	82	* @createTime 2016年12月08日 10时57分
83	83	* @discription 母亲姓名
84	84	*/
85	85	private String mname;
86		-
	86	+
87	87	/**
88	88	* @auther HuJiaqi
89	89	* @createTime 2016年12月08日 10时57分
90	90	* @discription 母亲年龄
91	91	*/
92	92	private Integer age;
93		-
	93	+
94	94	/**
95	95	* @auther HuJiaqi
96	96	* @createTime 2016年12月08日 10时57分
97	97	* @discription 母亲证件号
98	98	*/
99	99	private String mcertNo;
100		-
	100	+
101	101	/**
102	102	* @auther HuJiaqi
103	103	* @createTime 2016年12月08日 10时57分
104	104	* @discription 联系方式
105	105	*/
106	106	private String mphone;
107		-
	107	+
108	108	/**
109	109	* @auther HuJiaqi
110	110	* @createTime 2016年12月08日 10时57分
111	111
...	...	@@ -136,11 +136,11 @@
136	136	this.name = name;
137	137	}
138	138
139		- public Integer getSex() {
	139	+ public String getSex() {
140	140	return sex;
141	141	}
142	142
143		- public void setSex(Integer sex) {
	143	+ public void setSex(String sex) {
144	144	this.sex = sex;
145	145	}
146	146
147	147
...	...	@@ -152,11 +152,11 @@
152	152	this.birthDays = birthDays;
153	153	}
154	154
155		- public Integer getHighRisk() {
	155	+ public String getHighRisk() {
156	156	return highRisk;
157	157	}
158	158
159		- public void setHighRisk(Integer highRisk) {
	159	+ public void setHighRisk(String highRisk) {
160	160	this.highRisk = highRisk;
161	161	}
162	162