Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/FindPatientInfoByHospitalNumDaoImpl.java =================================================================== diff -u -r30201 -r30639 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/FindPatientInfoByHospitalNumDaoImpl.java (.../FindPatientInfoByHospitalNumDaoImpl.java) (revision 30201) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/xmsfybjy/FindPatientInfoByHospitalNumDaoImpl.java (.../FindPatientInfoByHospitalNumDaoImpl.java) (revision 30639) @@ -72,13 +72,16 @@ String operationTimeXpath = "/root/admissionTime"; // 病人所属科室 String ascriptionDepartmentXpath = "/root/admissionDept"; + // 床位 + String bedXpath = "/root/bed"; String patientName = WebServiceClientHelper.processDataByXpath(document, nameXpath); String patientAge = WebServiceClientHelper.processDataByXpath(document, ageXpath); String patientSex = WebServiceClientHelper.processDataByXpath(document, sexXpath); String patientIDCard = WebServiceClientHelper.processDataByXpath(document, IDCardXpath); String operationTime = WebServiceClientHelper.processDataByXpath(document, operationTimeXpath); String ascriptionDepartment = WebServiceClientHelper.processDataByXpath(document, ascriptionDepartmentXpath); + String bedNumber = WebServiceClientHelper.processDataByXpath(document, bedXpath); PatientInfoVO patientInfoVO = new PatientInfoVO(); patientInfoVO.setPatientName(patientName); @@ -87,6 +90,13 @@ patientInfoVO.setPatientIDCard(patientIDCard); patientInfoVO.setOperationTime(operationTime); patientInfoVO.setAscriptionDepartment(ascriptionDepartment); + // 病区(和所在科室一致)XMSFYBJY-1 + patientInfoVO.setPatientArea(ascriptionDepartment); + patientInfoVO.setBedNumber(bedNumber); + if(hospitalNum.length() > 3){ + // 住院次数(取住院号后3位) + patientInfoVO.setVisitId(Long.valueOf(hospitalNum.substring(hospitalNum.length() - 3))); + } PatientInfoVO[] patientInfoArray = {patientInfoVO}; return patientInfoArray; @@ -100,11 +110,6 @@ return patientInfoVOArray; } - public static void main(String[] args) { - String ss = "aebbbbbbcd"; - System.out.println(ss.substring(ss.indexOf("a"), ss.indexOf("d")+1)); - } - @Override public PatientInfoVO[] findPatientInfoByHospitalNumBeforeOperation( String hospitalNum) {