jiangjiazhi / regional-platform

Commit 29b99c1761e04f29b606ccd4ae9f79fe1cc45cef

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

导出word字段更名

Showing 3 changed files with 356 additions and 50 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java

...	...	@@ -83,6 +83,7 @@
83	83	private String fuwei;
84	84	//胎数
85	85	private String tireNumber1;
	86	+ //梅毒血清实验结果
86	87	private String syjg;
87	88	private List placentas;
88	89	//心脏

...	...	@@ -3,6 +3,7 @@
3	3	import com.aspose.words.*;
4	4	import com.lyms.platform.common.annotation.TokenRequired;
5	5	import com.lyms.platform.common.base.BaseController;
	6	+import com.lyms.platform.common.base.LoginContext;
6	7	import com.lyms.platform.common.result.BaseObjectResponse;
7	8	import com.lyms.platform.operate.web.facade.ViewFacade;
8	9	import org.springframework.beans.factory.annotation.Autowired;
9	10
...	...	@@ -55,8 +56,10 @@
55	56	@RequestMapping(value = "/downExChuData", method = RequestMethod.GET)
56	57	// @TokenRequired
57	58	public void downExChuData(@RequestParam("id") String id, HttpServletRequest request, HttpServletResponse response) {
58		- Map<String, Object> map = viewFacade.exChuData(id);
	59	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
59	60
	61	+ Map<String, Object> map = viewFacade.exChuData(id,loginState.getId());
	62	+
60	63	if (map == null) {
61	64	return;
62	65	}
...	...	@@ -112,6 +115,64 @@
112	115	markFrameText(builder, fh);
113	116	markPubText(builder, "/");
114	117	}
	118	+
	119	+ if(data.containsKey("heart")){
	120	+ builder.moveToBookmark("heart");
	121	+ markFrameText(builder, (String)data.get("heart"));
	122	+ data.remove("heart");
	123	+ }
	124	+ if(data.containsKey("lungs")){
	125	+ builder.moveToBookmark("lungs");
	126	+ markFrameText(builder, (String)data.get("lungs"));
	127	+ data.remove("lungs");
	128	+ }
	129	+ if(data.containsKey("vulva")){
	130	+ builder.moveToBookmark("vulva");
	131	+ markFrameText(builder, (String)data.get("vulva"));
	132	+ data.remove("vulva");
	133	+ }
	134	+ if(data.containsKey("vagina")){
	135	+ builder.moveToBookmark("vagina");
	136	+ markFrameText(builder, (String)data.get("vagina"));
	137	+ data.remove("vagina");
	138	+ }
	139	+ if(data.containsKey("cervical")){
	140	+ builder.moveToBookmark("cervical");
	141	+ markFrameText(builder, (String)data.get("cervical"));
	142	+ data.remove("cervical");
	143	+ }
	144	+ if(data.containsKey("uterus")){
	145	+ builder.moveToBookmark("uterus");
	146	+ markFrameText(builder, (String)data.get("uterus"));
	147	+ data.remove("uterus");
	148	+ }
	149	+ if(data.containsKey("fujian")){
	150	+ builder.moveToBookmark("fujian");
	151	+ markFrameText(builder, (String)data.get("fujian"));
	152	+ data.remove("fujian");
	153	+ }
	154	+ builder.moveToBookmark("ydfmw");
	155	+ List<String> ydfmw = (List<String>) data.get("ydfmw");
	156	+ data.remove("ydfmw");
	157	+ for (String yf : ydfmw) {
	158	+ markFrameText(builder, yf);
	159	+ markPubText(builder, "/");
	160	+ }
	161	+ if(data.containsKey("ydqjd")){
	162	+ builder.moveToBookmark("ydqjd");
	163	+ markFrameText(builder, (String)data.get("ydqjd"));
	164	+ data.remove("ydqjd");
	165	+ }
	166	+ if(data.containsKey("syjg")){
	167	+ builder.moveToBookmark("syjg");
	168	+ markFrameText(builder, (String)data.get("syjg"));
	169	+ data.remove("syjg");
	170	+ }
	171	+ if(data.containsKey("hivkt")){
	172	+ builder.moveToBookmark("hivkt");
	173	+ markFrameText(builder, (String)data.get("hivkt"));
	174	+ data.remove("hivkt");
	175	+ }
