jiangjiazhi / regional-platform

Commit 5aaa382d3ac824b14f85ff8628d769696d0bb363

Authored by wtt about 5 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 227 additions and 64 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHighRiskBabyController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java

...	...	@@ -53,11 +53,25 @@
53	53	return newEquipmentNo;
54	54	}
55	55
56		- /* public static void main(String[] args) {
	56	+ public static String getYeaNumber( String equipmentNo){
	57	+ String newEquipmentNo = "";
	58	+ if(equipmentNo != null && !equipmentNo.isEmpty()){
	59	+ int newEquipment = Integer.parseInt(equipmentNo) + 1;
	60	+ newEquipmentNo = String.format(DateUtil.getYearStr() + "%01d", newEquipment);
	61	+ }
	62	+ return newEquipmentNo;
	63	+ }
57	64
	65	+ /*public static void main(String[] args) {
	66	+
58	67	String dateNumber = getDateNumber("002");
	68	+ System.out.println(dateNumber);
59	69	String substring = dateNumber.substring(8, dateNumber.length());
60	70	System.out.println(substring);
	71	+
	72	+ String getYeaNumber = getYeaNumber("0");
	73	+ System.out.println(getYeaNumber);
	74	+
61	75	}*/
62	76	public static String getymd() {
63	77	return y_m_d.format(new Date());
...	...	@@ -416,7 +430,16 @@
416	430	lock.unlock();
417	431	}
418	432	}
419		-
	433	+ public static String getYearStr() {
	434	+ lock.lock();
	435	+ try {
	436	+ return yyyy.format(new Date());
	437	+ } catch (Exception e) {
	438	+ return null;
	439	+ } finally {
	440	+ lock.unlock();
	441	+ }
	442	+ }
