Index: ssts-webservice/src/main/java/com/goodwillcis/HL7V2ServiceImpl.java =================================================================== diff -u -r20598 -r21402 --- ssts-webservice/src/main/java/com/goodwillcis/HL7V2ServiceImpl.java (.../HL7V2ServiceImpl.java) (revision 20598) +++ ssts-webservice/src/main/java/com/goodwillcis/HL7V2ServiceImpl.java (.../HL7V2ServiceImpl.java) (revision 21402) @@ -39,9 +39,11 @@ */ private String savepatientAdmissionInfo(Document document) { String returnhl7=null; + // 获得住院流水号 + String hospitalSerialNumber = HL7ToXmlConverter.GetText(document,"PID/PID.2"); // 获得住院号 - String hospitalNumber = HL7ToXmlConverter.GetText(document,"PV1/PV1.19"); - if (StringUtils.isNotBlank(hospitalNumber)) { + String hospitalNumber = HL7ToXmlConverter.GetText(document,"PID/PID.3/PID.3.1"); + if (StringUtils.isNotBlank(hospitalSerialNumber)) { // 获得出身日期 String birthdayyear = HL7ToXmlConverter.GetText(document,"PID/PID.7"); String patientAge = null; @@ -112,6 +114,7 @@ patientAdmissionInfo.setOrgunitName(orgunitName); patientAdmissionInfo.setDoctorName(doctorName); patientAdmissionInfo.setHospitalNumber(hospitalNumber); + patientAdmissionInfo.setHospitalSerialNumber(hospitalSerialNumber); patientAdmissionInfo.setTime(new Date()); } catch (Exception e) { e.printStackTrace(); @@ -120,8 +123,8 @@ patientAdmissionInfoManager.save(patientAdmissionInfo); return HL7ToXmlConverter.returnhl7(document,"AA","执行患者入院成功"); } else { - logger.error("xml:PV1/PV1.19 住院号不存在"); - return HL7ToXmlConverter.returnhl7(document,"AE","执行患者入院失败:xml:PV1/PV1.19 住院号不存在"); + logger.error("xml:PID/PID.2 住院流水号不存在"); + return HL7ToXmlConverter.returnhl7(document,"AE","执行患者入院失败:xml:PID/PID.2 住院流水号不存在"); } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/gyey/PatientAdmissionInfo.java =================================================================== diff -u -r20003 -r21402 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/gyey/PatientAdmissionInfo.java (.../PatientAdmissionInfo.java) (revision 20003) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/gyey/PatientAdmissionInfo.java (.../PatientAdmissionInfo.java) (revision 21402) @@ -63,10 +63,14 @@ */ private String doctorName; /** - * 患者住院id:某一次住院的唯一编号 (内部流水号) + * 患者住院号 */ private String hospitalNumber; /** + * 患者住院id:某一次住院的唯一编号 (内部流水号) + */ + private String hospitalSerialNumber; + /** * 数据存入日期 */ private Date time; @@ -152,6 +156,13 @@ this.hospitalNumber = hospitalNumber; } + public String getHospitalSerialNumber() { + return hospitalSerialNumber; + } + public void setHospitalSerialNumber(String hospitalSerialNumber) { + this.hospitalSerialNumber = hospitalSerialNumber; + } + public Date getTime() { return time; }