115	176	} catch (Exception e) {
116	177	e.printStackTrace();
117	178	}
...	...	@@ -140,7 +201,6 @@
140	201	*/
141	202	public void markFrameText(DocumentBuilder builder, String text) {
142	203	try {
143		- builder.getFont().getBorder().clearFormatting();
144	204	builder.getFont().getBorder().clearFormatting();
145	205	builder.getFont().getBorder().setColor(Color.black);
146	206	builder.getFont().getBorder().setLineWidth(1);

...	...	@@ -58,14 +58,16 @@
58	58	private BabyService babyService;
59	59	@Autowired
60	60	private StopPregnancyService stopPregnancyService;
61		-
62	61	@Autowired
	62	+ private ApplyOrderService applyOrderService;
	63	+ @Autowired
63	64	private BabyBookbuildingService babyBookbuildingService;
64	65
65	66	@Autowired
66	67	private AntenatalExaminationFacade antenatalExaminationFacade;
67		-
68	68	@Autowired
	69	+ private AutoMatchFacade autoMatchFacade;
	70	+ @Autowired
69	71	private BabyCheckService babyCheckService;
70	72
71	73	@Autowired
...	...	@@ -96,6 +98,7 @@
96	98	return br;
97	99	}
98	100
	101	+
99	102	Map<String, Object> map = new HashMap<>();
100	103	map.put("id", data.getId());
101	104	/* 孕妇基础数据 */
102	105
103	106
104	107
105	108
106	109
...	...	@@ -204,44 +207,42 @@
204	207	highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService);
205	208	}
206	209	}
207		- Integer score = 0;
208		- if (highScoreResult != null && highScoreResult.getScore() != null) {
209		- score = highScoreResult.getScore();
210		- }
211		- List<Map<String, Object>> list = new ArrayList<>();
212		- List<Map<String, Object>> checkList = ResolveUtils.queryHighRisk(highScoreResult);
213		- if (CollectionUtils.isNotEmpty(checkList))
214		- {
215		- list.addAll(checkList);
216		- }
217		- if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk)) {
218		- Map<String, Object> otherRisk = new HashMap<>();
219		- ResolveUtils.queryOtherRisk(oRisk, otherRisk, basicConfigService);
	210	+ Integer score = 0;
	211	+ if (highScoreResult != null && highScoreResult.getScore() != null) {
	212	+ score = highScoreResult.getScore();
	213	+ }
	214	+ List<Map<String, Object>> list = new ArrayList<>();
	215	+ List<Map<String, Object>> checkList = ResolveUtils.queryHighRisk(highScoreResult);
	216	+ if (CollectionUtils.isNotEmpty(checkList)) {
	217	+ list.addAll(checkList);
	218	+ }
	219	+ if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk)) {
	220	+ Map<String, Object> otherRisk = new HashMap<>();
	221	+ ResolveUtils.queryOtherRisk(oRisk, otherRisk, basicConfigService);
220	222
221		- Map<String, Object> otherMap = new HashMap<>();
	223	+ Map<String, Object> otherMap = new HashMap<>();
222	224
223		- if (otherRisk != null) {
224		- if (otherRisk.get("name") != null && StringUtils.isNotEmpty(otherRisk.get("name").toString())) {
225		- otherMap.put("name", otherRisk.get("name"));
	225	+ if (otherRisk != null) {
	226	+ if (otherRisk.get("name") != null && StringUtils.isNotEmpty(otherRisk.get("name").toString())) {
	227	+ otherMap.put("name", otherRisk.get("name"));
	228	+ }
	229	+ if (otherRisk.get("color") != null && StringUtils.isNotEmpty(otherRisk.get("color").toString()) && !"risk_".equals(otherRisk.get("color").toString())) {
	230	+ otherMap.put("color", otherRisk.get("color"));
	231	+ }
	232	+ if (otherRisk.get("score") != null && StringUtils.isNotEmpty(otherRisk.get("score").toString())) {
	233	+ String s = (String) otherRisk.get("score");
	234	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(s) && FunvCommonUtil.isNumeric(s)) {
	235	+ score += Integer.parseInt(s);
226	236	}
227		- if (otherRisk.get("color") != null && StringUtils.isNotEmpty(otherRisk.get("color").toString()) && !"risk_".equals(otherRisk.get("color").toString())) {
228		- otherMap.put("color", otherRisk.get("color"));
229		- }
230		- if (otherRisk.get("score") != null && StringUtils.isNotEmpty(otherRisk.get("score").toString()) ) {
231		- String s = (String) otherRisk.get("score");
232		- if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(s) && FunvCommonUtil.isNumeric(s)) {
233		- score += Integer.parseInt(s);
234		- }
235		- }
236		- if (otherMap.size() > 0)
237		- {
238		- list.add(otherMap);
239		- }
240		-
241	237	}
	238	+ if (otherMap.size() > 0) {
	239	+ list.add(otherMap);
	240	+ }
	241	+
242	242	}
243		- map.put("score", UnitUtils.unitSplice(score, UnitConstants.FEN));
244		- map.put("highRisk", list);
	243	+ }
	244	+ map.put("score", UnitUtils.unitSplice(score, UnitConstants.FEN));
	245	+ map.put("highRisk", list);