420	443	public static Date yyyyMMParse(String time) {
421	444	Date date = null;
422	445	try {
423	446
...	...	@@ -1663,14 +1686,14 @@
1663	1686	return getYmdDate(calendar.getTime());
1664	1687	}
1665	1688
1666		- public static void main(String[] args) {
	1689	+/* public static void main(String[] args) {
1667	1690
1668	1691	Date bir = parseYMD("2017-03-08");
1669	1692	Date bir1 = parseYMD("2019-03-08");
1670	1693	int i = DateUtil.getAge2(bir, bir1);
1671	1694	System.out.println(i);
1672	1695
1673		- }
	1696	+ }*/
1674	1697
1675	1698	}

...	...	@@ -10,6 +10,7 @@
10	10	import org.springframework.data.mongodb.core.query.Criteria;
11	11
12	12	import java.util.Date;
	13	+import java.util.List;
13	14
14	15	/**
15	16	* 高危儿专科查询模型
16	17
17	18
18	19
...	...	@@ -51,10 +52,32 @@
51	52
52	53	//结案转归 1痊愈□ 2好转□ 3转院□ 4失访□
53	54	private String cCOutcome;
	55	+ //高危因素
	56	+ private List highRiskDiagnose;
54	57
	58	+ private String czOrfzProject;
	59	+
	60	+ //个人历史列表不显示初诊，时间轴你需要在掉一次接口不传type
	61	+ private boolean type;
	62	+
55	63	private String sort;
56	64
	65	+ public List getHighRiskDiagnose() {
	66	+ return highRiskDiagnose;
	67	+ }
57	68
	69	+ public void setHighRiskDiagnose(List highRiskDiagnose) {
	70	+ this.highRiskDiagnose = highRiskDiagnose;
	71	+ }
	72	+
	73	+ public boolean isType() {
	74	+ return type;
	75	+ }
	76	+
	77	+ public void setType(boolean type) {
	78	+ this.type = type;
	79	+ }
	80	+
58	81	public String getcCOutcome() {
59	82	return cCOutcome;
60	83	}
...	...	@@ -93,6 +116,14 @@
93	116	return id;
94	117	}
95	118
	119	+ public String getCzOrfzProject() {
	120	+ return czOrfzProject;
	121	+ }
	122	+
	123	+ public void setCzOrfzProject(String czOrfzProject) {
	124	+ this.czOrfzProject = czOrfzProject;
	125	+ }
	126	+
96	127	public void setId(String id) {
97	128	this.id = id;
98	129	}
...	...	@@ -253,7 +284,12 @@
253	284	if (null != cCOutcome) {
254	285	condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS);
255	286	}
256		-
	287	+ if (highRiskDiagnose !=null) {
	288	+ condition = condition.and("highRiskDiagnose", highRiskDiagnose, MongoOper.IN);
	289	+ }
	290	+ if (null != czOrfzProject) {
	291	+ condition = condition.and("czOrfzProject", czOrfzProject, MongoOper.IS);
	292	+ }
257	293	Criteria c = null;
258	294	//月龄
259	295	/*if (null != monthStart) {

...	...	@@ -31,7 +31,8 @@
31	31
32	32	/**
33	33	* 高危儿专科添加或者修改
34		- *
	34	+ * 部署先插入一条数据，来指定编码开始位置，实例是50开始的2020是年
	35	+ * db.lyms_baby_high_ris.insert({"yn" : 1,"hospitalId" : "216","number" : "202050","czOrfzProject":"cz"})
35	36	* @param request
36	37	* @return
37	38	*/

...	...	@@ -8,10 +8,7 @@
8	8	import com.lyms.platform.common.enums.YnEnums;
9	9	import com.lyms.platform.common.result.BaseObjectResponse;
10	10	import com.lyms.platform.common.result.BaseResponse;
11		-import com.lyms.platform.common.utils.DateUtil;
12		-import com.lyms.platform.common.utils.PropertiesUtils;
13		-import com.lyms.platform.common.utils.StringUtils;
14		-import com.lyms.platform.common.utils.SystemConfig;
	11	+import com.lyms.platform.common.utils.*;
15	12	import com.lyms.platform.operate.web.request.BabyHighRiskBabyRequest;
16	13	import com.lyms.platform.operate.web.result.BabyHighRiskBabyResult;
17	14	import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
...	...	@@ -30,9 +27,7 @@
30	27	import org.springframework.beans.factory.annotation.Autowired;
31	28	import org.springframework.stereotype.Component;
32	29
33		-import java.util.ArrayList;
34		-import java.util.Date;
35		-import java.util.List;
	30	+import java.util.*;
36	31
37	32	/**
38	33	* 高危儿专科逻辑处理
39	34
40	35
...	...	@@ -117,13 +112,14 @@
117	112	model.setNextDate(DateUtil.parseYMD(request.getNextDate()));
118	113	model.setCaseClosed(request.getCaseClosed());
119	114	model.setcCDate(DateUtil.parseYMD(request.getcCDate()));
120		- model.setNumber(request.getAbdomen());
	115	+ if ("fz".equals(model.getCzOrfzProject()) && StringUtils.isEmpty(request.getId())) {
	116	+ model.setNumber(request.getNumber());
	117	+ }
121	118
122		-
123	119	model.setHighRiskDiagnose(request.getHighRiskDiagnose());
124	120	model.setHighRiskQt(request.getHighRiskQt());
125	121	model.setZyh(request.getZyh());
126		- model.setHospitalDate(request.getHospitalDate());
	122	+ model.setHospitalDate(DateUtil.parseYMD(request.getHospitalDate()));
127	123	model.setCyzd(request.getCyzd());
128	124	model.setJwjc(request.getJwjc());
129	125	model.setHeight(request.getHeight());
...	...	@@ -158,6 +154,11 @@
158	154	BabyHighRiskBabyModel model = getBabyHighRiskBabyModel(request);
159	155	model.setCreateDate(new Date());
160	156	model.setHospitalId(hospitalId);
	157	+
	158	+ if ("cz".equals(model.getCzOrfzProject()) && StringUtils.isEmpty(request.getId())) {
	159	+ model.setNumber(getYeaNumberUtil(hospitalId));
	160	+ }
	161	+
161	162	model = babyHighRiskBabyService.add(model);
162	163	if (model != null && model.getId() != null) {
163	164	operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), model, model, OptActionEnums.ADD.getId(), "高危儿专科检查");
...	...	@@ -169,6 +170,7 @@
169	170	return br;
170	171	}
171	172
	173	+
172	174	/**
173	175	* 更新高危儿专科
174	176	*/
...	...	@@ -213,7 +215,6 @@
213	215	BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult();
214	216	highRiskBabyResult.convertToResult(babyHighRiskBabyModel);
215	217
216		-
217	218	if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getCheckDoctor())) {
218	219	Users users = usersService.getUsers(NumberUtils.toInt(babyHighRiskBabyModel.getCheckDoctor()));
219	220	if (users != null && StringUtils.isNotEmpty(users.getName())) {
220	221
...	...	@@ -226,41 +227,10 @@
226	227	highRiskBabyResult.setAddrStr(CommonsHelper.getResidence(babyHighRiskBabyModel.getProvinceId(), babyHighRiskBabyModel.getCityId(),
227	228	babyHighRiskBabyModel.getAreaId(), babyHighRiskBabyModel.getStreetId(), babyHighRiskBabyModel.getAddr(), basicConfigService));
228	229
229		- String diagnoseValue = "";
230		- if (CollectionUtils.isNotEmpty(babyHighRiskBabyModel.getHighRiskDiagnose())) {
231		-
232		-
233		- List <String> diagnoses = babyHighRiskBabyModel.getHighRiskDiagnose();
234		- for (int i = 0; i < diagnoses.size(); i++) {
235		- if (diagnoses.get(i) != null) {
236		- BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
237		- basicConfigQuery.setYn(YnEnums.YES.getId());
238		- basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
239		- basicConfigQuery.setId(String.valueOf(diagnoses.get(i)));
240		- List <BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
241		- if (CollectionUtils.isNotEmpty(datas)) {
242		- if (i != diagnoses.size() - 1) {
243		- diagnoseValue += datas.get(0).getName() + ",";
244		- } else {
245		- diagnoseValue += datas.get(0).getName();
246		- }
247		- } else if (CollectionUtils.isEmpty(datas)) {
248		- BasicConfigQuery basicConfigQuery2 = new BasicConfigQuery();
249		- basicConfigQuery2.setYn(YnEnums.YES.getId());
250		- basicConfigQuery2.setId(String.valueOf(diagnoses.get(i)));
251		- List <BasicConfig> datas2 = basicConfigService.queryBasicConfig(basicConfigQuery2);
252		- if (CollectionUtils.isNotEmpty(datas2)) {
253		- if (i != diagnoses.size() - 1) {
254		- diagnoseValue += datas2.get(0).getName() + ",";
255		- } else {
256		- diagnoseValue += datas2.get(0).getName();
257		- }
258		- }
259		- }
260		- }
261		- }
262		- }
	230	+ //高危内容拼装成字符串
	231	+ String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel);
263	232	highRiskBabyResult.setHighRiskDiagnoseStr(diagnoseValue);
	233	+
264	234	br.setData(highRiskBabyResult);
265	235	br.setErrorcode(ErrorCodeConstants.SUCCESS);
266	236	br.setErrormsg("成功");
...	...	@@ -268,6 +238,8 @@
268	238	return br;
269	239	}
270	240
	241	+
	242	+
