jiangjiazhi / regional-platform

Commit c537861722bd9cf942029b503fe92b036c860f72

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

导出word字段更名

Showing 8 changed files with 519 additions and 48 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-operate-api/pom.xml
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/resources/license.xml
platform-sync-data/platform-sync-data.iml
pom.xml

...	...	@@ -25,9 +25,9 @@
25	25	private String neoDeathTodo;
26	26	//出生缺陷儿备注
27	27	private String birthDefectTodo;
28		- //新生儿死亡备注
	28	+ //新生儿死亡
29	29	private Integer neoDeath;
30		- //出生缺陷儿备注
	30	+ //出生缺陷儿
31	31	private Integer birthDefect;
32	32	//预产期
33	33	private Date dueDate;

...	...	@@ -22,6 +22,12 @@
22	22	<!--<artifactId>commons-httpclient</artifactId>-->
23	23	<!--</dependency>-->
24	24	<dependency>
	25	+ <groupId>com.aspose</groupId>
	26	+ <artifactId>aspose-words</artifactId>
	27	+ <version>5.18</version>
	28	+ </dependency>
	29	+
	30	+ <dependency>
25	31	<groupId>com.lyms.core</groupId>
26	32	<artifactId>platform-common</artifactId>
27	33	<version>${project.version}</version>

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.aspose.words.*;
3	4	import com.lyms.platform.common.annotation.TokenRequired;
4	5	import com.lyms.platform.common.base.BaseController;
5	6	import com.lyms.platform.common.result.BaseObjectResponse;
6	7
7	8
8	9
...	...	@@ -9,15 +10,20 @@
9	10	import org.springframework.web.bind.annotation.*;
10	11
11	12	import javax.servlet.http.HttpServletRequest;
	13	+import javax.servlet.http.HttpServletResponse;
	14	+import java.awt.*;
	15	+import java.io.IOException;
	16	+import java.io.InputStream;
	17	+import java.util.List;
	18	+import java.util.Map;