245	246	}
246	247
247	248	/**
...	...	@@ -250,7 +251,7 @@
250	251	* @param id
251	252	* @return
252	253	*/
253		- public Map<String, Object> exChuData(String id) {
	254	+ public Map<String, Object> exChuData(String id, Integer userId) {
254	255
255	256	BaseObjectResponse br = new BaseObjectResponse();
256	257
...	...	@@ -281,6 +282,19 @@
281	282	return null;
282	283	}
283	284
	285	+ String hospital = autoMatchFacade.getHospitalId(userId);
	286	+
	287	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
	288	+ referralApplyOrderQuery.setParentId(data.getParentId());
	289	+ referralApplyOrderQuery.setOutHospitalId(hospital);
	290	+ List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	291	+ if(CollectionUtils.isNotEmpty(orderModels)){
	292	+ ReferralApplyOrderModel referralApplyOrderModel = orderModels.get(0);
	293	+ //转院必要性
	294	+ String tranDise = referralApplyOrderModel.getTransferredDisease();
	295	+
	296	+ }
	297	+
284	298	Map<String, Object> map = new HashMap<>();
285	299	/* 基本信息 */
286	300	//孕妇基本信息
287	301
288	302
289	303
290	304
291	305
...	...	@@ -312,20 +326,24 @@
312	326	map.put("fNum", data.getDelivery());
313	327	map.put("pNum", data.getPlanedProd());
314	328	if (data.getLastMenses() != null) {
315		- int mYear = data.getLastMenses().getYear();
	329	+ Calendar lastCal = Calendar.getInstance();
	330	+ lastCal.setTime(data.getLastMenses());
	331	+ int mYear = lastCal.get(Calendar.YEAR);
316	332	map.put("mYear", String.valueOf(mYear));
317		- int mMonth = data.getLastMenses().getMonth();
	333	+ int mMonth =lastCal.get(Calendar.MONTH);
318	334	map.put("mMonth", String.valueOf(mMonth));
319		- int mDay = data.getLastMenses().getDay();
	335	+ int mDay = lastCal.get(Calendar.DAY_OF_MONTH);
320	336	map.put("mDay", String.valueOf(mDay));
321	337	}
322	338
323	339	if (patients.getDueDate() != null) {
324		- int yYear = patients.getDueDate().getYear();
	340	+ Calendar dueCal = Calendar.getInstance();
	341	+ dueCal.setTime(patients.getDueDate());
	342	+ int yYear = dueCal.get(Calendar.YEAR);
325	343	map.put("yYear", String.valueOf(yYear));
326		- int yMonth = patients.getDueDate().getMonth();
	344	+ int yMonth = dueCal.get(Calendar.MONTH);
327	345	map.put("yMonth", String.valueOf(yMonth));
328		- int yDay = patients.getDueDate().getDay();
	346	+ int yDay = dueCal.get(Calendar.DAY_OF_MONTH);
329	347	map.put("yDay", String.valueOf(yDay));
330	348	}
331	349
...	...	@@ -357,7 +375,7 @@
357	375	jws.add("7");
358	376	}
359	377	if (pastHistory.contains("其他[")) {//8其他
360		- map.put("jwsOther", pastHistory.substring(pastHistory.indexOf("其他")+3, pastHistory.length() - 1));
	378	+ map.put("jwsOther", pastHistory.substring(pastHistory.indexOf("其他") + 3, pastHistory.length() - 1));
361	379	}
362	380	if (CollectionUtils.isEmpty(jws)) {
363	381	jws.add("1");//无
...	...	@@ -437,7 +455,7 @@
437	455	map.put("fksxHistory", sss);
438	456	if (data.getAbortion() != null) {
439	457	String abortion = UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI);
440		- map.put("abortion",abortion);
	458	+ map.put("abortion", abortion);
441	459	}
442	460	if (data.getStillbirth() != null) {
443	461	map.put("stillbirth", UnitUtils.unitSplice(data.getStillbirth(), UnitConstants.CI));
444	462
...	...	@@ -451,10 +469,10 @@
451	469	if (data.getBirthDefect() != null) {
452	470	map.put("birthDefect", UnitUtils.unitSplice(data.getBirthDefect(), UnitConstants.CI));
453	471	}
454		- if(StringUtils.isNotEmpty(data.getHeight())){
	472	+ if (StringUtils.isNotEmpty(data.getHeight())) {
455	473	map.put("stature", data.getHeight());
456	474	}
457		- if(StringUtils.isNotEmpty(data.getWeight())){
	475	+ if (StringUtils.isNotEmpty(data.getWeight())) {
458	476	map.put("weight", data.getWeight());
459	477	}
460	478
...	...	@@ -480,6 +498,233 @@
480	498	ExceptionUtils.catchException(e, "体重指数计算错误");
481	499	}
482	500	}
	501	+
	502	+
	503	+ if(StringUtils.isNotEmpty(data.getHeart())){
	504	+ if("未见异常".equals(data.getHeart())){
	505	+ map.put("heart", "1");
	506	+ }else{
	507	+ map.put("heart", "2");
	508	+ map.put("heartOther", data.getHeart());
	509	+ }
	510	+ }
	511	+
	512	+ if(StringUtils.isNotEmpty(data.getLungs())){
	513	+ if("未见异常".equals(data.getLungs())){
	514	+ map.put("lungs", "1");
	515	+ }else{
	516	+ map.put("lungs", "2");
	517	+ map.put("lungsOther", data.getLungs());
	518	+ }
	519	+ }
	520	+
	521	+ if(StringUtils.isNotEmpty(data.getVulva())){
	522	+ if("未见异常".equals(data.getVulva())){
	523	+ map.put("vulva", "1");
	524	+ }else{
	525	+ map.put("vulva", "2");
	526	+ map.put("vulvaOther", data.getVulva());
	527	+ }
	528	+ }
	529	+
	530	+ if(StringUtils.isNotEmpty(data.getVagina())){
	531	+ if("未见异常".equals(data.getVagina())){
	532	+ map.put("vagina", "1");
	533	+ }else{
	534	+ map.put("vagina", "2");
	535	+ map.put("vaginaOther", data.getVagina());
	536	+ }
	537	+ }
	538	+
	539	+ if(StringUtils.isNotEmpty(data.getCervical())){
	540	+ if("未见异常".equals(data.getCervical())){
	541	+ map.put("cervical", "1");
	542	+ }else{
	543	+ map.put("cervical", "2");
	544	+ map.put("cervicalOther", data.getCervical());
	545	+ }
	546	+ }
	547	+
	548	+ if(StringUtils.isNotEmpty(data.getUterus())){
	549	+ if("未见异常".equals(data.getUterus())){
	550	+ map.put("uterus", "1");
	551	+ }else{
	552	+ map.put("uterus", "2");
	553	+ map.put("uterusOther", data.getUterus());
	554	+ }
	555	+ }
	556	+
	557	+ if(StringUtils.isNotEmpty(data.getFujian())){
	558	+ if("未见异常".equals(data.getFujian())){
	559	+ map.put("fujian", "1");
	560	+ }else{
	561	+ map.put("fujian", "2");
	562	+ map.put("fujianOther", data.getFujian());
	563	+ }
	564	+ }
	565	+
	566	+ /* 辅助检查 */
	567	+ if(StringUtils.isNotEmpty(data.getXhdb())){
	568	+ map.put("xhdb", data.getXhdb());
	569	+ }
	570	+ if(StringUtils.isNotEmpty(data.getBxbjs())){
	571	+ map.put("bxbjs", data.getBxbjs());
	572	+ }
	573	+ if(StringUtils.isNotEmpty(data.getPlatelet())) {
	574	+ map.put("platelet", data.getPlatelet());
	575	+ }
	576	+ if(StringUtils.isNotEmpty(data.getChgOther())) {
	577	+ map.put("chgOther", data.getChgOther());
	578	+ }
	579	+ if(StringUtils.isNotEmpty(data.getNdb())) {
	580	+ map.put("ndb", data.getNdb());
	581	+ }
	582	+ if(StringUtils.isNotEmpty(data.getNt())) {
	583	+ map.put("nt", data.getNt());
	584	+ }
	585	+ if(StringUtils.isNotEmpty(data.getUrineKetone())) {
	586	+ map.put("urineKetone", data.getUrineKetone());
	587	+ }
	588	+ if(StringUtils.isNotEmpty(data.getBld())) {
	589	+ map.put("bld", data.getBld());
	590	+ }
	591	+ if(StringUtils.isNotEmpty(data.getNcgOther())) {
	592	+ map.put("ncgOther", data.getNcgOther());
	593	+ }
	594	+
	595	+ if(StringUtils.isNotEmpty(data.getAbo())) {
	596	+ map.put("abo", FunvCommonUtil.getBaseicConfigByid(data.getAbo(), basicConfigService));
	597	+ }
	598	+ if(StringUtils.isNotEmpty(data.getRh())) {
	599	+ map.put("rh", FunvCommonUtil.checkYiGan(data.getRh()));
	600	+ }
	601	+ if(StringUtils.isNotEmpty(data.getBloodSugar())) {
	602	+ map.put("bloodSugar", data.getBloodSugar());
	603	+ }
	604	+ if(StringUtils.isNotEmpty(data.getXqgbzam())) {
	605	+ map.put("xqgbzam", data.getXqgbzam());
	606	+ }
	607	+ if(StringUtils.isNotEmpty(data.getXqgczam())) {
	608	+ map.put("xqgczam", data.getXqgczam());
	609	+ }
	610	+ if(StringUtils.isNotEmpty(data.getAlbumin())) {
	611	+ map.put("albumin", data.getAlbumin());
	612	+ }
	613	+ if(StringUtils.isNotEmpty(data.getTotalBilirubin())) {
	614	+ map.put("totalBilirubin", data.getTotalBilirubin());
	615	+ }
	616	+ if(StringUtils.isNotEmpty(data.getJhBilirubin())) {
	617	+ map.put("jhBilirubin", data.getJhBilirubin());
	618	+ }
	619	+ if(StringUtils.isNotEmpty(data.getBg())) {
	620	+ map.put("bg", FunvCommonUtil.checkYiGan(data.getBg()));
	621	+ }
	622	+ if(StringUtils.isNotEmpty(data.getYgbmky())) {
	623	+ map.put("ygbmky", FunvCommonUtil.checkYiGan(data.getYgbmky()));
	624	+ }
	625	+ if(StringUtils.isNotEmpty(data.getYgbmkt())) {
	626	+ map.put("ygbmkt", FunvCommonUtil.checkYiGan(data.getYgbmkt()));
	627	+ }
	628	+ if(StringUtils.isNotEmpty(data.getYgeky())) {
	629	+ map.put("ygeky", FunvCommonUtil.checkYiGan(data.getYgeky()));
	630	+ }
	631	+ if(StringUtils.isNotEmpty(data.getYgekt())) {
	632	+ map.put("ygekt", FunvCommonUtil.checkYiGan(data.getYgekt()));
	633	+ }
	634	+ if(StringUtils.isNotEmpty(data.getYghxkt())) {
	635	+ map.put("yghxkt", FunvCommonUtil.checkYiGan(data.getYghxkt()));
	636	+ }
	637	+ if(StringUtils.isNotEmpty(data.getXqjq())) {
	638	+ map.put("xqjq", data.getXqjq());
	639	+ }
	640	+ if(StringUtils.isNotEmpty(data.getXnsd())) {
	641	+ map.put("xnsd", data.getXnsd());
	642	+ }
	643	+ if(StringUtils.isNotEmpty(data.getSyjg())) {
	644	+ if (StringUtils.isNotEmpty(data.getSyjg())){
	645	+ if (data.getSyjg().equals("yin")) {
	646	+ map.put("syjg", "1");
	647	+ }
	648	+ if (data.getSyjg().equals("yang")) {
	649	+ map.put("syjg", "2");
	650	+ }
	651	+ }
	652	+ }
	653	+ if(StringUtils.isNotEmpty(data.getHivkt())) {
	654	+ if (StringUtils.isNotEmpty(data.getHivkt())){
	655	+ if (data.getHivkt().equals("yin")) {
	656	+ map.put("hivkt", "1");
	657	+ }
	658	+ if (data.getHivkt().equals("yang")) {
	659	+ map.put("hivkt", "2");
	660	+ }
	661	+ }
	662	+ }
	663	+
	664	+ String ydfmw = "";
	665	+ String ydqjd = "";
	666	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getYdfmw())) {
	667	+ Map ydfmwMap = JsonUtil.str2Obj(data.getYdfmw(), Map.class);
	668	+ ydfmw = ResolveUtils.replaceYDFMW(ydfmwMap, 1);
	669	+ ydqjd = ResolveUtils.replaceYDFMW(ydfmwMap, 2);
	670	+ }
	671	+
	672	+ if(StringUtils.isNotEmpty(ydfmw)) {
	673	+ List<String> ydfmwList = new ArrayList<>();
	674	+
	675	+ if(ydfmw.contains("滴虫")){
	676	+ ydfmwList.add("2");
	677	+ }
	678	+ if(ydfmw.contains("假丝酵母菌")){
	679	+ ydfmwList.add("3");
	680	+ }
	681	+ if(ydfmw.contains("其他")){
	682	+ ydfmwList.add("4");
	683	+
	684	+ ydfmw = ydfmw.replace("滴虫","");
	685	+ ydfmw = ydfmw.replace("假丝酵母菌","");
	686	+ ydfmw = ydfmw.replace("其他","");
	687	+ ydfmw = ydfmw.replace(",", "");
	688	+ map.put("ydfmwOther", ydfmw.substring(ydfmw.indexOf("其他")+2,ydfmw.length()));
	689	+ }
	690	+
	691	+ if (CollectionUtils.isEmpty(ydfmwList)) {
	692	+ ydfmwList.add("1");//未见异常
	693	+ }
	694	+ map.put("pastHistory", jws);
	695	+
	696	+ map.put("ydfmw", ydfmwList);
	697	+ }
	698	+ if(StringUtils.isNotEmpty(ydqjd)) {
	699	+ ydqjd = FunvCommonUtil.getBaseicConfigByid(ydqjd, basicConfigService);
	700	+ if("Ⅰ度".equals(ydqjd)){
	701	+ map.put("ydqjd", "1");
	702	+ }
	703	+ if("Ⅱ度".equals(ydqjd)){
	704	+ map.put("ydqjd", "2");
	705	+ }
	706	+ if("Ⅲ度".equals(ydqjd)){
	707	+ map.put("ydqjd", "3");
	708	+ }
	709	+ if("Ⅳ度".equals(ydqjd)){
	710	+ map.put("ydqjd", "4");
	711	+ }
	712	+ }
	713	+ if(StringUtils.isNotEmpty(data.getbChao())) {
	714	+ map.put("bChao", data.getbChao());
	715	+ }
	716	+
	717	+ if (data.getNextCheckTime() != null) {
	718	+ Calendar nextCheck = Calendar.getInstance();
	719	+ nextCheck.setTime(data.getNextCheckTime());
	720	+ int yYear = nextCheck.get(Calendar.YEAR);
	721	+ map.put("sYear", String.valueOf(yYear));
	722	+ int yMonth = nextCheck.get(Calendar.MONTH);
	723	+ map.put("sMonth", String.valueOf(yMonth));
	724	+ int yDay = nextCheck.get(Calendar.DAY_OF_MONTH);
	725	+ map.put("sDay", String.valueOf(yDay));
	726	+ }
	727	+