271	243	/**
272	244	* 根据id,高危儿专科，编辑使用
273	245	*/
...	...	@@ -278,6 +250,13 @@
278	250	BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id);
279	251	BabyHighRiskBabyResult babyHighRiskBabyResult = new BabyHighRiskBabyResult();
280	252	babyHighRiskBabyResult.convertToResult(babyHighRiskBabyModel);
	253	+
	254	+ //将高危拼装成map
	255	+ List <Map <String, String>> list = new ArrayList <>();
	256	+ List highRiskDiagnose = babyHighRiskBabyModel.getHighRiskDiagnose();
	257	+ getHighRiskMap(list, highRiskDiagnose);
	258	+ babyHighRiskBabyResult.setHighRiskDiagnose(list);
	259	+
281	260	babyHighRiskBabyResult.setCheckDoctor(babyHighRiskBabyModel.getCheckDoctor());
282	261	babyHighRiskBabyResult.setSex(babyHighRiskBabyModel.getSex().toString());
283	262	br.setData(babyHighRiskBabyResult);
284	263
285	264
286	265
...	...	@@ -307,18 +286,41 @@
307	286	babyHighRiskBabyModelList = babyHighRiskBabyService.queryOne(babyQuery);
308	287
309	288	}
	289	+ String number = "";
	290	+ List <Map <String, String>> highRisklist = new ArrayList <>();
	291	+ String highRiskQt = "";
