jiangjiazhi / regional-platform

Commit fdad23be442288b3d76f803ec32010000f20cae3

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

查询号bug修改

Showing 6 changed files with 327 additions and 104 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.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
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java

...	...	@@ -6,9 +6,17 @@
6	6	public class Test {
7	7
8	8	public static void main(String[] args) {
9		- String a = "3.220.33";
10		- int b = a.lastIndexOf('.');
11		- System.out.println("-----:"+b);
	9	+ // String a = "3.220.33";
	10	+ // int b = a.lastIndexOf('.');
	11	+ // System.out.println("-----:"+b);
	12	+ // List<String> arrayList = new ArrayList<>();
	13	+ // arrayList.add(3,"aaa");
	14	+ // System.out.println(arrayList.size());
	15	+ String[] strs = new String[4];
	16	+ strs[0] = "111";
	17	+ strs[2] = "111";
	18	+ strs[3] = "111";
	19	+ strs[1] = "111";
12	20
13	21	// ConfirmedEnums [] strs = ConfirmedEnums.values();
14	22	// String vas = ConfirmedEnums.getTitle(1);
...	...	@@ -88,7 +96,7 @@
88	96	// }
89	97	// }
90	98
91		- System.out.println(39/20);
	99	+ System.out.println(39 / 20);
92	100	// String sql = "INSERT INTO LIS_REPORT_TBL( LIS_ID, TITLE) VALUES ('122', 'bbbb')";
93	101	// sql = sql.replaceFirst("\\(","(ID,");
94	102	//

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.common.base.BaseController;
6	6	import com.lyms.platform.common.base.LoginContext;
7	7	import com.lyms.platform.common.result.BaseObjectResponse;
	8	+import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
8	9	import com.lyms.platform.operate.web.facade.ViewFacade;
9	10	import org.springframework.beans.factory.annotation.Autowired;
10	11	import org.springframework.stereotype.Controller;
...	...	@@ -17,6 +18,7 @@
17	18	import java.io.InputStream;
18	19	import java.util.List;
19	20	import java.util.Map;
	21	+import java.util.List;
20	22
21	23	/**
22	24	* 所有查看页面接口
23	25
...	...	@@ -28,8 +30,9 @@
28	30
29	31	@Autowired
30	32	private ViewFacade viewFacade;
	33	+ @Autowired
	34	+ private AntenatalExaminationFacade antenatalExaminationFacade;
31	35
32		-
33	36	/**
34	37	* 查询初诊接口
35	38	*
36	39
37	40
...	...	@@ -47,18 +50,19 @@
47	50	}
48	51
49	52	/**
50		- * 下载word
	53	+ * 下载初诊word
51	54	*
52	55	* @param id
53	56	* @param request
54	57	* @return
55	58	*/
56	59	@RequestMapping(value = "/downExChuData", method = RequestMethod.GET)
57		- @TokenRequired
	60	+ // @TokenRequired
58	61	public void downExChuData(@RequestParam("id") String id, HttpServletRequest request, HttpServletResponse response) {
59	62	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
60	63
61		- Map<String, Object> map = viewFacade.exChuData(id, loginState.getId());
	64	+ // Map<String, Object> map = viewFacade.exChuData(id, loginState.getId());
	65	+ Map<String, Object> map = viewFacade.exChuData(id, 1000000185);
62	66
63	67	if (map == null) {
64	68	return;
...	...	@@ -83,6 +87,45 @@
83	87	e.printStackTrace();
84	88	}
85	89	}
	90	+
	91	+ /**
	92	+ * 下载复诊word
	93	+ *
	94	+ * @param id
	95	+ * @param request
	96	+ * @return
	97	+ */
	98	+ @RequestMapping(value = "/downExFuData", method = RequestMethod.GET)
	99	+ // @TokenRequired
	100	+ public void downExFuData(@RequestParam("id") String id,int num, HttpServletRequest request, HttpServletResponse response) {
	101	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	102	+
	103	+ Map<String, Object> map = viewFacade.exFuData(id, num);
	104	+
	105	+ if (map == null) {
	106	+ return;
	107	+ }
	108	+
	109	+ try {
	110	+ // 验证License
	111	+ if (!getLicense()) {
	112	+ return;
	113	+ }
	114	+ Document doc = null;// 原始word路径
	115	+ try {
	116	+ doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部).dotx");
	117	+ specialData(doc, map);//特殊数据
	118	+ markData(doc, map);//普通数据
	119	+ sendToBrowser(doc, "导出", "doc", true, response);
	120	+ } catch (Exception e) {
	121	+ e.printStackTrace();
	122	+ }
	123	+ response.flushBuffer();
	124	+ } catch (IOException e) {
	125	+ e.printStackTrace();
	126	+ }
	127	+ }
	128	+
86	129
87	130	public void specialData(Document doc, Map<String, Object> data) {
88	131	try {

...	...	@@ -23,9 +23,11 @@
23	23	import com.lyms.platform.query.*;
24	24	import org.apache.commons.collections.CollectionUtils;
25	25	import org.apache.commons.collections.MapUtils;
	26	+import org.apache.commons.collections.map.HashedMap;
26	27	import org.apache.commons.lang.StringUtils;
27	28	import org.apache.commons.lang.math.NumberUtils;
28	29	import org.springframework.beans.factory.annotation.Autowired;
	30	+import org.springframework.data.domain.Sort;
29	31	import org.springframework.stereotype.Component;
30	32
31	33	import java.util.*;
...	...	@@ -247,6 +249,126 @@
247	249	}
248	250
249	251	/**
	252	+ * 导出复诊查询
	253	+ *
	254	+ * @param id 复诊id
	255	+ * @param num 当前位置
	256	+ * @return
	257	+ */
	258	+ public Map<String, Object> exFuData(String id, int num) {
	259	+ Map<String, Object> map = new HashedMap();
	260	+ Patients patients = patientsService.findOnePatientById("");
	261	+
	262	+
	263	+ AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4];
	264	+
	265	+ AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id);
	266	+ if (num < 3) {
	267	+ exData[num - 1] = antenatalExaminationModel;
	268	+ } else {//全部
	269	+ String patientsId = antenatalExaminationModel.getParentId();
	270	+ AntExQuery antExQuery = new AntExQuery();
	271	+ antExQuery.setYn(YnEnums.YES.getId());
	272	+ antExQuery.setParentId(patientsId);
	273	+
	274	+ //复诊
	275	+ List<AntenatalExaminationModel> list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "checkDate"));
	276	+ exData[0] = list.get(0);
	277	+ exData[1] = list.get(1);
	278	+ exData[2] = list.get(2);
	279	+ exData[3] = list.get(3);
	280	+
	281	+ }
	282	+
	283	+ // Map<String, Object> map = new HashMap<>();
	284	+ for (int i = 0; i < exData.length; i++) {
	285	+ AntenatalExaminationModel data = exData[i];
	286	+ if (data == null) {
	287	+ continue;
	288	+ }
	289	+ String numStr = "";
	290	+ if (i == 0) {
	291	+ numStr = "one";
	292	+ } else if (i == 1) {
	293	+ numStr = "two";
	294	+ } else if (i == 2) {
	295	+ numStr = "thre";
	296	+ } else if (i == 3) {
	297	+ numStr = "four";
	298	+ }
	299	+
	300	+ if (data.getCheckDate() != null) {
	301	+ map.put(numStr + "checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate()));
	302	+ }
	303	+ map.put(numStr + "currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate()));
	304	+ if (StringUtils.isNotEmpty(data.getChiefComplaint())) {
	305	+ map.put(numStr + "chiefComplaint", data.getChiefComplaint());
	306	+ }
	307	+ if (data.getWeight() != null) {
	308	+ map.put(numStr + "weight", UnitUtils.unitSplice(data.getWeight(), UnitConstants.KG));
	309	+ }
	310	+ if (StringUtils.isNotEmpty(data.getGongGao())) {
	311	+ map.put(numStr + "gongGao", UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM));
	312	+ }
	313	+ if (StringUtils.isNotEmpty(data.getAbdominalCircumference())) {
	314	+ map.put(numStr + "abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM));
	315	+ }
	316	+ if (CollectionUtils.isNotEmpty(data.getTireData())) {
	317	+ StringBuffer fposiSb = new StringBuffer();
	318	+ StringBuffer hrateSb = new StringBuffer();
	319	+ for (Object temp : data.getTireData()) {
	320	+ Map<String, String> tire = JsonUtil.getMap(temp.toString());
	321	+ if (tire != null) {
	322	+ String heartRate = tire.get("heartRate");
	323	+ String fetalPosition = tire.get("fetalPosition");
	324	+ hrateSb.append(UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN) + "/");
	325	+ fposiSb.append(FetalPositionEnums.getTitle(fetalPosition) + "/");
	326	+ }
	327	+ }
	328	+ if (StringUtils.isNotEmpty(hrateSb.toString())) {
	329	+ map.put(numStr + "heartRate", hrateSb.toString());
	330	+ }
	331	+ if (StringUtils.isNotEmpty(fposiSb.toString())) {
	332	+ map.put(numStr + "fetalPosition", fposiSb.toString());
	333	+ }
	334	+ }
	335	+ Map<String, String> chBpMap = JsonUtil.getMap(data.getBp());
	336	+ if (MapUtils.isNotEmpty(chBpMap)) {
	337	+ if (StringUtils.isNotEmpty(chBpMap.get("ssy"))) {
	338	+ map.put(numStr + "ssy", chBpMap.get("ssy"));
	339	+ }
	340	+ if (StringUtils.isNotEmpty(chBpMap.get("szy"))) {
	341	+ map.put(numStr + "szy", chBpMap.get("szy"));
	342	+ }
	343	+ }
	344	+ if (StringUtils.isNotEmpty(data.getHemoglobin())) {
	345	+ map.put(numStr + "hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL));
	346	+ }
	347	+ if (StringUtils.isNotEmpty(data.getUrineProtein())) {
	348	+ map.put(numStr + "urineProtein", data.getUrineProtein());
	349	+
	350	+ }
	351	+ if (StringUtils.isNotEmpty(data.getbChao())) {
	352	+ map.put(numStr + "bChao", data.getbChao());
	353	+
	354	+ }
	355	+ if (data.getNextCheckTime() != null) {
	356	+ map.put(numStr + "nextCheckTime", DateUtil.getyyyy_MM_dd(data.getNextCheckTime()));
	357	+ }
	358	+ String checkDoctor = "";
	359	+
	360	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getCheckDoctor())) {
	361	+ Users users = usersService.getUsers(Integer.parseInt(data.getCheckDoctor()));
	362	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	363	+ checkDoctor = users.getName();
	364	+ }
	365	+ }
	366	+ map.put(numStr + "checkDoctor", checkDoctor);
	367	+ }
	368	+ return map;
	369	+ }
	370	+
	371	+ /**
250	372	* 导出初诊
251	373	*
252	374	* @param id
253	375
...	...	@@ -261,7 +383,13 @@
261	383	br.setErrormsg("id为空");
262	384	return null;
263	385	}
	386	+ String hospitId = autoMatchFacade.getHospitalId(userId);
264	387
	388	+ AntExChuQuery antExQuery = new AntExChuQuery();
	389	+ antExQuery.setParentId(id);
	390	+ antExQuery.setHospitalId(hospitId);
	391	+ List<AntExChuModel> antExChuModels = antExService.queryAntExChu(antExQuery);
	392	+
265	393	AntExChuModel data = antExService.findOne(id);
266	394	if (data == null \|\| data.getYn() == YnEnums.NO.getId()) {
267	395	br.setErrorcode(ErrorCodeConstants.NO_DATA);
...	...	@@ -286,7 +414,7 @@
286	414	Map<String, Object> map = new HashMap<>();
287	415	/* 基本信息 */
288	416	//孕妇基本信息
289		- map.put("id", data.getId());
	417	+ map.put("parentId", data.getParentId());
