Index: ssts-webservice/src/main/java/com/goodwillcis/HL7V2ServiceImpl.java =================================================================== diff -u -r21402 -r21493 --- ssts-webservice/src/main/java/com/goodwillcis/HL7V2ServiceImpl.java (.../HL7V2ServiceImpl.java) (revision 21402) +++ ssts-webservice/src/main/java/com/goodwillcis/HL7V2ServiceImpl.java (.../HL7V2ServiceImpl.java) (revision 21493) @@ -27,7 +27,7 @@ public String send(@WebParam(name = "hl7v2") String hl7v2) { logger.warn("Hl7v2=" + hl7v2); // 针对gyey解析hl7v2成xmL - Document document = HL7ToXmlConverter.ConvertToXmlObject(hl7v2); + Document document = HL7ToXmlConverter.convertToXmlObject(hl7v2); // 保存患者入院信息 String returnhl7=savepatientAdmissionInfo(document); //返回 hl7回复信息 @@ -40,12 +40,12 @@ private String savepatientAdmissionInfo(Document document) { String returnhl7=null; // 获得住院流水号 - String hospitalSerialNumber = HL7ToXmlConverter.GetText(document,"PID/PID.2"); + String hospitalSerialNumber = HL7ToXmlConverter.getText(document,"PID/PID.2"); // 获得住院号 - String hospitalNumber = HL7ToXmlConverter.GetText(document,"PID/PID.3/PID.3.1"); + String hospitalNumber = HL7ToXmlConverter.getText(document,"PID/PID.3/PID.3.1"); if (StringUtils.isNotBlank(hospitalSerialNumber)) { // 获得出身日期 - String birthdayyear = HL7ToXmlConverter.GetText(document,"PID/PID.7"); + String birthdayyear = HL7ToXmlConverter.getText(document,"PID/PID.7"); String patientAge = null; if (StringUtils.isNotBlank(birthdayyear)) { try { @@ -57,11 +57,11 @@ patientAge = Age.toString(); } catch (Exception e) { e.printStackTrace(); - return HL7ToXmlConverter.returnhl7(document,"AE","执行患者入院失败:"+e.getMessage()); + return HL7ToXmlConverter.returnHl7(document,"AE","执行患者入院失败:"+e.getMessage()); } } // 获得性别 - String Sex = HL7ToXmlConverter.GetText(document, "PID/PID.8"); + String Sex = HL7ToXmlConverter.getText(document, "PID/PID.8"); String patientSex = null; if (StringUtils.isNotBlank(Sex)) { switch (Sex) { @@ -77,28 +77,28 @@ } } // 获得住院次数 - String Amount = HL7ToXmlConverter.GetText(document, "PV1/PV1.1"); + String Amount = HL7ToXmlConverter.getText(document, "PV1/PV1.1"); Long visitAmount = null; if (StringUtils.isNotBlank(Amount)) { try { visitAmount = Long.parseLong(Amount); } catch (Exception e) { e.printStackTrace(); - return HL7ToXmlConverter.returnhl7(document,"AE","执行患者入院失败:"+e.getMessage()); + return HL7ToXmlConverter.returnHl7(document,"AE","执行患者入院失败:"+e.getMessage()); } } - String Name = HL7ToXmlConverter.GetText(document,"PID/PID.5"); + String Name = HL7ToXmlConverter.getText(document,"PID/PID.5"); String patientName=Name; if(Name.contains("^")){ patientName=Name.substring(Name.indexOf("^")+1); } - String patientIDCard = HL7ToXmlConverter.GetText(document,"PID/PID.19"); - String patientArea = HL7ToXmlConverter.GetText(document,"PV1/PV1.3/PV1.3.1"); - String roomNumber = HL7ToXmlConverter.GetText(document,"PV1/PV1.3/PV1.3.2"); - String bedNumber = HL7ToXmlConverter.GetText(document,"PV1/PV1.3/PV1.3.3"); - String orgunitId = HL7ToXmlConverter.GetText(document,"PV1/PV1.3/PV1.3.4.1"); - String orgunitName = HL7ToXmlConverter.GetText(document,"PV1/PV1.3/PV1.3.4.2"); - String doctorName = HL7ToXmlConverter.GetText(document,"PV1/PV1.7/PV1.7.3"); + String patientIDCard = HL7ToXmlConverter.getText(document,"PID/PID.19"); + String patientArea = HL7ToXmlConverter.getText(document,"PV1/PV1.3/PV1.3.1"); + String roomNumber = HL7ToXmlConverter.getText(document,"PV1/PV1.3/PV1.3.2"); + String bedNumber = HL7ToXmlConverter.getText(document,"PV1/PV1.3/PV1.3.3"); + String orgunitId = HL7ToXmlConverter.getText(document,"PV1/PV1.3/PV1.3.4.1"); + String orgunitName = HL7ToXmlConverter.getText(document,"PV1/PV1.3/PV1.3.4.2"); + String doctorName = HL7ToXmlConverter.getText(document,"PV1/PV1.7/PV1.7.3"); // 设置患者入院信息 PatientAdmissionInfo patientAdmissionInfo = new PatientAdmissionInfo(); try { @@ -118,13 +118,13 @@ patientAdmissionInfo.setTime(new Date()); } catch (Exception e) { e.printStackTrace(); - return HL7ToXmlConverter.returnhl7(document,"AE","执行患者入院失败:"+e.getMessage()); + return HL7ToXmlConverter.returnHl7(document,"AE","执行患者入院失败:"+e.getMessage()); } patientAdmissionInfoManager.save(patientAdmissionInfo); - return HL7ToXmlConverter.returnhl7(document,"AA","执行患者入院成功"); + return HL7ToXmlConverter.returnHl7(document,"AA","执行患者入院成功"); } else { logger.error("xml:PID/PID.2 住院流水号不存在"); - return HL7ToXmlConverter.returnhl7(document,"AE","执行患者入院失败:xml:PID/PID.2 住院流水号不存在"); + return HL7ToXmlConverter.returnHl7(document,"AE","执行患者入院失败:xml:PID/PID.2 住院流水号不存在"); } }