310	292	for (int i = 0; i < babyHighRiskBabyModelList.size(); i++) {
311	293	BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyModelList.get(i);
312	294	BabyHighRiskBabyResult babyHighRiskBabyResult = new BabyHighRiskBabyResult();
313	295	if (babyHighRiskBabyModel != null) {
	296	+ if ("cz".equals(babyHighRiskBabyModel.getCzOrfzProject()) && babyQuery.isType()) {
	297	+ continue;//个人历史列表初证不展示
	298	+ }
	299	+ if ("cz".equals(babyHighRiskBabyModel.getCzOrfzProject()) && StringUtils.isNotEmpty(babyHighRiskBabyModel.getNumber())) {
	300	+ number = babyHighRiskBabyModel.getNumber();
	301	+ }
	302	+ //获取的是个人最后高危因素
	303	+ List highRisk = babyHighRiskBabyModel.getHighRiskDiagnose();
	304	+ getHighRiskMap(highRisklist, highRisk);
	305	+ highRiskQt = babyHighRiskBabyModel.getHighRiskQt();
	306	+
314	307	babyHighRiskBabyResult.convertToResult(babyHighRiskBabyModel);
315	308	if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getHospitalId())) {
316	309	babyHighRiskBabyResult.setHospitalName(CommonsHelper.getHospitalName(babyHighRiskBabyModel.getHospitalId(), organizationService));
317	310	}
	311	+ //高危内容拼装成字符串
	312	+ String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel);
	313	+ babyHighRiskBabyResult.setHighRiskDiagnoseStr(diagnoseValue);
	314	+
318	315	babyHighRiskBabyResultList.add(babyHighRiskBabyResult);
319	316	}
320	317	}
321		- br.setData(babyHighRiskBabyResultList);
	318	+ Map map = new HashMap();
	319	+ map.put("babyHighRiskBabyResultList", babyHighRiskBabyResultList);//个人时间轴和历史记录
	320	+ map.put("number", number);//编号
	321	+ map.put("highRisklist", highRisklist); //高危因素
	322	+ map.put("highRiskQt", highRiskQt); //高危因素其它
	323	+ br.setData(map);
322	324	br.setPageInfo(babyQuery.getPageInfo());
323	325	br.setErrorcode(ErrorCodeConstants.SUCCESS);
324	326	br.setErrormsg("成功");
325	327
...	...	@@ -366,13 +368,16 @@
366	368	BabyHighRiskBabyResult babyHighRiskBabyResult = new BabyHighRiskBabyResult();
367	369	if (babyHighRiskBabyModel != null) {
368	370	babyHighRiskBabyResult.convertToResult(babyHighRiskBabyModel);
369		- babyHighRiskBabyResult.setHospitalId(CommonsHelper.getHospitalName(babyHighRiskBabyModel.getHospitalId(), organizationService));
	371	+ babyHighRiskBabyResult.setHospitalName(CommonsHelper.getHospitalName(babyHighRiskBabyModel.getHospitalId(), organizationService));
370	372	if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getCaseClosed())) {
371	373	String caseClosed = babyHighRiskBabyModel.getCaseClosed();
372	374	babyHighRiskBabyResult.setCaseClosed("1".equals(caseClosed) ? "是" : "否");
373	375	} else {
374	376	babyHighRiskBabyResult.setCaseClosed("否");
375	377	}
	378	+ //高危内容拼装成字符串
	379	+ String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel);
	380	+ babyHighRiskBabyResult.setHighRiskDiagnoseStr(diagnoseValue);