483	728	return map;
484	729	}
485	730
...	...	@@ -638,7 +883,7 @@
638	883	map.put("prodTime", UnitUtils.unitSplice(data.getProdTime(), UnitConstants.CI));
639	884	map.put("delivery", UnitUtils.unitSplice(data.getDelivery(), UnitConstants.CI));
640	885	map.put("planedProd", UnitUtils.unitSplice(data.getPlanedProd(), UnitConstants.CI));
641		- map.put("neoDeathTodo",data.getNeoDeathTodo());
	886	+ map.put("neoDeathTodo", data.getNeoDeathTodo());
642	887	map.put("yinchan", UnitUtils.unitSplice(data.getYinchan(), UnitConstants.CI));
643	888	map.put("gongwaiyun", UnitUtils.unitSplice(data.getGongwaiyun(), UnitConstants.CI));
644	889	//流产
...	...	@@ -2250,7 +2495,7 @@
2250	2495	}
2251	2496
2252	2497	model.setNextCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
2253		- model.setHighRisk(checkModel.getHighRisk() == null ? "否" : checkModel.getHighRisk() == 1 ? "是" : "否");
	2498	+ model.setHighRisk(checkModel.getHighRisk() == null ? "否" : checkModel.getHighRisk() == 1 ? "是" : "否");
2254	2499	model.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
2255	2500
2256	2501