12	19
13	20	/**
14		- *
15	21	* 所有查看页面接口
16		- *
	22	+ * <p>
17	23	* Created by Administrator on 2017/1/16 0016.
18	24	*/
19	25	@Controller
20		-public class ViewController extends BaseController{
	26	+public class ViewController extends BaseController {
21	27
22	28	@Autowired
23	29	private ViewFacade viewFacade;
24	30
25	31
26	32
27	33
28	34
29	35
30	36
31	37
32	38
33	39
34	40
35	41
36	42
37	43
38	44
39	45
40	46
41	47
42	48
43	49
44	50
45	51
46	52
47	53
48	54
...	...	@@ -25,127 +31,315 @@
25	31
26	32	/**
27	33	* 查询初诊接口
	34	+ *
28	35	* @param id
29	36	* @param request
30	37	* @return
31	38	*/
32		- @RequestMapping(value = "/findAntExChuData",method = RequestMethod.GET)
	39	+ @RequestMapping(value = "/findAntExChuData", method = RequestMethod.GET)
33	40	@ResponseBody
34	41	@TokenRequired
35		- public BaseObjectResponse findAntExChuData(@RequestParam("id")String id,
36		- HttpServletRequest request){
	42	+ public BaseObjectResponse findAntExChuData(@RequestParam("id") String id,
	43	+ HttpServletRequest request) {
37	44	BaseObjectResponse br = viewFacade.findAntExChu(id);
38	45	return br;
39	46	}
40	47
	48	+ /**
	49	+ * 下载word
	50	+ *
	51	+ * @param id
	52	+ * @param request
	53	+ * @return
	54	+ */
	55	+ @RequestMapping(value = "/downExChuData", method = RequestMethod.GET)
	56	+ // @TokenRequired
	57	+ public void downExChuData(@RequestParam("id") String id, HttpServletRequest request, HttpServletResponse response) {
	58	+ Map<String, Object> map = viewFacade.exChuData(id);
41	59
	60	+ if (map == null) {
	61	+ return;
	62	+ }
	63	+
	64	+ try {
	65	+ // 验证License
	66	+ if (!getLicense()) {
	67	+ return;
	68	+ }
	69	+ Document doc = null;// 原始word路径
	70	+ try {
	71	+ doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部).dotx");
	72	+ specialData(doc, map);//特殊数据
	73	+ markData(doc, map);//普通数据
	74	+ sendToBrowser(doc, "导出", "doc", true, response);
	75	+ } catch (Exception e) {
	76	+ e.printStackTrace();
	77	+ }
	78	+ response.flushBuffer();
	79	+ } catch (IOException e) {
	80	+ e.printStackTrace();
	81	+ }
	82	+ }
	83	+
	84	+ public void specialData(Document doc, Map<String, Object> data) {
	85	+ try {
	86	+ DocumentBuilder builder = new DocumentBuilder(doc);
	87	+ builder.moveToBookmark("pastHistory");
	88	+ List<String> pastHistory = (List<String>) data.get("pastHistory");
	89	+ data.remove("pastHistory");
	90	+ for (String ph : pastHistory) {
	91	+ markFrameText(builder, ph);
	92	+ markPubText(builder, "/");
	93	+ }
	94	+ builder.moveToBookmark("familyHistory");
	95	+ List<String> familyHistory = (List<String>) data.get("familyHistory");
	96	+ data.remove("familyHistory");
	97	+ for (String fh : familyHistory) {
	98	+ markFrameText(builder, fh);
	99	+ markPubText(builder, "/");
	100	+ }
	101	+ builder.moveToBookmark("personalHistory");
	102	+ List<String> personalHistory = (List<String>) data.get("personalHistory");
	103	+ data.remove("personalHistory");
	104	+ for (String ph : personalHistory) {
	105	+ markFrameText(builder, ph);
	106	+ markPubText(builder, "/");
	107	+ }
	108	+ builder.moveToBookmark("fksxHistory");
	109	+ List<String> fksxHistory = (List<String>) data.get("fksxHistory");
	110	+ data.remove("fksxHistory");
	111	+ for (String fh : fksxHistory) {
	112	+ markFrameText(builder, fh);
	113	+ markPubText(builder, "/");
	114	+ }
	115	+ } catch (Exception e) {
	116	+ e.printStackTrace();
	117	+ }
	118	+
	119	+ }
	120	+
	121	+ public void markData(Document doc, Map<String, Object> data) {
	122	+ try {
	123	+ for (Map.Entry<String, Object> m : data.entrySet()) {
	124	+ BookmarkCollection books = doc.getRange().getBookmarks();
	125	+ Bookmark bookmark = books.get(m.getKey());
	126	+ if (bookmark != null) {
	127	+ bookmark.setText(String.valueOf(m.getValue()));
	128	+ }
	129	+ }
	130	+ } catch (Exception e) {
	131	+ e.printStackTrace();
	132	+ }
	133	+ }
	134	+
42	135	/**
	136	+ * 添加特殊字
	137	+ *
	138	+ * @param builder
	139	+ * @param text
	140	+ */
	141	+ public void markFrameText(DocumentBuilder builder, String text) {
	142	+ try {
	143	+ builder.getFont().getBorder().clearFormatting();
	144	+ builder.getFont().getBorder().clearFormatting();
	145	+ builder.getFont().getBorder().setColor(Color.black);
	146	+ builder.getFont().getBorder().setLineWidth(1);
	147	+ builder.getFont().getBorder().setLineStyle(LineStyle.SINGLE);
	148	+ builder.getFont().getBorder().setDistanceFromText(2);
	149	+ // builder.getFont().getBorder().setShadow(true);
	150	+ builder.write(text);
	151	+ } catch (Exception e) {
	152	+ e.printStackTrace();
	153	+ }
	154	+ }
	155	+
	156	+ /**
	157	+ * 添加普通字
	158	+ *
	159	+ * @param builder
	160	+ * @param text
	161	+ */
	162	+ public void markPubText(DocumentBuilder builder, String text) {
	163	+ try {
	164	+ builder.getFont().getBorder().clearFormatting();
	165	+ builder.write(text);
	166	+ } catch (Exception e) {
	167	+ e.printStackTrace();
	168	+ }
	169	+ }
	170	+
	171	+ /**
	172	+ * 获取license
	173	+ *
	174	+ * @return
	175	+ */
	176	+ public static boolean getLicense() {
	177	+ boolean result = false;
	178	+ try {
	179	+ InputStream is = ViewController.class.getClassLoader().getResourceAsStream("license.xml");
	180	+ License aposeLic = new License();
	181	+ aposeLic.setLicense(is);
	182	+ result = true;
	183	+ } catch (Exception e) {
	184	+ e.printStackTrace();
	185	+ }
	186	+ return result;
	187	+ }
	188	+
	189	+ /**
	190	+ * 向客户端发送数据
	191	+ *
	192	+ * @param doc com.aspose.words.Document
	193	+ * @param docName 返回客户端的word文件名
	194	+ * @param formatType DOC 或者 DOCX
	195	+ * @param openNewWindow 在线打开或者下载
	196	+ * @param response
	197	+ * @throws Exception
	198	+ */
	199	+ private void sendToBrowser(Document doc, String docName, String formatType,
	200	+ boolean openNewWindow, HttpServletResponse response)
	201	+ throws Exception {
	202	+ String extension = formatType;
	203	+
	204	+ if (formatType.equals("WML") \|\| formatType.equals("FOPC"))
	205	+ extension = "XML";
	206	+
	207	+ String fileName = docName + "." + extension;
	208	+
	209	+ if (openNewWindow)
	210	+ response.setHeader("content-disposition", "attachment; filename="
	211	+ + fileName);
	212	+ else
	213	+ response.addHeader("content-disposition", "inline; filename="
	214	+ + fileName);
	215	+
	216	+ if ("doc".equals(formatType)) {
	217	+ response.setContentType("application/msword");
	218	+ doc.save(response.getOutputStream(), SaveFormat.DOC);
	219	+ } else if ("docx".equals(formatType)) {
	220	+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
	221	+ doc.save(response.getOutputStream(), SaveFormat.DOCX);
	222	+ } else if ("pdf".equals(formatType)) {
	223	+ response.setContentType("application/pdf");
	224	+ doc.save(response.getOutputStream(), SaveFormat.PDF);
	225	+ }
	226	+ }
	227	+
	228	+ /**
43	229	* 查询复诊接口
	230	+ *
44	231	* @param id
45	232	* @param request
46	233	* @return
47	234	*/
48		- @RequestMapping(value = "/findAntenatalExaminationData",method = RequestMethod.GET)
	235	+ @RequestMapping(value = "/findAntenatalExaminationData", method = RequestMethod.GET)
49	236	@ResponseBody
50	237	@TokenRequired
51		- public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id")String id,
52		- HttpServletRequest request){
	238	+ public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id") String id,
	239	+ HttpServletRequest request) {
53	240
54	241	return viewFacade.findAntenatalExamination(id);
55	242	}
56	243
57	244	/**
58	245	* 查看分娩接口
	246	+ *
59	247	* @param id
60	248	* @return
61	249	*/
62	250	@RequestMapping(value = "/findMatDeliverData", method = RequestMethod.GET)
63	251	@ResponseBody
64	252	@TokenRequired
65		- public BaseObjectResponse findMatDeliverData(@RequestParam("id")String id){
	253	+ public BaseObjectResponse findMatDeliverData(@RequestParam("id") String id) {
66	254	return viewFacade.findMatDeliverData(id);
67	255	}
68	256
69	257	/**
70	258	* 查看孕妇建档信息
71		- * @param id 孕妇ID
	259	+ *
	260	+ * @param id 孕妇ID
72	261	* @return
73	262	*/
74	263	@RequestMapping(value = "/findPatientData", method = RequestMethod.GET)
75	264	@ResponseBody
76	265	@TokenRequired
77		- public BaseObjectResponse findPatientData(@RequestParam("id")String id){
	266	+ public BaseObjectResponse findPatientData(@RequestParam("id") String id) {
78	267	return viewFacade.findPatientData(id);
79	268	}
80	269
81	270	/**
82	271	* 查看产后复查
	272	+ *
83	273	* @param id
84	274	* @return
85	275	*/
86	276	@RequestMapping(value = "/findPostReviewData", method = RequestMethod.GET)
87	277	@ResponseBody
88	278	@TokenRequired
89		- public BaseObjectResponse findPostReviewData(@RequestParam("id")String id){
	279	+ public BaseObjectResponse findPostReviewData(@RequestParam("id") String id) {
90	280	return viewFacade.findPostReviewData(id);
91	281	}
92	282
93	283	/**
94	284	* 查看出院小结
	285	+ *
95	286	* @param id
96	287	* @return
97	288	*/
98	289	@RequestMapping(value = "/findDischargeAbstractData", method = RequestMethod.GET)
99	290	@ResponseBody
100	291	@TokenRequired
101		- public BaseObjectResponse findDischargeAbstractData(@RequestParam("id")String id){
	292	+ public BaseObjectResponse findDischargeAbstractData(@RequestParam("id") String id) {
102	293	return viewFacade.findDischargeAbstractData(id);
103	294	}
104	295
105	296	/**
106	297	* 查看终止妊娠
	298	+ *
107	299	* @param id
108	300	* @return
109	301	*/
110	302	@RequestMapping(value = "/findStopPregData", method = RequestMethod.GET)
111	303	@ResponseBody
112	304	@TokenRequired
113		- public BaseObjectResponse findStopPregData(@RequestParam("id")String id){
	305	+ public BaseObjectResponse findStopPregData(@RequestParam("id") String id) {
114	306	return viewFacade.findStopPregData(id);
115	307	}
116	308
117	309
118		-
119	310	/**
120	311	* 儿童查看页面
	312	+ *
121	313	* @param id 儿童建档id
122	314	* @return
123	315	*/
124	316	@RequestMapping(value = "/getBabyBuildPageInfo/{id}", method = RequestMethod.GET)
125	317	@ResponseBody
126		- public BaseObjectResponse getBabyBuildInfo(@PathVariable("id")String id){
	318	+ public BaseObjectResponse getBabyBuildInfo(@PathVariable("id") String id) {
127	319	return viewFacade.getBabyBuildInfo(id);
128	320	}
129	321
130	322	/**
131	323	* 儿童检查查看页面
	324	+ *
132	325	* @param id 儿童建档id
133	326	* @return
134	327	*/
135	328	@RequestMapping(value = "/getBabyCheckPageInfo/{id}", method = RequestMethod.GET)
136	329	@ResponseBody
137		- public BaseObjectResponse getBabyCheckPageInfo(@PathVariable("id")String id){
	330	+ public BaseObjectResponse getBabyCheckPageInfo(@PathVariable("id") String id) {
138	331	return viewFacade.getBabyCheckPageInfo(id);
139	332	}
140	333
141	334	/**
142	335	* 妇女查看页面
	336	+ *
143	337	* @param id
144	338	* @return
145	339	*/
146	340	@RequestMapping(value = "/getResidentsPageById/{id}", method = RequestMethod.GET)
147	341	@ResponseBody
148		- public BaseObjectResponse getResidentsPageById(@PathVariable("id")String id){
	342	+ public BaseObjectResponse getResidentsPageById(@PathVariable("id") String id) {
149	343	return viewFacade.getResidentsPageById(id);
150	344	}
151	345

...	...	@@ -241,6 +241,245 @@
241	241	}
242	242
243	243	/**
	244	+ * 导出初诊
	245	+ *
	246	+ * @param id
	247	+ * @return
	248	+ */
	249	+ public Map<String, Object> exChuData(String id) {
	250	+
	251	+ BaseObjectResponse br = new BaseObjectResponse();
	252	+
	253	+ if (org.apache.commons.lang.StringUtils.isEmpty(id)) {
	254	+ br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	255	+ br.setErrormsg("id为空");
	256	+ return null;
	257	+ }
	258	+
	259	+ AntExChuModel data = antExService.findOne(id);
	260	+ if (data == null \|\| data.getYn() == YnEnums.NO.getId()) {
	261	+ br.setErrorcode(ErrorCodeConstants.NO_DATA);
	262	+ br.setErrormsg("没有查询到数据");
	263	+ return null;
	264	+ }
	265	+
	266	+
	267	+ if (org.apache.commons.lang.StringUtils.isEmpty(data.getParentId())) {
	268	+ br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	269	+ br.setErrormsg("数据异常");
	270	+ return null;
	271	+ }
	272	+
	273	+ Patients patients = patientsService.findOnePatientById(data.getParentId());
	274	+ if (patients == null \|\| patients.getYn() == YnEnums.NO.getId()) {
	275	+ br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	276	+ br.setErrormsg("孕妇信息不存在");
	277	+ return null;
	278	+ }
	279	+
	280	+ Map<String, Object> map = new HashMap<>();
	281	+ /* 基本信息 */
	282	+ //孕妇基本信息
	283	+ map.put("id", data.getId());
	284	+ map.put("name", patients.getUsername());
	285	+ Calendar calendar = Calendar.getInstance();
	286	+ map.put("inYear", calendar.get(Calendar.YEAR));
	287	+ map.put("inMonth", calendar.get(Calendar.MONTH) + 1);
	288	+ map.put("inDay", calendar.get(Calendar.DAY_OF_MONTH));
	289	+ map.put("inWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), calendar.getTime()));
	290	+ map.put("age", DateUtil.getAge(patients.getBirth()));
	291	+
	292	+ if (StringUtils.isNotEmpty(patients.getAddressRegister())) {
	293	+ map.put("addr", patients.getAddressRegister());
	294	+ }
	295	+ if (patients.getHusbandName() != null) {
	296	+ map.put("hName", patients.getHusbandName());
	297	+ }
	298	+ if (patients.getHusbandBirth() != null) {
	299	+ map.put("hAge", DateUtil.getAge(patients.getHusbandBirth()));
	300	+ }
	301	+
	302	+ if (StringUtils.isNotEmpty(patients.getHusbandPhone())) {
	303	+ map.put("hPhone", patients.getHusbandPhone());
	304	+ }
	305	+
	306	+
	307	+ map.put("yNum", data.getPregnancyTimes());
	308	+ map.put("fNum", data.getDelivery());
	309	+ map.put("pNum", data.getPlanedProd());
	310	+ if (data.getLastMenses() != null) {
	311	+ int mYear = data.getLastMenses().getYear();
	312	+ map.put("mYear", String.valueOf(mYear));
	313	+ int mMonth = data.getLastMenses().getMonth();
	314	+ map.put("mMonth", String.valueOf(mMonth));
	315	+ int mDay = data.getLastMenses().getDay();
	316	+ map.put("mDay", String.valueOf(mDay));
	317	+ }
	318	+
	319	+ if (patients.getDueDate() != null) {
	320	+ int yYear = patients.getDueDate().getYear();
	321	+ map.put("yYear", String.valueOf(yYear));
	322	+ int yMonth = patients.getDueDate().getMonth();
	323	+ map.put("yMonth", String.valueOf(yMonth));
	324	+ int yDay = patients.getDueDate().getDay();
	325	+ map.put("yDay", String.valueOf(yDay));
	326	+ }
	327	+
	328	+ //既往史
	329	+ String pastHistory = "";
	330	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPastHistory())) {
	331	+ Map map1 = JsonUtil.jkstr2Obj(data.getPastHistory(), Map.class);
	332	+ pastHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
	333	+ }
	334	+
	335	+ List<String> jws = new ArrayList<>();
	336	+
	337	+ if (pastHistory.contains("先心病") \|\| pastHistory.contains("冠心病") \|\| pastHistory.contains("心绞痛") \|\| pastHistory.contains("心肌缺血") \|\| pastHistory.contains("心内膜炎") \|\| pastHistory.contains("心肌病") \|\| pastHistory.contains("心肌炎") \|\| pastHistory.contains("心包炎")) {//2心脏病
	338	+ jws.add("2");
	339	+ }
	340	+ if (pastHistory.contains("肾病") \|\| pastHistory.contains("肾炎") \|\| pastHistory.contains("肾结石") \|\| pastHistory.contains("肾小球肾病") \|\| pastHistory.contains("肾小球肾炎") \|\| pastHistory.contains("IgA肾病")) {//3肾脏疾病
	341	+ jws.add("3");
	342	+ }
	343	+ if (pastHistory.contains("大三阳") \|\| pastHistory.contains("小三阳") \|\| pastHistory.contains("乙型肝炎") \|\| pastHistory.contains("丙型肝炎") \|\| pastHistory.contains("乙肝表面抗原阳性") \|\| pastHistory.contains("乙型肝炎表面抗原携带者") \|\| pastHistory.contains("乙型病毒性肝炎") \|\| pastHistory.contains("丙型病毒性肝炎") \|\| pastHistory.contains("急性肝炎") \|\| pastHistory.contains("慢性肝炎")) {//4肝脏疾病
	344	+ jws.add("4");
	345	+ }
	346	+ if (pastHistory.contains("高血压")) {//5高血压
	347	+ jws.add("5");
	348	+ }
	349	+ if (pastHistory.contains("贫血")) {//6贫血
	350	+ jws.add("6");
	351	+ }
	352	+ if (pastHistory.contains("糖尿病")) {//7糖尿病
	353	+ jws.add("7");
	354	+ }
	355	+ if (pastHistory.contains("其他[")) {//8其他
	356	+ map.put("jwsOther", pastHistory.substring(pastHistory.indexOf("其他")+3, pastHistory.length() - 1));
	357	+ }
	358	+ if (CollectionUtils.isEmpty(jws)) {
	359	+ jws.add("1");//无
	360	+ }
	361	+ map.put("pastHistory", jws);
	362	+
	363	+ //家族史
	364	+ String familyHistory = "";
	365	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getFamilyHistory())) {
	366	+ Map map1 = JsonUtil.jkstr2Obj(data.getFamilyHistory(), Map.class);
	367	+ familyHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
	368	+ }
	369	+
	370	+ List<String> jzs = new ArrayList<>();
	371	+ if (familyHistory.contains("遗传性疾病史")) {//1遗传性疾病史
	372	+ jzs.add("1");
	373	+ }
	374	+ if (familyHistory.contains("精神疾病史")) {//2精神疾病史
	375	+ jzs.add("2");
	376	+ }
	377	+
	378	+ familyHistory = familyHistory.replace("遗传性疾病史", "");
	379	+ familyHistory = familyHistory.replace("精神疾病史", "");
	380	+ familyHistory = familyHistory.replace("，，", "，");
	381	+
	382	+ if (StringUtils.isNotEmpty(familyHistory)) {//3其他
	383	+ map.put("jzsOther", familyHistory);
	384	+ }
	385	+ map.put("familyHistory", jzs);
	386	+
	387	+ //个人史
	388	+ String personalHistory = "";
	389	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPersonalHistory())) {
	390	+ Map map1 = JsonUtil.jkstr2Obj(data.getPersonalHistory(), Map.class);
	391	+ personalHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
	392	+ }
	393	+ List<String> grs = new ArrayList<>();
	394	+ if (personalHistory.contains("")) {//1吸烟
	395	+ grs.add("1");
	396	+ }
	397	+ if (personalHistory.contains("")) {//2饮酒
	398	+ grs.add("2");
	399	+ }
	400	+ if (personalHistory.contains("")) {//3服用药物
	401	+ grs.add("3");
	402	+ }
	403	+ if (personalHistory.contains("")) {//4接触有毒有害物质
	404	+ grs.add("4");
	405	+ }
	406	+ if (personalHistory.contains("")) {//5接触放射线
	407	+ grs.add("5");
	408	+ }
	409	+ personalHistory = personalHistory.replace("吸烟", "");
	410	+ personalHistory = personalHistory.replace("饮酒", "");
	411	+ personalHistory = personalHistory.replace("服用药物", "");
	412	+ personalHistory = personalHistory.replace("接触有毒有害物质", "");
	413	+ personalHistory = personalHistory.replace("接触放射线", "");
	414	+ personalHistory = personalHistory.replace("，", "");
	415	+ map.put("personalHistory", grs);
	416	+ map.put("grsOther", personalHistory);
	417	+
	418	+ //孕妇手术史
	419	+ List<String> sss = new ArrayList<>();
	420	+ //妇科手术史
	421	+ String fksxHistory = "";
	422	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getFksxHistory())) {
	423	+ Map map1 = JsonUtil.jkstr2Obj(data.getFksxHistory(), Map.class);
	424	+ fksxHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService);
	425	+ }
	426	+
	427	+ if ("无".equals(fksxHistory)) {
	428	+ sss.add("1");
	429	+ } else {
	430	+ map.put("fksss", fksxHistory);//妇科手术史内容
	431	+ sss.add("2");
	432	+ }
	433	+ map.put("fksxHistory", sss);
	434	+ if (data.getAbortion() != null) {
	435	+ String abortion = UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI);
	436	+ map.put("abortion",abortion);
	437	+ }
	438	+ if (data.getStillbirth() != null) {
	439	+ map.put("stillbirth", UnitUtils.unitSplice(data.getStillbirth(), UnitConstants.CI));
	440	+ }
	441	+ if (data.getStillChan() != null) {
	442	+ map.put("stillChan", UnitUtils.unitSplice(data.getStillChan(), UnitConstants.CI));
	443	+ }
	444	+ if (data.getNeoDeath() != null) {
	445	+ map.put("neoDeath", UnitUtils.unitSplice(data.getNeoDeath(), UnitConstants.CI));
	446	+ }
	447	+ if (data.getBirthDefect() != null) {
	448	+ map.put("birthDefect", UnitUtils.unitSplice(data.getBirthDefect(), UnitConstants.CI));
	449	+ }
	450	+ if(StringUtils.isNotEmpty(data.getHeight())){
	451	+ map.put("stature", data.getHeight());
	452	+ }
	453	+ if(StringUtils.isNotEmpty(data.getWeight())){
	454	+ map.put("weight", data.getWeight());
	455	+ }
	456	+
	457	+ // 血压
	458	+ String ssy = "";
	459	+ String szy = "";
	460	+ Map<String, String> chBpMap = JsonUtil.getMap(data.getBp());
	461	+ if (MapUtils.isNotEmpty(chBpMap)) {
	462	+ ssy = chBpMap.get("ssy");
	463	+ szy = chBpMap.get("szy");
	464	+ }
	465	+ map.put("shrblo", ssy);
	466	+ map.put("diablo", szy);
	467	+ //体重指数 yqWeight
	468	+ if (StringUtils.isNotEmpty(data.getYqWeight()) && StringUtils.isNotEmpty(data.getHeight())) {
	469	+ try {
	470	+ //体重指数计算规则：孕前体重/身高（单位米）的平方
	471	+ java.text.DecimalFormat df = new java.text.DecimalFormat("#.#");
	472	+ double tzzs = Double.parseDouble(data.getYqWeight()) / Math.pow(Double.parseDouble(data.getHeight()) / 100, 2);
	473	+ System.out.println("tzzs==================" + tzzs);
	474	+ map.put("tzzs", df.format(tzzs));
	475	+ } catch (Exception e) {
	476	+ ExceptionUtils.catchException(e, "体重指数计算错误");
	477	+ }
	478	+ }
	479	+ return map;
	480	+ }
	481	+
	482	+ /**
244	483	* 初诊查询
245	484	*
246	485	* @param id
...	...	@@ -281,6 +520,7 @@
281	520	/* 基本信息 */
282	521	//孕妇基本信息
283	522	map.put("id", data.getId());
	523	+
