From c537861722bd9cf942029b503fe92b036c860f72 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 19 Jun 2017 13:38:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAword=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/AntExChuModel.java | 4 +- platform-operate-api/pom.xml | 6 + .../operate/web/controller/ViewController.java | 232 ++++++++++++++-- .../platform/operate/web/facade/ViewFacade.java | 292 +++++++++++++++++++-- .../web/result/AntenatalExaminationResult.java | 14 +- .../src/main/resources/license.xml | 13 + platform-sync-data/platform-sync-data.iml | 5 + pom.xml | 1 + 8 files changed, 519 insertions(+), 48 deletions(-) create mode 100644 platform-operate-api/src/main/resources/license.xml diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 5519d38..c148b68 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -25,9 +25,9 @@ public class AntExChuModel extends BaseModel { private String neoDeathTodo; //出生缺陷儿备注 private String birthDefectTodo; - //新生儿死亡备注 + //新生儿死亡 private Integer neoDeath; - //出生缺陷儿备注 + //出生缺陷儿 private Integer birthDefect; //预产期 private Date dueDate; diff --git a/platform-operate-api/pom.xml b/platform-operate-api/pom.xml index 9dc0e99..327ad47 100644 --- a/platform-operate-api/pom.xml +++ b/platform-operate-api/pom.xml @@ -22,6 +22,12 @@ + com.aspose + aspose-words + 5.18 + + + com.lyms.core platform-common ${project.version} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index aad6b1a..5ccbb40 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.aspose.words.*; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseObjectResponse; @@ -9,15 +10,20 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.awt.*; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Map; /** - * * 所有查看页面接口 - * + *

* Created by Administrator on 2017/1/16 0016. */ @Controller -public class ViewController extends BaseController{ +public class ViewController extends BaseController { @Autowired private ViewFacade viewFacade; @@ -25,127 +31,315 @@ public class ViewController extends BaseController{ /** * 查询初诊接口 + * * @param id * @param request * @return */ - @RequestMapping(value = "/findAntExChuData",method = RequestMethod.GET) + @RequestMapping(value = "/findAntExChuData", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findAntExChuData(@RequestParam("id")String id, - HttpServletRequest request){ + public BaseObjectResponse findAntExChuData(@RequestParam("id") String id, + HttpServletRequest request) { BaseObjectResponse br = viewFacade.findAntExChu(id); return br; } + /** + * 下载word + * + * @param id + * @param request + * @return + */ + @RequestMapping(value = "/downExChuData", method = RequestMethod.GET) + // @TokenRequired + public void downExChuData(@RequestParam("id") String id, HttpServletRequest request, HttpServletResponse response) { + Map map = viewFacade.exChuData(id); + + if (map == null) { + return; + } + + try { + // 验证License + if (!getLicense()) { + return; + } + Document doc = null;// 原始word路径 + try { + doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部).dotx"); + specialData(doc, map);//特殊数据 + markData(doc, map);//普通数据 + sendToBrowser(doc, "导出", "doc", true, response); + } catch (Exception e) { + e.printStackTrace(); + } + response.flushBuffer(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void specialData(Document doc, Map data) { + try { + DocumentBuilder builder = new DocumentBuilder(doc); + builder.moveToBookmark("pastHistory"); + List pastHistory = (List) data.get("pastHistory"); + data.remove("pastHistory"); + for (String ph : pastHistory) { + markFrameText(builder, ph); + markPubText(builder, "/"); + } + builder.moveToBookmark("familyHistory"); + List familyHistory = (List) data.get("familyHistory"); + data.remove("familyHistory"); + for (String fh : familyHistory) { + markFrameText(builder, fh); + markPubText(builder, "/"); + } + builder.moveToBookmark("personalHistory"); + List personalHistory = (List) data.get("personalHistory"); + data.remove("personalHistory"); + for (String ph : personalHistory) { + markFrameText(builder, ph); + markPubText(builder, "/"); + } + builder.moveToBookmark("fksxHistory"); + List fksxHistory = (List) data.get("fksxHistory"); + data.remove("fksxHistory"); + for (String fh : fksxHistory) { + markFrameText(builder, fh); + markPubText(builder, "/"); + } + } catch (Exception e) { + e.printStackTrace(); + } + + } + + public void markData(Document doc, Map data) { + try { + for (Map.Entry m : data.entrySet()) { + BookmarkCollection books = doc.getRange().getBookmarks(); + Bookmark bookmark = books.get(m.getKey()); + if (bookmark != null) { + bookmark.setText(String.valueOf(m.getValue())); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 添加特殊字 + * + * @param builder + * @param text + */ + public void markFrameText(DocumentBuilder builder, String text) { + try { + builder.getFont().getBorder().clearFormatting(); + builder.getFont().getBorder().clearFormatting(); + builder.getFont().getBorder().setColor(Color.black); + builder.getFont().getBorder().setLineWidth(1); + builder.getFont().getBorder().setLineStyle(LineStyle.SINGLE); + builder.getFont().getBorder().setDistanceFromText(2); + // builder.getFont().getBorder().setShadow(true); + builder.write(text); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 添加普通字 + * + * @param builder + * @param text + */ + public void markPubText(DocumentBuilder builder, String text) { + try { + builder.getFont().getBorder().clearFormatting(); + builder.write(text); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 获取license + * + * @return + */ + public static boolean getLicense() { + boolean result = false; + try { + InputStream is = ViewController.class.getClassLoader().getResourceAsStream("license.xml"); + License aposeLic = new License(); + aposeLic.setLicense(is); + result = true; + } catch (Exception e) { + e.printStackTrace(); + } + return result; + } + + /** + * 向客户端发送数据 + * + * @param doc com.aspose.words.Document + * @param docName 返回客户端的word文件名 + * @param formatType DOC 或者 DOCX + * @param openNewWindow 在线打开或者下载 + * @param response + * @throws Exception + */ + private void sendToBrowser(Document doc, String docName, String formatType, + boolean openNewWindow, HttpServletResponse response) + throws Exception { + String extension = formatType; + + if (formatType.equals("WML") || formatType.equals("FOPC")) + extension = "XML"; + + String fileName = docName + "." + extension; + + if (openNewWindow) + response.setHeader("content-disposition", "attachment; filename=" + + fileName); + else + response.addHeader("content-disposition", "inline; filename=" + + fileName); + + if ("doc".equals(formatType)) { + response.setContentType("application/msword"); + doc.save(response.getOutputStream(), SaveFormat.DOC); + } else if ("docx".equals(formatType)) { + response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document"); + doc.save(response.getOutputStream(), SaveFormat.DOCX); + } else if ("pdf".equals(formatType)) { + response.setContentType("application/pdf"); + doc.save(response.getOutputStream(), SaveFormat.PDF); + } + } /** * 查询复诊接口 + * * @param id * @param request * @return */ - @RequestMapping(value = "/findAntenatalExaminationData",method = RequestMethod.GET) + @RequestMapping(value = "/findAntenatalExaminationData", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id")String id, - HttpServletRequest request){ + public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id") String id, + HttpServletRequest request) { return viewFacade.findAntenatalExamination(id); } /** * 查看分娩接口 + * * @param id * @return */ @RequestMapping(value = "/findMatDeliverData", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findMatDeliverData(@RequestParam("id")String id){ + public BaseObjectResponse findMatDeliverData(@RequestParam("id") String id) { return viewFacade.findMatDeliverData(id); } /** * 查看孕妇建档信息 - * @param id 孕妇ID + * + * @param id 孕妇ID * @return */ @RequestMapping(value = "/findPatientData", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findPatientData(@RequestParam("id")String id){ + public BaseObjectResponse findPatientData(@RequestParam("id") String id) { return viewFacade.findPatientData(id); } /** * 查看产后复查 + * * @param id * @return */ @RequestMapping(value = "/findPostReviewData", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findPostReviewData(@RequestParam("id")String id){ + public BaseObjectResponse findPostReviewData(@RequestParam("id") String id) { return viewFacade.findPostReviewData(id); } /** * 查看出院小结 + * * @param id * @return */ @RequestMapping(value = "/findDischargeAbstractData", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findDischargeAbstractData(@RequestParam("id")String id){ + public BaseObjectResponse findDischargeAbstractData(@RequestParam("id") String id) { return viewFacade.findDischargeAbstractData(id); } /** * 查看终止妊娠 + * * @param id * @return */ @RequestMapping(value = "/findStopPregData", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse findStopPregData(@RequestParam("id")String id){ + public BaseObjectResponse findStopPregData(@RequestParam("id") String id) { return viewFacade.findStopPregData(id); } - /** * 儿童查看页面 + * * @param id 儿童建档id * @return */ @RequestMapping(value = "/getBabyBuildPageInfo/{id}", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse getBabyBuildInfo(@PathVariable("id")String id){ + public BaseObjectResponse getBabyBuildInfo(@PathVariable("id") String id) { return viewFacade.getBabyBuildInfo(id); } /** * 儿童检查查看页面 + * * @param id 儿童建档id * @return */ @RequestMapping(value = "/getBabyCheckPageInfo/{id}", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse getBabyCheckPageInfo(@PathVariable("id")String id){ + public BaseObjectResponse getBabyCheckPageInfo(@PathVariable("id") String id) { return viewFacade.getBabyCheckPageInfo(id); } /** * 妇女查看页面 + * * @param id * @return */ @RequestMapping(value = "/getResidentsPageById/{id}", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse getResidentsPageById(@PathVariable("id")String id){ + public BaseObjectResponse getResidentsPageById(@PathVariable("id") String id) { return viewFacade.getResidentsPageById(id); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 77ec4fb..e194fd5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -241,6 +241,245 @@ public class ViewFacade { } /** + * 导出初诊 + * + * @param id + * @return + */ + public Map exChuData(String id) { + + BaseObjectResponse br = new BaseObjectResponse(); + + if (org.apache.commons.lang.StringUtils.isEmpty(id)) { + br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + br.setErrormsg("id为空"); + return null; + } + + AntExChuModel data = antExService.findOne(id); + if (data == null || data.getYn() == YnEnums.NO.getId()) { + br.setErrorcode(ErrorCodeConstants.NO_DATA); + br.setErrormsg("没有查询到数据"); + return null; + } + + + if (org.apache.commons.lang.StringUtils.isEmpty(data.getParentId())) { + br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + br.setErrormsg("数据异常"); + return null; + } + + Patients patients = patientsService.findOnePatientById(data.getParentId()); + if (patients == null || patients.getYn() == YnEnums.NO.getId()) { + br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + br.setErrormsg("孕妇信息不存在"); + return null; + } + + Map map = new HashMap<>(); + /* 基本信息 */ + //孕妇基本信息 + map.put("id", data.getId()); + map.put("name", patients.getUsername()); + Calendar calendar = Calendar.getInstance(); + map.put("inYear", calendar.get(Calendar.YEAR)); + map.put("inMonth", calendar.get(Calendar.MONTH) + 1); + map.put("inDay", calendar.get(Calendar.DAY_OF_MONTH)); + map.put("inWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), calendar.getTime())); + map.put("age", DateUtil.getAge(patients.getBirth())); + + if (StringUtils.isNotEmpty(patients.getAddressRegister())) { + map.put("addr", patients.getAddressRegister()); + } + if (patients.getHusbandName() != null) { + map.put("hName", patients.getHusbandName()); + } + if (patients.getHusbandBirth() != null) { + map.put("hAge", DateUtil.getAge(patients.getHusbandBirth())); + } + + if (StringUtils.isNotEmpty(patients.getHusbandPhone())) { + map.put("hPhone", patients.getHusbandPhone()); + } + + + map.put("yNum", data.getPregnancyTimes()); + map.put("fNum", data.getDelivery()); + map.put("pNum", data.getPlanedProd()); + if (data.getLastMenses() != null) { + int mYear = data.getLastMenses().getYear(); + map.put("mYear", String.valueOf(mYear)); + int mMonth = data.getLastMenses().getMonth(); + map.put("mMonth", String.valueOf(mMonth)); + int mDay = data.getLastMenses().getDay(); + map.put("mDay", String.valueOf(mDay)); + } + + if (patients.getDueDate() != null) { + int yYear = patients.getDueDate().getYear(); + map.put("yYear", String.valueOf(yYear)); + int yMonth = patients.getDueDate().getMonth(); + map.put("yMonth", String.valueOf(yMonth)); + int yDay = patients.getDueDate().getDay(); + map.put("yDay", String.valueOf(yDay)); + } + + //既往史 + String pastHistory = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPastHistory())) { + Map map1 = JsonUtil.jkstr2Obj(data.getPastHistory(), Map.class); + pastHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); + } + + List jws = new ArrayList<>(); + + if (pastHistory.contains("先心病") || pastHistory.contains("冠心病") || pastHistory.contains("心绞痛") || pastHistory.contains("心肌缺血") || pastHistory.contains("心内膜炎") || pastHistory.contains("心肌病") || pastHistory.contains("心肌炎") || pastHistory.contains("心包炎")) {//2心脏病 + jws.add("2"); + } + if (pastHistory.contains("肾病") || pastHistory.contains("肾炎") || pastHistory.contains("肾结石") || pastHistory.contains("肾小球肾病") || pastHistory.contains("肾小球肾炎") || pastHistory.contains("IgA肾病")) {//3肾脏疾病 + jws.add("3"); + } + if (pastHistory.contains("大三阳") || pastHistory.contains("小三阳") || pastHistory.contains("乙型肝炎") || pastHistory.contains("丙型肝炎") || pastHistory.contains("乙肝表面抗原阳性") || pastHistory.contains("乙型肝炎表面抗原携带者") || pastHistory.contains("乙型病毒性肝炎") || pastHistory.contains("丙型病毒性肝炎") || pastHistory.contains("急性肝炎") || pastHistory.contains("慢性肝炎")) {//4肝脏疾病 + jws.add("4"); + } + if (pastHistory.contains("高血压")) {//5高血压 + jws.add("5"); + } + if (pastHistory.contains("贫血")) {//6贫血 + jws.add("6"); + } + if (pastHistory.contains("糖尿病")) {//7糖尿病 + jws.add("7"); + } + if (pastHistory.contains("其他[")) {//8其他 + map.put("jwsOther", pastHistory.substring(pastHistory.indexOf("其他")+3, pastHistory.length() - 1)); + } + if (CollectionUtils.isEmpty(jws)) { + jws.add("1");//无 + } + map.put("pastHistory", jws); + + //家族史 + String familyHistory = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getFamilyHistory())) { + Map map1 = JsonUtil.jkstr2Obj(data.getFamilyHistory(), Map.class); + familyHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); + } + + List jzs = new ArrayList<>(); + if (familyHistory.contains("遗传性疾病史")) {//1遗传性疾病史 + jzs.add("1"); + } + if (familyHistory.contains("精神疾病史")) {//2精神疾病史 + jzs.add("2"); + } + + familyHistory = familyHistory.replace("遗传性疾病史", ""); + familyHistory = familyHistory.replace("精神疾病史", ""); + familyHistory = familyHistory.replace("，，", "，"); + + if (StringUtils.isNotEmpty(familyHistory)) {//3其他 + map.put("jzsOther", familyHistory); + } + map.put("familyHistory", jzs); + + //个人史 + String personalHistory = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getPersonalHistory())) { + Map map1 = JsonUtil.jkstr2Obj(data.getPersonalHistory(), Map.class); + personalHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); + } + List grs = new ArrayList<>(); + if (personalHistory.contains("")) {//1吸烟 + grs.add("1"); + } + if (personalHistory.contains("")) {//2饮酒 + grs.add("2"); + } + if (personalHistory.contains("")) {//3服用药物 + grs.add("3"); + } + if (personalHistory.contains("")) {//4接触有毒有害物质 + grs.add("4"); + } + if (personalHistory.contains("")) {//5接触放射线 + grs.add("5"); + } + personalHistory = personalHistory.replace("吸烟", ""); + personalHistory = personalHistory.replace("饮酒", ""); + personalHistory = personalHistory.replace("服用药物", ""); + personalHistory = personalHistory.replace("接触有毒有害物质", ""); + personalHistory = personalHistory.replace("接触放射线", ""); + personalHistory = personalHistory.replace("，", ""); + map.put("personalHistory", grs); + map.put("grsOther", personalHistory); + + //孕妇手术史 + List sss = new ArrayList<>(); + //妇科手术史 + String fksxHistory = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getFksxHistory())) { + Map map1 = JsonUtil.jkstr2Obj(data.getFksxHistory(), Map.class); + fksxHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); + } + + if ("无".equals(fksxHistory)) { + sss.add("1"); + } else { + map.put("fksss", fksxHistory);//妇科手术史内容 + sss.add("2"); + } + map.put("fksxHistory", sss); + if (data.getAbortion() != null) { + String abortion = UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI); + map.put("abortion",abortion); + } + if (data.getStillbirth() != null) { + map.put("stillbirth", UnitUtils.unitSplice(data.getStillbirth(), UnitConstants.CI)); + } + if (data.getStillChan() != null) { + map.put("stillChan", UnitUtils.unitSplice(data.getStillChan(), UnitConstants.CI)); + } + if (data.getNeoDeath() != null) { + map.put("neoDeath", UnitUtils.unitSplice(data.getNeoDeath(), UnitConstants.CI)); + } + if (data.getBirthDefect() != null) { + map.put("birthDefect", UnitUtils.unitSplice(data.getBirthDefect(), UnitConstants.CI)); + } + if(StringUtils.isNotEmpty(data.getHeight())){ + map.put("stature", data.getHeight()); + } + if(StringUtils.isNotEmpty(data.getWeight())){ + map.put("weight", data.getWeight()); + } + + // 血压 + String ssy = ""; + String szy = ""; + Map chBpMap = JsonUtil.getMap(data.getBp()); + if (MapUtils.isNotEmpty(chBpMap)) { + ssy = chBpMap.get("ssy"); + szy = chBpMap.get("szy"); + } + map.put("shrblo", ssy); + map.put("diablo", szy); + //体重指数 yqWeight + if (StringUtils.isNotEmpty(data.getYqWeight()) && StringUtils.isNotEmpty(data.getHeight())) { + try { + //体重指数计算规则：孕前体重/身高（单位米）的平方 + java.text.DecimalFormat df = new java.text.DecimalFormat("#.#"); + double tzzs = Double.parseDouble(data.getYqWeight()) / Math.pow(Double.parseDouble(data.getHeight()) / 100, 2); + System.out.println("tzzs==================" + tzzs); + map.put("tzzs", df.format(tzzs)); + } catch (Exception e) { + ExceptionUtils.catchException(e, "体重指数计算错误"); + } + } + return map; + } + + /** * 初诊查询 * * @param id @@ -281,6 +520,7 @@ public class ViewFacade { /* 基本信息 */ //孕妇基本信息 map.put("id", data.getId()); + map.put("birthDefectTodo", data.getBirthDefectTodo()); map.put("diagnosisOther", data.getDiagnosisOther()); map.put("username", patients.getUsername()); @@ -403,14 +643,14 @@ public class ViewFacade { abortion.append("（"); if (data.getAbortionZR() != null) { - abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI ); + abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI); } - if(data.getAbortionRG() != null){ + if (data.getAbortionRG() != null) { abortion.append(" 人工:" + data.getAbortionRG() + UnitConstants.CI + ""); } - if(data.getYaowu()!=null){ + if (data.getYaowu() != null) { abortion.append(" 药物:" + data.getYaowu() + UnitConstants.CI + ""); } abortion.append("）"); @@ -449,11 +689,11 @@ public class ViewFacade { map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM)); - if(StringUtils.isNotEmpty(data.getGonggaoSelect())){ + if (StringUtils.isNotEmpty(data.getGonggaoSelect())) { map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGonggaoSelect())); } - if(StringUtils.isNotEmpty(data.getGonggaoType())){ + if (StringUtils.isNotEmpty(data.getGonggaoType())) { map.put("gongGaoType", GongJingEnums.getHengZhiNameById(data.getGonggaoType())); } map.put("fuwei", UnitUtils.unitSplice(data.getFuwei(), UnitConstants.CM)); @@ -491,42 +731,42 @@ public class ViewFacade { heartRate = String.valueOf(a); } join = placenta.getJoin(); - if(StringUtils.isNotEmpty(placenta.getXlwz())){ + if (StringUtils.isNotEmpty(placenta.getXlwz())) { placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(placenta.getXlwz())); } - if(StringUtils.isNotEmpty(placenta.getGjwz())){ + if (StringUtils.isNotEmpty(placenta.getGjwz())) { placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(placenta.getGjwz())); } - if(StringUtils.isNotEmpty(placenta.getGjyd())){ + if (StringUtils.isNotEmpty(placenta.getGjyd())) { placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(placenta.getGjyd())); } - if(StringUtils.isNotEmpty(placenta.getTm())){ + if (StringUtils.isNotEmpty(placenta.getTm())) { placetaMap.put("tm", TaiShuEnums.getTmNameById(placenta.getTm())); } - if(StringUtils.isNotEmpty(placenta.getYdjc())){ + if (StringUtils.isNotEmpty(placenta.getYdjc())) { placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(placenta.getYdjc())); } - if(placenta.getGjkd()!=null){ + if (placenta.getGjkd() != null) { placetaMap.put("gjkd", placenta.getGjkd()); } - if(placenta.getGjrs()!=null){ + if (placenta.getGjrs() != null) { placetaMap.put("gjrs", placenta.getGjrs()); } - if(StringUtils.isNotEmpty(placenta.getGjwzOther())){ + if (StringUtils.isNotEmpty(placenta.getGjwzOther())) { placetaMap.put("gjwzOther", placenta.getGjwzOther()); } - if(StringUtils.isNotEmpty(placenta.getGjydOther())){ + if (StringUtils.isNotEmpty(placenta.getGjydOther())) { placetaMap.put("gjydOther", placenta.getGjydOther()); } - if(placenta.getYszs()!=null){ + if (placenta.getYszs() != null) { placetaMap.put("yszs", placenta.getYszs()); } } @@ -550,42 +790,42 @@ public class ViewFacade { fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation"); join = placenta.get("join"); - if(StringUtils.isNotEmpty(placenta.get("xlwz"))){ + if (StringUtils.isNotEmpty(placenta.get("xlwz"))) { placetaMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(placenta.get("xlwz"))); } - if(StringUtils.isNotEmpty(placenta.get("gjwz"))){ + if (StringUtils.isNotEmpty(placenta.get("gjwz"))) { placetaMap.put("gjwz", GongJingEnums.getWeiZhiNameById(placenta.get("gjwz"))); } - if(StringUtils.isNotEmpty(placenta.get("gjyd"))){ + if (StringUtils.isNotEmpty(placenta.get("gjyd"))) { placetaMap.put("gjyd", GongJingEnums.getYinDuNameById(placenta.get("gjyd"))); } - if(StringUtils.isNotEmpty(placenta.get("ydjc"))){ + if (StringUtils.isNotEmpty(placenta.get("ydjc"))) { placetaMap.put("tm", TaiShuEnums.getTmNameById(placenta.get("ydjc"))); } - if(StringUtils.isNotEmpty(placenta.get("ydjc"))){ + if (StringUtils.isNotEmpty(placenta.get("ydjc"))) { placetaMap.put("ydjc", GongJingEnums.getYDJianCeNameById(placenta.get("ydjc"))); } - if(placenta.get("gjkd")!=null){ + if (placenta.get("gjkd") != null) { placetaMap.put("gjkd", placenta.get("gjkd")); } - if(placenta.get("gjrs")!=null){ + if (placenta.get("gjrs") != null) { placetaMap.put("gjrs", placenta.get("gjrs")); } - if(StringUtils.isNotEmpty(placenta.get("gjwzOther"))){ + if (StringUtils.isNotEmpty(placenta.get("gjwzOther"))) { placetaMap.put("gjwzOther", placenta.get("gjwzOther ")); } - if(StringUtils.isNotEmpty(placenta.get("gjydOther"))){ + if (StringUtils.isNotEmpty(placenta.get("gjydOther"))) { placetaMap.put("gjydOther", placenta.get("gjydOther")); } - if(placenta.get("yszs")!=null){ + if (placenta.get("yszs") != null) { placetaMap.put("yszs", placenta.get("yszs")); } } @@ -918,7 +1158,7 @@ public class ViewFacade { Map map = new HashMap<>(); map.put("id", data.getId()); - if(StringUtils.isNotEmpty(data.getFmType())){ + if (StringUtils.isNotEmpty(data.getFmType())) { map.put("fmType", FmTypeEnums.getFmDzNameById(data.getFmType())); } map.put("fmAddr", data.getFmAddr()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 0510fdf..9dbf785 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -34,6 +34,10 @@ public class AntenatalExaminationResult implements IBasicResultConvert + + + Aspose.Total for Java + Aspose.Words for Java + + Enterprise + 20991231 + 20991231 + 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7 + + sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU= + \ No newline at end of file diff --git a/platform-sync-data/platform-sync-data.iml b/platform-sync-data/platform-sync-data.iml index 6626dc6..1b43910 100644 --- a/platform-sync-data/platform-sync-data.iml +++ b/platform-sync-data/platform-sync-data.iml @@ -9,6 +9,11 @@ + + + + + diff --git a/pom.xml b/pom.xml index 1ec09fe..c724dfa 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,7 @@ ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/lucene-core-3.6.0.jar + commons-httpclient commons-httpclient -- 1.8.3.1