290	418	map.put("name", patients.getUsername());
291	419	Calendar calendar = Calendar.getInstance();
292	420	map.put("inYear", calendar.get(Calendar.YEAR));
293	421
...	...	@@ -316,10 +444,10 @@
316	444	if (data.getLastMenses() != null) {
317	445	Calendar lastCal = Calendar.getInstance();
318	446	lastCal.setTime(data.getLastMenses());
319		- int mYear = lastCal.get(Calendar.YEAR);
	447	+ int mYear = lastCal.get(Calendar.YEAR);
320	448	map.put("mYear", String.valueOf(mYear));
321		- int mMonth =lastCal.get(Calendar.MONTH);
322		- map.put("mMonth", String.valueOf(mMonth));
	449	+ int mMonth = lastCal.get(Calendar.MONTH);
	450	+ map.put("mMonth", String.valueOf(mMonth + 1));
323	451	int mDay = lastCal.get(Calendar.DAY_OF_MONTH);
324	452	map.put("mDay", String.valueOf(mDay));
325	453	}
...	...	@@ -330,7 +458,7 @@
330	458	int yYear = dueCal.get(Calendar.YEAR);
331	459	map.put("yYear", String.valueOf(yYear));
332	460	int yMonth = dueCal.get(Calendar.MONTH);
333		- map.put("yMonth", String.valueOf(yMonth));
	461	+ map.put("yMonth", String.valueOf(yMonth + 1));