284	524	map.put("birthDefectTodo", data.getBirthDefectTodo());
285	525	map.put("diagnosisOther", data.getDiagnosisOther());
286	526	map.put("username", patients.getUsername());
287	527
288	528
...	...	@@ -403,14 +643,14 @@
403	643	abortion.append("（");
404	644
405	645	if (data.getAbortionZR() != null) {
406		- abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI );
	646	+ abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI);
407	647	}
408	648
409		- if(data.getAbortionRG() != null){
	649	+ if (data.getAbortionRG() != null) {
410	650	abortion.append(" 人工:" + data.getAbortionRG() + UnitConstants.CI + "");
411	651	}
412	652
413		- if(data.getYaowu()!=null){
	653	+ if (data.getYaowu() != null) {
414	654	abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + "");
415	655	}
416	656	abortion.append("）");
417	657
...	...	@@ -449,11 +689,11 @@
449	689
450	690	map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM));
451	691
452		- if(StringUtils.isNotEmpty(data.getGonggaoSelect())){
	692	+ if (StringUtils.isNotEmpty(data.getGonggaoSelect())) {
453	693	map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGonggaoSelect()));
454	694	}
455	695
456		- if(StringUtils.isNotEmpty(data.getGonggaoType())){
	696	+ if (StringUtils.isNotEmpty(data.getGonggaoType())) {
457	697	map.put("gongGaoType", GongJingEnums.getHengZhiNameById(data.getGonggaoType()));
458	698	}
459	699	map.put("fuwei", UnitUtils.unitSplice(data.getFuwei(), UnitConstants.CM));
460	700
461	701
462	702
463	703
464	704
465	705
466	706
467	707
468	708
...	...	@@ -491,42 +731,42 @@
491	731	heartRate = String.valueOf(a);
492	732	}
493	733	join = placenta.getJoin();
494		- if(StringUtils.isNotEmpty(placenta.getXlwz())){
	734	+ if (StringUtils.isNotEmpty(placenta.getXlwz())) {
495	735	placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(placenta.getXlwz()));
496	736	}
497		- if(StringUtils.isNotEmpty(placenta.getGjwz())){
	737	+ if (StringUtils.isNotEmpty(placenta.getGjwz())) {
498	738	placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(placenta.getGjwz()));
499	739	}
500	740
501		- if(StringUtils.isNotEmpty(placenta.getGjyd())){
	741	+ if (StringUtils.isNotEmpty(placenta.getGjyd())) {
502	742	placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(placenta.getGjyd()));
503	743	}
504	744
505		- if(StringUtils.isNotEmpty(placenta.getTm())){
	745	+ if (StringUtils.isNotEmpty(placenta.getTm())) {
506	746	placetaMap.put("tm", TaiShuEnums.getTmNameById(placenta.getTm()));
507	747	}
508	748
509		- if(StringUtils.isNotEmpty(placenta.getYdjc())){
	749	+ if (StringUtils.isNotEmpty(placenta.getYdjc())) {
510	750	placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(placenta.getYdjc()));
511	751	}
512	752
513		- if(placenta.getGjkd()!=null){
	753	+ if (placenta.getGjkd() != null) {
514	754	placetaMap.put("gjkd", placenta.getGjkd());
515	755	}
516	756
517		- if(placenta.getGjrs()!=null){
	757	+ if (placenta.getGjrs() != null) {
518	758	placetaMap.put("gjrs", placenta.getGjrs());
519	759	}
520	760
521		- if(StringUtils.isNotEmpty(placenta.getGjwzOther())){
	761	+ if (StringUtils.isNotEmpty(placenta.getGjwzOther())) {
522	762	placetaMap.put("gjwzOther", placenta.getGjwzOther());
523	763	}
524	764
525		- if(StringUtils.isNotEmpty(placenta.getGjydOther())){
	765	+ if (StringUtils.isNotEmpty(placenta.getGjydOther())) {
526	766	placetaMap.put("gjydOther", placenta.getGjydOther());
527	767	}
528	768
529		- if(placenta.getYszs()!=null){
	769	+ if (placenta.getYszs() != null) {
530	770	placetaMap.put("yszs", placenta.getYszs());
531	771	}
532	772	}
533	773
534	774
535	775
536	776
537	777
538	778
539	779
540	780
541	781
...	...	@@ -550,42 +790,42 @@
550	790	fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation");
551	791	join = placenta.get("join");
552	792
553		- if(StringUtils.isNotEmpty(placenta.get("xlwz"))){
	793	+ if (StringUtils.isNotEmpty(placenta.get("xlwz"))) {
554	794	placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(placenta.get("xlwz")));
555	795	}
556		- if(StringUtils.isNotEmpty(placenta.get("gjwz"))){
	796	+ if (StringUtils.isNotEmpty(placenta.get("gjwz"))) {
557	797	placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(placenta.get("gjwz")));
558	798	}
559	799
560		- if(StringUtils.isNotEmpty(placenta.get("gjyd"))){
	800	+ if (StringUtils.isNotEmpty(placenta.get("gjyd"))) {
561	801	placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(placenta.get("gjyd")));
562	802	}
563	803
564		- if(StringUtils.isNotEmpty(placenta.get("ydjc"))){
	804	+ if (StringUtils.isNotEmpty(placenta.get("ydjc"))) {
565	805	placetaMap.put("tm", TaiShuEnums.getTmNameById(placenta.get("ydjc")));
566	806	}
567	807
568		- if(StringUtils.isNotEmpty(placenta.get("ydjc"))){
	808	+ if (StringUtils.isNotEmpty(placenta.get("ydjc"))) {
569	809	placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(placenta.get("ydjc")));
570	810	}
571	811
572		- if(placenta.get("gjkd")!=null){
	812	+ if (placenta.get("gjkd") != null) {
573	813	placetaMap.put("gjkd", placenta.get("gjkd"));
574	814	}
575	815
576		- if(placenta.get("gjrs")!=null){
	816	+ if (placenta.get("gjrs") != null) {
577	817	placetaMap.put("gjrs", placenta.get("gjrs"));
578	818	}
579	819
580		- if(StringUtils.isNotEmpty(placenta.get("gjwzOther"))){
	820	+ if (StringUtils.isNotEmpty(placenta.get("gjwzOther"))) {
581	821	placetaMap.put("gjwzOther", placenta.get("gjwzOther "));
582	822	}
583	823
584		- if(StringUtils.isNotEmpty(placenta.get("gjydOther"))){
	824	+ if (StringUtils.isNotEmpty(placenta.get("gjydOther"))) {
585	825	placetaMap.put("gjydOther", placenta.get("gjydOther"));
586	826	}
587	827
588		- if(placenta.get("yszs")!=null){
	828	+ if (placenta.get("yszs") != null) {
589	829	placetaMap.put("yszs", placenta.get("yszs"));
590	830	}
591	831	}
...	...	@@ -918,7 +1158,7 @@
918	1158
919	1159	Map<String, Object> map = new HashMap<>();
920	1160	map.put("id", data.getId());
921		- if(StringUtils.isNotEmpty(data.getFmType())){
	1161	+ if (StringUtils.isNotEmpty(data.getFmType())) {
922	1162	map.put("fmType", FmTypeEnums.getFmDzNameById(data.getFmType()));
923	1163	}
924	1164	map.put("fmAddr", data.getFmAddr());

...	...	@@ -34,6 +34,10 @@
34	34	private String edema;
35	35	//胎数
36	36	private String tireNumber;
	37	+ /**
	38	+ * 其他的诊断意见
	39	+ */
	40	+ private String diagnosisOther;
37	41	//胎数据
38	42	/* Double heartRate;
39	43	FetalPosition 胎方位
...	...	@@ -82,6 +86,14 @@
82	86	private int hasSieve;
83	87	private String cDueWeek;
84	88
	89	+ public String getDiagnosisOther() {
	90	+ return diagnosisOther;
	91	+ }
	92	+
	93	+ public void setDiagnosisOther(String diagnosisOther) {
	94	+ this.diagnosisOther = diagnosisOther;
	95	+ }
	96	+
85	97	public String getBarCode() {
86	98	return barCode;
87	99	}
88	100
...	...	@@ -135,9 +147,9 @@
135	147	setEdema(destModel.getEdema());
136	148	setParentId(destModel.getParentId());
137	149	setBarCode(destModel.getBarCode());
	150	+ setDiagnosisOther(destModel.getDiagnosisOther());
138	151	setUrineProtein(destModel.getUrineProtein());
139	152	setTreatmentOpinion(destModel.getTreatmentOpinion());
140		-
141	153	setAbdominalCircumference(destModel.getAbdominalCircumference());
142	154	setbChao(destModel.getbChao());
143	155	setBloodSugar(destModel.getBloodSugar());

	1	+<License>
	2	+ <Data>
	3	+ <Products>
	4	+ <Product>Aspose.Total for Java</Product>
	5	+ <Product>Aspose.Words for Java</Product>
	6	+ </Products>
	7	+ <EditionType>Enterprise</EditionType>
	8	+ <SubscriptionExpiry>20991231</SubscriptionExpiry>
	9	+ <LicenseExpiry>20991231</LicenseExpiry>
	10	+ <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
	11	+ </Data>
	12	+ <Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature>
	13	+</License>

...	...	@@ -9,6 +9,11 @@
9	9	<webroots>
10	10	<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
11	11	</webroots>
	12	+ <sourceRoots>
	13	+ <root url="file://$MODULE_DIR$/../platform-resource/resources" />
	14	+ <root url="file://$MODULE_DIR$/src/main/java" />
	15	+ <root url="file://$MODULE_DIR$/src/main/resources" />
	16	+ </sourceRoots>
12	17	</configuration>
13	18	</facet>
14	19	</component>

...	...	@@ -70,6 +70,7 @@
70	70	<systemPath>${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/lucene-core-3.6.0.jar</systemPath>
71	71	</dependency>
72	72
	73	+
73	74	<dependency>
74	75	<groupId>commons-httpclient</groupId>
75	76	<artifactId>commons-httpclient</artifactId>