376	381
377	382	babyHighRiskBabyResultList.add(babyHighRiskBabyResult);
378	383	}
...	...	@@ -385,6 +390,91 @@
385	390
386	391	}
387	392
	393	+ private String getYeaNumberUtil(String hospitalId) {
	394	+ BabyHighRiskBabyModelQuery babyQuery = new BabyHighRiskBabyModelQuery();
	395	+ babyQuery.setYn(YnEnums.YES.getId());
	396	+ babyQuery.setHospitalId(hospitalId);
	397	+ babyQuery.setCzOrfzProject("cz");
	398	+ babyQuery.setSort("createDate");
	399	+ List <BabyHighRiskBabyModel> bhrbm = babyHighRiskBabyService.queryAll(babyQuery);
	400	+ String number = "0";
	401	+ if (CollectionUtils.isNotEmpty(bhrbm) && bhrbm.size() > 0) {
	402	+ BabyHighRiskBabyModel babyHighRiskBabyModel = bhrbm.get(0);//获取最后一个初证编号
	403	+ if (babyHighRiskBabyModel != null && StringUtils.isNotEmpty(babyHighRiskBabyModel.getNumber()) && babyHighRiskBabyModel.getNumber().length() > 4) {
	404	+ number = babyHighRiskBabyModel.getNumber();
	405	+ number = number.substring(4, number.length());//20201
	406	+ number = DateUtil.getYeaNumber(number);
	407	+ }
	408	+ } else {
	409	+ number = DateUtil.getYeaNumber(number);
	410	+ }
	411	+ return number;
	412	+ }
	413	+ private void getHighRiskMap(List <Map <String, String>> list, List highRiskDiagnose) {
	414	+ for (Object obj : highRiskDiagnose) {
	415	+ if (obj != null) {
	416	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	417	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	418	+ basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); //诊断
	419	+ basicConfigQuery.setId(String.valueOf(obj));
	420	+ List <BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
	421	+ if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
	422	+ Map <String, String> map = new HashMap <>();
	423	+ map.put("id", datas.get(0).getId());
	424	+ map.put("name", datas.get(0).getName());
	425	+ list.add(map);
	426	+ } //秦皇岛诊断内容是高危内容，如果不是诊断就判断是高危内容
	427	+ else if (org.apache.commons.collections.CollectionUtils.isEmpty(datas)) {
	428	+ BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery();
	429	+ basicConfigQuery1.setYn(YnEnums.YES.getId());
	430	+ basicConfigQuery1.setId(String.valueOf(obj));
	431	+ List <BasicConfig> datas2 = basicConfigService.queryBasicConfig(basicConfigQuery1);
	432	+ if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas2)) {
	433	+ Map <String, String> map = new HashMap <>();
	434	+ map.put("id", datas2.get(0).getId());
	435	+ map.put("name", datas2.get(0).getName());
	436	+ list.add(map);
	437	+ }
	438	+ }
	439	+
	440	+ }
	441	+ }
	442	+ }
	443	+ private String getHighRiskDiagnoseStr(BabyHighRiskBabyModel babyHighRiskBabyModel) {
	444	+ String diagnoseValue = "";
	445	+ if (CollectionUtils.isNotEmpty(babyHighRiskBabyModel.getHighRiskDiagnose())) {
	446	+ List <String> diagnoses = babyHighRiskBabyModel.getHighRiskDiagnose();
	447	+ for (int i = 0; i < diagnoses.size(); i++) {
	448	+ if (diagnoses.get(i) != null) {
	449	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	450	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	451	+ basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
	452	+ basicConfigQuery.setId(String.valueOf(diagnoses.get(i)));
	453	+ List <BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
	454	+ if (CollectionUtils.isNotEmpty(datas)) {
	455	+ if (i != diagnoses.size() - 1) {
	456	+ diagnoseValue += datas.get(0).getName() + ",";
	457	+ } else {
	458	+ diagnoseValue += datas.get(0).getName();
	459	+ }
	460	+ } else if (CollectionUtils.isEmpty(datas)) {
	461	+ BasicConfigQuery basicConfigQuery2 = new BasicConfigQuery();
	462	+ basicConfigQuery2.setYn(YnEnums.YES.getId());
	463	+ basicConfigQuery2.setId(String.valueOf(diagnoses.get(i)));
	464	+ List <BasicConfig> datas2 = basicConfigService.queryBasicConfig(basicConfigQuery2);
	465	+ if (CollectionUtils.isNotEmpty(datas2)) {
	466	+ if (i != diagnoses.size() - 1) {
	467	+ diagnoseValue += datas2.get(0).getName() + ",";
	468	+ } else {
	469	+ diagnoseValue += datas2.get(0).getName();
	470	+ }
	471	+ }
	472	+ }
	473	+ }
	474	+ }
	475	+ }
	476	+ return diagnoseValue;
	477	+ }
388	478
389	479	}