334	462	int yDay = dueCal.get(Calendar.DAY_OF_MONTH);
335	463	map.put("yDay", String.valueOf(yDay));
336	464	}
337	465
338	466
339	467
340	468
341	469
342	470
343	471
344	472
345	473
346	474
347	475
348	476
349	477
350	478
351	479
352	480
353	481
354	482
355	483
356	484
357	485
358	486
359	487
360	488
361	489
362	490
363	491
364	492
365	493
366	494
367	495
368	496
369	497
370	498
371	499
372	500
373	501
374	502
...	...	@@ -488,148 +616,148 @@
488	616	}
489	617
490	618
491		- if(StringUtils.isNotEmpty(data.getHeart())){
492		- if("未见异常".equals(data.getHeart())){
	619	+ if (StringUtils.isNotEmpty(data.getHeart())) {
	620	+ if ("未见异常".equals(data.getHeart())) {
493	621	map.put("heart", "1");
494		- }else{
	622	+ } else {
495	623	map.put("heart", "2");
496	624	map.put("heartOther", data.getHeart());
497	625	}
498	626	}
499	627
500		- if(StringUtils.isNotEmpty(data.getLungs())){
501		- if("未见异常".equals(data.getLungs())){
	628	+ if (StringUtils.isNotEmpty(data.getLungs())) {
	629	+ if ("未见异常".equals(data.getLungs())) {
502	630	map.put("lungs", "1");
503		- }else{
	631	+ } else {
504	632	map.put("lungs", "2");
505	633	map.put("lungsOther", data.getLungs());
506	634	}
507	635	}
508	636
509		- if(StringUtils.isNotEmpty(data.getVulva())){
510		- if("未见异常".equals(data.getVulva())){
	637	+ if (StringUtils.isNotEmpty(data.getVulva())) {
	638	+ if ("未见异常".equals(data.getVulva())) {
511	639	map.put("vulva", "1");
512		- }else{
	640	+ } else {
513	641	map.put("vulva", "2");
514	642	map.put("vulvaOther", data.getVulva());
515	643	}
516	644	}
517	645
518		- if(StringUtils.isNotEmpty(data.getVagina())){
519		- if("未见异常".equals(data.getVagina())){
	646	+ if (StringUtils.isNotEmpty(data.getVagina())) {
	647	+ if ("未见异常".equals(data.getVagina())) {
520	648	map.put("vagina", "1");
521		- }else{
	649	+ } else {
522	650	map.put("vagina", "2");
523	651	map.put("vaginaOther", data.getVagina());
524	652	}
525	653	}
526	654
527		- if(StringUtils.isNotEmpty(data.getCervical())){
528		- if("未见异常".equals(data.getCervical())){
	655	+ if (StringUtils.isNotEmpty(data.getCervical())) {
	656	+ if ("未见异常".equals(data.getCervical())) {
529	657	map.put("cervical", "1");
530		- }else{
	658	+ } else {
531	659	map.put("cervical", "2");
532	660	map.put("cervicalOther", data.getCervical());
533	661	}
534	662	}
535	663
536		- if(StringUtils.isNotEmpty(data.getUterus())){
537		- if("未见异常".equals(data.getUterus())){
	664	+ if (StringUtils.isNotEmpty(data.getUterus())) {
	665	+ if ("未见异常".equals(data.getUterus())) {
538	666	map.put("uterus", "1");
539		- }else{
	667	+ } else {
540	668	map.put("uterus", "2");
541	669	map.put("uterusOther", data.getUterus());
542	670	}
543	671	}
544	672
545		- if(StringUtils.isNotEmpty(data.getFujian())){
546		- if("未见异常".equals(data.getFujian())){
	673	+ if (StringUtils.isNotEmpty(data.getFujian())) {
	674	+ if ("未见异常".equals(data.getFujian())) {
547	675	map.put("fujian", "1");
548		- }else{
	676	+ } else {
549	677	map.put("fujian", "2");
550	678	map.put("fujianOther", data.getFujian());
551	679	}
552	680	}
553	681
554	682	/* 辅助检查 */
555		- if(StringUtils.isNotEmpty(data.getXhdb())){
556		- map.put("xhdb", data.getXhdb());
557		- }
558		- if(StringUtils.isNotEmpty(data.getBxbjs())){
	683	+ if (StringUtils.isNotEmpty(data.getXhdb())) {
	684	+ map.put("xhdb", data.getXhdb());
	685	+ }
	686	+ if (StringUtils.isNotEmpty(data.getBxbjs())) {
559	687	map.put("bxbjs", data.getBxbjs());
560	688	}
561		- if(StringUtils.isNotEmpty(data.getPlatelet())) {
	689	+ if (StringUtils.isNotEmpty(data.getPlatelet())) {
562	690	map.put("platelet", data.getPlatelet());
563	691	}
564		- if(StringUtils.isNotEmpty(data.getChgOther())) {
	692	+ if (StringUtils.isNotEmpty(data.getChgOther())) {
565	693	map.put("chgOther", data.getChgOther());
566	694	}
567		- if(StringUtils.isNotEmpty(data.getNdb())) {
	695	+ if (StringUtils.isNotEmpty(data.getNdb())) {
568	696	map.put("ndb", data.getNdb());
569	697	}
570		- if(StringUtils.isNotEmpty(data.getNt())) {
	698	+ if (StringUtils.isNotEmpty(data.getNt())) {
571	699	map.put("nt", data.getNt());
572	700	}
573		- if(StringUtils.isNotEmpty(data.getUrineKetone())) {
	701	+ if (StringUtils.isNotEmpty(data.getUrineKetone())) {
574	702	map.put("urineKetone", data.getUrineKetone());
575	703	}
576		- if(StringUtils.isNotEmpty(data.getBld())) {
	704	+ if (StringUtils.isNotEmpty(data.getBld())) {
577	705	map.put("bld", data.getBld());
578	706	}
579		- if(StringUtils.isNotEmpty(data.getNcgOther())) {
	707	+ if (StringUtils.isNotEmpty(data.getNcgOther())) {
580	708	map.put("ncgOther", data.getNcgOther());
581	709	}
582	710
583		- if(StringUtils.isNotEmpty(data.getAbo())) {
	711	+ if (StringUtils.isNotEmpty(data.getAbo())) {
584	712	map.put("abo", FunvCommonUtil.getBaseicConfigByid(data.getAbo(), basicConfigService));
585	713	}
586		- if(StringUtils.isNotEmpty(data.getRh())) {
	714	+ if (StringUtils.isNotEmpty(data.getRh())) {
587	715	map.put("rh", FunvCommonUtil.checkYiGan(data.getRh()));
588	716	}
589		- if(StringUtils.isNotEmpty(data.getBloodSugar())) {
	717	+ if (StringUtils.isNotEmpty(data.getBloodSugar())) {
590	718	map.put("bloodSugar", data.getBloodSugar());
591	719	}
592		- if(StringUtils.isNotEmpty(data.getXqgbzam())) {
	720	+ if (StringUtils.isNotEmpty(data.getXqgbzam())) {
593	721	map.put("xqgbzam", data.getXqgbzam());
594	722	}
595		- if(StringUtils.isNotEmpty(data.getXqgczam())) {
	723	+ if (StringUtils.isNotEmpty(data.getXqgczam())) {
596	724	map.put("xqgczam", data.getXqgczam());
597	725	}
598		- if(StringUtils.isNotEmpty(data.getAlbumin())) {
	726	+ if (StringUtils.isNotEmpty(data.getAlbumin())) {
599	727	map.put("albumin", data.getAlbumin());
600	728	}
601		- if(StringUtils.isNotEmpty(data.getTotalBilirubin())) {
	729	+ if (StringUtils.isNotEmpty(data.getTotalBilirubin())) {
602	730	map.put("totalBilirubin", data.getTotalBilirubin());
603	731	}
604		- if(StringUtils.isNotEmpty(data.getJhBilirubin())) {
	732	+ if (StringUtils.isNotEmpty(data.getJhBilirubin())) {
605	733	map.put("jhBilirubin", data.getJhBilirubin());
606	734	}
607		- if(StringUtils.isNotEmpty(data.getBg())) {
	735	+ if (StringUtils.isNotEmpty(data.getBg())) {
608	736	map.put("bg", FunvCommonUtil.checkYiGan(data.getBg()));
609	737	}
610		- if(StringUtils.isNotEmpty(data.getYgbmky())) {
	738	+ if (StringUtils.isNotEmpty(data.getYgbmky())) {
611	739	map.put("ygbmky", FunvCommonUtil.checkYiGan(data.getYgbmky()));
612	740	}
613		- if(StringUtils.isNotEmpty(data.getYgbmkt())) {
	741	+ if (StringUtils.isNotEmpty(data.getYgbmkt())) {
614	742	map.put("ygbmkt", FunvCommonUtil.checkYiGan(data.getYgbmkt()));
615	743	}
616		- if(StringUtils.isNotEmpty(data.getYgeky())) {
	744	+ if (StringUtils.isNotEmpty(data.getYgeky())) {
617	745	map.put("ygeky", FunvCommonUtil.checkYiGan(data.getYgeky()));
618	746	}
619		- if(StringUtils.isNotEmpty(data.getYgekt())) {
	747	+ if (StringUtils.isNotEmpty(data.getYgekt())) {
620	748	map.put("ygekt", FunvCommonUtil.checkYiGan(data.getYgekt()));
621	749	}
622		- if(StringUtils.isNotEmpty(data.getYghxkt())) {
	750	+ if (StringUtils.isNotEmpty(data.getYghxkt())) {
623	751	map.put("yghxkt", FunvCommonUtil.checkYiGan(data.getYghxkt()));
624	752	}
625		- if(StringUtils.isNotEmpty(data.getXqjq())) {
	753	+ if (StringUtils.isNotEmpty(data.getXqjq())) {
626	754	map.put("xqjq", data.getXqjq());
627	755	}
628		- if(StringUtils.isNotEmpty(data.getXnsd())) {
	756	+ if (StringUtils.isNotEmpty(data.getXnsd())) {
629	757	map.put("xnsd", data.getXnsd());
630	758	}
631		- if(StringUtils.isNotEmpty(data.getSyjg())) {
632		- if (StringUtils.isNotEmpty(data.getSyjg())){
	759	+ if (StringUtils.isNotEmpty(data.getSyjg())) {
	760	+ if (StringUtils.isNotEmpty(data.getSyjg())) {
633	761	if (data.getSyjg().equals("yin")) {
634	762	map.put("syjg", "1");
635	763	}
...	...	@@ -638,8 +766,8 @@
638	766	}
639	767	}
640	768	}
641		- if(StringUtils.isNotEmpty(data.getHivkt())) {
642		- if (StringUtils.isNotEmpty(data.getHivkt())){
	769	+ if (StringUtils.isNotEmpty(data.getHivkt())) {
	770	+ if (StringUtils.isNotEmpty(data.getHivkt())) {
643	771	if (data.getHivkt().equals("yin")) {
644	772	map.put("hivkt", "1");
645	773	}
646	774
647	775
648	776
649	777
650	778
...	...	@@ -657,23 +785,23 @@
657	785	ydqjd = ResolveUtils.replaceYDFMW(ydfmwMap, 2);
658	786	}
659	787
660		- if(StringUtils.isNotEmpty(ydfmw)) {
	788	+ if (StringUtils.isNotEmpty(ydfmw)) {
661	789	List<String> ydfmwList = new ArrayList<>();
662	790
663		- if(ydfmw.contains("滴虫")){
	791	+ if (ydfmw.contains("滴虫")) {
664	792	ydfmwList.add("2");
665	793	}
666		- if(ydfmw.contains("假丝酵母菌")){
	794	+ if (ydfmw.contains("假丝酵母菌")) {
667	795	ydfmwList.add("3");
668	796	}
669		- if(ydfmw.contains("其他")){
	797	+ if (ydfmw.contains("其他")) {
670	798	ydfmwList.add("4");
671	799
672		- ydfmw = ydfmw.replace("滴虫","");
673		- ydfmw = ydfmw.replace("假丝酵母菌","");
674		- ydfmw = ydfmw.replace("其他","");
	800	+ ydfmw = ydfmw.replace("滴虫", "");
	801	+ ydfmw = ydfmw.replace("假丝酵母菌", "");
	802	+ ydfmw = ydfmw.replace("其他", "");
675	803	ydfmw = ydfmw.replace(",", "");
676		- map.put("ydfmwOther", ydfmw.substring(ydfmw.indexOf("其他")+2,ydfmw.length()));
	804	+ map.put("ydfmwOther", ydfmw.substring(ydfmw.indexOf("其他") + 2, ydfmw.length()));
677	805	}
678	806
679	807	if (CollectionUtils.isEmpty(ydfmwList)) {
680	808
681	809
682	810
683	811
684	812
...	...	@@ -683,22 +811,22 @@
683	811
684	812	map.put("ydfmw", ydfmwList);
685	813	}
686		- if(StringUtils.isNotEmpty(ydqjd)) {
	814	+ if (StringUtils.isNotEmpty(ydqjd)) {
687	815	ydqjd = FunvCommonUtil.getBaseicConfigByid(ydqjd, basicConfigService);
688		- if("Ⅰ度".equals(ydqjd)){
	816	+ if ("Ⅰ度".equals(ydqjd)) {
689	817	map.put("ydqjd", "1");
690	818	}
691		- if("Ⅱ度".equals(ydqjd)){
	819	+ if ("Ⅱ度".equals(ydqjd)) {
692	820	map.put("ydqjd", "2");
693	821	}
694		- if("Ⅲ度".equals(ydqjd)){
	822	+ if ("Ⅲ度".equals(ydqjd)) {
695	823	map.put("ydqjd", "3");
696	824	}
697		- if("Ⅳ度".equals(ydqjd)){
	825	+ if ("Ⅳ度".equals(ydqjd)) {
698	826	map.put("ydqjd", "4");
699	827	}
700	828	}
701		- if(StringUtils.isNotEmpty(data.getbChao())) {
	829	+ if (StringUtils.isNotEmpty(data.getbChao())) {
702	830	map.put("bChao", data.getbChao());
703	831	}
704	832
705	833
706	834
...	...	@@ -708,21 +836,21 @@
708	836	referralApplyOrderQuery.setParentId(data.getParentId());
709	837	referralApplyOrderQuery.setOutHospitalId(hospital);
710	838	List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
711		- if(CollectionUtils.isNotEmpty(orderModels)){
	839	+ if (CollectionUtils.isNotEmpty(orderModels)) {
712	840	//转院必要性
713	841	if (NumberUtils.isNumber(hospital)) {
714	842	try {
715	843	Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(hospital));
716	844	if (null != zhuanc1) {
717		- map.put("zhuancl",zhuanc1.getName());
718		- map.put("isZhuan","2");
	845	+ map.put("zhuancl", zhuanc1.getName());
	846	+ map.put("isZhuan", "2");
719	847	}
720	848	} catch (Exception e) {
721	849
722	850	}
723	851	}
724		- }else{
725		- map.put("isZhuan","1");
	852	+ } else {
	853	+ map.put("isZhuan", "1");
726	854	}
727	855
728	856
...	...	@@ -732,7 +860,7 @@
732	860	int yYear = nextCheck.get(Calendar.YEAR);
733	861	map.put("sYear", String.valueOf(yYear));
734	862	int yMonth = nextCheck.get(Calendar.MONTH);
735		- map.put("sMonth", String.valueOf(yMonth));
	863	+ map.put("sMonth", String.valueOf(yMonth + 1));
736	864	int yDay = nextCheck.get(Calendar.DAY_OF_MONTH);
737	865	map.put("sDay", String.valueOf(yDay));
738	866	}
739	867
...	...	@@ -1011,11 +1139,11 @@
1011	1139	}
1012	1140
1013	1141	if (placenta.getGjkd() != null) {
1014		- placetaMap.put("gjkd", placenta.getGjkd());
	1142	+ placetaMap.put("gjkd", UnitUtils.unitSplice(placenta.getGjkd(), UnitConstants.CM));
1015	1143	}
1016	1144
1017	1145	if (placenta.getGjrs() != null) {
1018		- placetaMap.put("gjrs", placenta.getGjrs());
	1146	+ placetaMap.put("gjrs", UnitUtils.unitSplice(placenta.getGjrs(), UnitConstants.BF));
1019	1147	}
1020	1148
1021	1149	if (StringUtils.isNotEmpty(placenta.getGjwzOther())) {
...	...	@@ -1027,7 +1155,7 @@
1027	1155	}
1028	1156
1029	1157	if (placenta.getYszs() != null) {
1030		- placetaMap.put("yszs", placenta.getYszs());
	1158	+ placetaMap.put("yszs", UnitUtils.unitSplice(placenta.getYszs(), UnitConstants.CM));
1031	1159	}
1032	1160	}
1033	1161

...	...	@@ -85,20 +85,39 @@
85	85	//是否有产筛
86	86	private int hasSieve;
87	87	private String cDueWeek;
	88	+ //宫高选择
	89	+ private String gongGaoSelect;
	90	+ //宫高类型
	91	+ private String gongGaoType;
	92	+ //早孕期病毒检测
	93	+ private String zyqbdjc;
	94	+ //nt检查
	95	+ private String ntjc;
	96	+ //产前筛查
	97	+ private String cjsc;
	98	+ // //胎儿系统排畸b吵
	99	+ private String textpjbc;
	100	+ //75gODTT
	101	+ private String s75gdgtt;
	102	+ // //甲状腺功能
	103	+ private String jzxgn;
88	104
89		- // //早孕期病毒检测
90		- private String zyqbdjc;
91		-// //nt检查
92		- private String ntjc;
93		- //产前筛查
94		- private String cjsc;
95		-// //胎儿系统排畸b吵
96		- private String textpjbc;
97		- //75gODTT
98		- private String s75gdgtt;
99		-// //甲状腺功能
100		- private String jzxgn;
	105	+ public String getGongGaoSelect() {
	106	+ return gongGaoSelect;
	107	+ }
101	108
	109	+ public void setGongGaoSelect(String gongGaoSelect) {
	110	+ this.gongGaoSelect = gongGaoSelect;
	111	+ }
	112	+
	113	+ public String getGongGaoType() {
	114	+ return gongGaoType;
	115	+ }
	116	+
	117	+ public void setGongGaoType(String gongGaoType) {
	118	+ this.gongGaoType = gongGaoType;
	119	+ }
	120	+
102	121	public String getZyqbdjc() {
103	122	return zyqbdjc;
104	123	}
...	...	@@ -205,6 +224,8 @@
205	224
206	225	@Override
207	226	public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
	227	+ setGongGaoType(destModel.getGongGaoType());
	228	+ setGongGaoSelect(destModel.getGongGaoSelect());
208	229	setEdema(destModel.getEdema());
209	230	setParentId(destModel.getParentId());
210	231	setBarCode(destModel.getBarCode());
211	232
212	233
...	...	@@ -228,13 +249,13 @@
228	249	} catch (Exception e) {
229	250	}
230	251	try {
231		- if(null!=destModel.getNextCheckTime()){
	252	+ if (null != destModel.getNextCheckTime()) {
232	253	setNextCheckTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
233	254	}
234		- if(null!=destModel.getCheckDate()){
	255	+ if (null != destModel.getCheckDate()) {
235	256	setCheckDate(DateUtil.getyyyy_MM_dd(destModel.getCheckDate()));
236	257	}
237		- }catch (Exception e){
	258	+ } catch (Exception e) {
238	259	}
239	260	setcDueWeek(destModel.getcDueWeek());
240	261	setChiefComplaint(destModel.getChiefComplaint());

...	...	@@ -161,8 +161,11 @@
161	161	private String checkTime;
162	162	//下次产检时间
163	163	private String nextCheckTime;
	164	+ //宫高选择
	165	+ private String gongGaoSelect;
	166	+ //宫高类型
	167	+ private String gongGaoType;
164	168
165		-
166	169	/**
167	170	* -------------辅助检查结果录入------------------
168	171	**/
...	...	@@ -268,6 +271,22 @@
268	271	return neoDeath;
269	272	}
270	273
	274	+ public String getGongGaoSelect() {
	275	+ return gongGaoSelect;
	276	+ }
	277	+
	278	+ public void setGongGaoSelect(String gongGaoSelect) {
	279	+ this.gongGaoSelect = gongGaoSelect;
	280	+ }
	281	+
	282	+ public String getGongGaoType() {
	283	+ return gongGaoType;
	284	+ }
	285	+
	286	+ public void setGongGaoType(String gongGaoType) {
	287	+ this.gongGaoType = gongGaoType;
	288	+ }
	289	+
271	290	public void setNeoDeath(Integer neoDeath) {
272	291	this.neoDeath = neoDeath;
273	292	}
...	...	@@ -1028,6 +1047,8 @@
1028	1047	setBarCode(antExChuModel.getBarCode());
1029	1048	setId(antExChuModel.getId());
1030	1049	setParentId(antExChuModel.getParentId());
	1050	+ setGongGaoSelect(antExChuModel.getGonggaoSelect());
	1051	+ setGongGaoType(antExChuModel.getGonggaoType());
1031	1052	// //早孕期病毒检测
1032	1053	// private String zyqbdjc;
1033	1054	// //nt检查
...	...	@@ -1088,6 +1109,7 @@
1088	1109	setBirthDefectTodo(antExChuModel.getBirthDefectTodo());
1089	1110	setHeart(antExChuModel.getHeart());
1090	1111	setLungs(antExChuModel.getLungs());
	1112	+
1091	1113	setVulva(antExChuModel.getVulva());
1092	1114	setVagina(antExChuModel.getVagina());
1093	1115	setCervical(antExChuModel.getCervical());

...	...	@@ -13,6 +13,7 @@
13	13	public static final String MMHG = " mmHg";
14	14	public static final String CIFEN = " 次/分";
15	15	public static final String GL = " g/L";
	16	+ public static final String BF = " %";
16	17	public static final String MMOLL = " mmol/L";
17	18	public static final String CI = " 次";
18	19	public static final String UL = " U/L";