From 9a8a06f195cf4c4b645f450b6db9a5f03def007a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 31 Jul 2018 16:44:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=A3=80=E6=9F=A5=E6=9C=88?= =?UTF-8?q?=E9=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ViewFacade.java | 94 ++++++++++++---------- 1 file changed, 52 insertions(+), 42 deletions(-) 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 86e4647..77aaebe 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 @@ -4847,10 +4847,9 @@ public class ViewFacade { public String getPatientRiskInfo(String cardNo, String vcCardNo) { Document document = DocumentHelper.createDocument();// 建立document对象,用来操作xml文件 document.setXMLEncoding("utf-8"); - try { - - Element riskElement = document.addElement("patient");// 建立根节点 + Element root = document.addElement("root"); + try { if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo) ) { String xml = document.asXML().toString(); @@ -4876,30 +4875,7 @@ public class ViewFacade { antExQuery.setPid(patients.getPid()); antExQuery.setStart(DateUtil.addMonth(new Date(), -12)); - Element baseElement = riskElement.addElement("baseInfo"); - - Element nameElement = baseElement.addElement("username"); - nameElement.addText(patients.getUsername()); - - Element cardNoElement = baseElement.addElement("cardNo"); - cardNoElement.addText(patients.getCardNo()); - - Element vcCardNoElement = baseElement.addElement("vcCardNo"); - vcCardNoElement.addText(patients.getVcCardNo()); - - Element birthdayElement = baseElement.addElement("birthday"); - birthdayElement.addText(DateUtil.getyyyy_MM_dd(patients.getBirth())); - - - Element phoneElement = baseElement.addElement("phone"); - phoneElement.addText(patients.getPhone()); - - Element ageElement = baseElement.addElement("age"); - ageElement.addText(DateUtil.getAge(patients.getBirth(),new Date())+""); - - Element dueDateElement = baseElement.addElement("dueDate"); - dueDateElement.addText(DateUtil.getyyyy_MM_dd(patients.getDueDate())); //初诊记录 AntExChuQuery antExChuQuery = new AntExChuQuery(); @@ -4909,7 +4885,8 @@ public class ViewFacade { if (CollectionUtils.isNotEmpty(antExChuModels)) { AntExChuModel an = antExChuModels.get(0); - Element checkElement = riskElement.addElement("check"); + Element patientElement = createPatients( root, patients); + String checkDoctor = ""; if (StringUtils.isNotEmpty(an.getProdDoctor()) && FunvCommonUtil.isNumeric(an.getProdDoctor())) { @@ -4919,17 +4896,17 @@ public class ViewFacade { } } - Element checkIdElement = checkElement.addElement("checkId"); + Element checkIdElement = patientElement.addElement("checkId"); checkIdElement.addText(an.getId()); - Element checkDoctorElement = checkElement.addElement("checkDoctor"); + Element checkDoctorElement = patientElement.addElement("checkDoctor"); checkDoctorElement.addText(checkDoctor); - Element checkWeekElement = checkElement.addElement("checkWeek"); + Element checkWeekElement = patientElement.addElement("checkWeek"); checkWeekElement.addText(an.getCheckTime() == null ? "" : DateUtil.getWeekDesc(patients.getLastMenses(), an.getCheckTime())); - Element checkDateElement = checkElement.addElement("checkDate"); + Element checkDateElement = patientElement.addElement("checkDate"); checkDateElement.addText(DateUtil.getyyyy_MM_dd(an.getCheckTime())); @@ -4940,10 +4917,10 @@ public class ViewFacade { hospital = organization.getName(); } } - Element checkHospitalElement = checkElement.addElement("checkHospital"); + Element checkHospitalElement = patientElement.addElement("checkHospital"); checkHospitalElement.addText(hospital); - Element nextCheckDateElement = checkElement.addElement("nextCheckDate"); + Element nextCheckDateElement = patientElement.addElement("nextCheckDate"); nextCheckDateElement.addText(an.getNextCheckTime() == null ? "" : DateUtil.getyyyy_MM_dd(an.getNextCheckTime())); Map map = new HashMap(); @@ -4953,7 +4930,7 @@ public class ViewFacade { //完善筛查结果 getscreenResult(an.getScreenResult(), map); - handleEle(map, checkElement, patients, an.getResultSupple(), an.getHighriskDesc()); + handleEle(map, patientElement, patients, an.getResultSupple(), an.getHighriskDesc()); } @@ -4968,7 +4945,7 @@ public class ViewFacade { for ( AntenatalExaminationModel ae : anmodels) { - Element checkElement = riskElement.addElement("check"); + Element patientElement = createPatients(root, patients); String checkDoctor = ""; if (StringUtils.isNotEmpty(ae.getCheckDoctor()) && FunvCommonUtil.isNumeric(ae.getCheckDoctor())) { @@ -4978,17 +4955,17 @@ public class ViewFacade { } } - Element checkIdElement = checkElement.addElement("checkId"); + Element checkIdElement = patientElement.addElement("checkId"); checkIdElement.addText(ae.getId()); - Element checkDoctorElement = checkElement.addElement("checkDoctor"); + Element checkDoctorElement = patientElement.addElement("checkDoctor"); checkDoctorElement.addText(checkDoctor); - Element checkWeekElement = checkElement.addElement("checkWeek"); + Element checkWeekElement = patientElement.addElement("checkWeek"); checkWeekElement.addText(ae.getCheckDate() == null ? "" : DateUtil.getWeekDesc(patients.getLastMenses(), ae.getCheckDate())); - Element checkDateElement = checkElement.addElement("checkDate"); + Element checkDateElement = patientElement.addElement("checkDate"); checkDateElement.addText(DateUtil.getyyyy_MM_dd(ae.getCheckDate())); @@ -4999,10 +4976,10 @@ public class ViewFacade { hospital = organization.getName(); } } - Element checkHospitalElement = checkElement.addElement("checkHospital"); + Element checkHospitalElement = patientElement.addElement("checkHospital"); checkHospitalElement.addText(hospital); - Element nextCheckDateElement = checkElement.addElement("nextCheckDate"); + Element nextCheckDateElement = patientElement.addElement("nextCheckDate"); nextCheckDateElement.addText(ae.getNextCheckTime() == null ? "" : DateUtil.getyyyy_MM_dd(ae.getNextCheckTime())); @@ -5012,7 +4989,7 @@ public class ViewFacade { //完善筛查结果 getscreenResult(ae.getScreenResult(), map); - handleEle( map, checkElement, patients, ae.getResultSupple(), ae.getHighriskDesc()); + handleEle( map, patientElement, patients, ae.getResultSupple(), ae.getHighriskDesc()); } } @@ -5024,6 +5001,39 @@ public class ViewFacade { } + + private Element createPatients(Element root,Patients patients) + { + + Element patientElement = root.addElement("patient");// 建立根节点 + + + Element nameElement = patientElement.addElement("username"); + nameElement.addText(patients.getUsername()); + + Element cardNoElement = patientElement.addElement("cardNo"); + cardNoElement.addText(patients.getCardNo()); + + Element vcCardNoElement = patientElement.addElement("vcCardNo"); + vcCardNoElement.addText(patients.getVcCardNo()); + + + Element birthdayElement = patientElement.addElement("birthday"); + birthdayElement.addText(DateUtil.getyyyy_MM_dd(patients.getBirth())); + + + Element phoneElement = patientElement.addElement("phone"); + phoneElement.addText(patients.getPhone()); + + Element ageElement = patientElement.addElement("age"); + ageElement.addText(DateUtil.getAge(patients.getBirth(),new Date())+""); + + Element dueDateElement = patientElement.addElement("dueDate"); + dueDateElement.addText(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + + return patientElement; + } + private void handleEle(Map map,Element checkElement,Patients patients,String resultSupple,String highriskDesc) { -- 1.8.3.1