...	...	@@ -92,6 +92,8 @@
92	92	private String caseClosed;
93	93	//结案日期
94	94	private String cCDate;
	95	+ //编号
	96	+ private String number;
95	97
96	98	//高危因素
97	99	private List <String> highRiskDiagnose;
...	...	@@ -100,7 +102,7 @@
100	102	//住院号
101	103	private String zyh;
102	104	//住院时间
103		- private Date hospitalDate;
	105	+ private String hospitalDate;
104	106	//出院诊断
105	107	private String cyzd;
106	108	//既往检查
...	...	@@ -142,6 +144,14 @@
142	144	//备注
143	145	private String remarks;
144	146
	147	+ public String getNumber() {
	148	+ return number;
	149	+ }
	150	+
	151	+ public void setNumber(String number) {
	152	+ this.number = number;
	153	+ }
	154	+
145	155	public String getAddrStr() {
146	156	return addrStr;
147	157	}
148	158
...	...	@@ -487,11 +497,11 @@
487	497	this.zyh = zyh;
488	498	}
489	499
490		- public Date getHospitalDate() {
	500	+ public String getHospitalDate() {
491	501	return hospitalDate;
492	502	}
493	503
494		- public void setHospitalDate(Date hospitalDate) {
	504	+ public void setHospitalDate(String hospitalDate) {
495	505	this.hospitalDate = hospitalDate;
496	506	}
497	507

...	...	@@ -7,6 +7,7 @@
7	7
8	8	import java.util.Date;
9	9	import java.util.List;
	10	+import java.util.Map;
10	11
11	12	public class BabyHighRiskBabyResult implements IBasicResultConvert <BabyHighRiskBabyResult, BabyHighRiskBabyModel> {
12	13
13	14
14	15
...	...	@@ -86,15 +87,17 @@
86	87	private String cCDate;
87	88	//编号
88	89	private String number;
	90	+
	91	+
89	92	//高危因素
90		- private List <String> highRiskDiagnose;
	93	+ private List <Map<String, String>> highRiskDiagnose;
91	94	private String highRiskDiagnoseStr;
92	95	//高危因素其它
93	96	private String highRiskQt;
94	97	//住院号
95	98	private String zyh;
96	99	//住院时间
97		- private Date hospitalDate;
	100	+ private String hospitalDate;
98	101	//出院诊断
99	102	private String cyzd;
100	103	//既往检查
101	104
...	...	@@ -462,11 +465,11 @@
462	465	this.czOrfzProjectName = czOrfzProjectName;
463	466	}
464	467
465		- public List <String> getHighRiskDiagnose() {
	468	+ public List <Map<String, String>> getHighRiskDiagnose() {
466	469	return highRiskDiagnose;
467	470	}
468	471
469		- public void setHighRiskDiagnose(List <String> highRiskDiagnose) {
	472	+ public void setHighRiskDiagnose(List <Map<String, String>> highRiskDiagnose) {
470	473	this.highRiskDiagnose = highRiskDiagnose;
471	474	}
472	475
473	476
...	...	@@ -486,11 +489,11 @@
486	489	this.zyh = zyh;
487	490	}
488	491
489		- public Date getHospitalDate() {
	492	+ public String getHospitalDate() {
490	493	return hospitalDate;
491	494	}
492	495
493		- public void setHospitalDate(Date hospitalDate) {
	496	+ public void setHospitalDate(String hospitalDate) {
494	497	this.hospitalDate = hospitalDate;
495	498	}
496	499
497	500
...	...	@@ -724,10 +727,10 @@
724	727	setCaseClosed(destModel.getCaseClosed());
725	728	setcCDate(DateUtil.getYyyyMmDd(destModel.getcCDate()));
726	729	setNumber(destModel.getNumber());
727		- setHighRiskDiagnose(destModel.getHighRiskDiagnose());
	730	+// setHighRiskDiagnose(destModel.getHighRiskDiagnose());
728	731	setHighRiskQt(destModel.getHighRiskQt());
729	732	setZyh(destModel.getZyh());
730		- setHospitalDate(destModel.getHospitalDate());
	733	+ setHospitalDate(DateUtil.getYyyyMmDd(destModel.getHospitalDate()));
731	734	setCyzd(destModel.getCyzd());
732	735	setJwjc(destModel.getJwjc());
733	736	setHeight(destModel.getHeight());