Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java =================================================================== diff -u -r35684 -r35868 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java (.../MQHelper.java) (revision 35684) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java (.../MQHelper.java) (revision 35868) @@ -1100,7 +1100,7 @@ for(int i=1;i<=subjectNodeList.size();i++){ PatientInfoVO vo = new PatientInfoVO(); - String hospitalNumberXpath = subjectXpath + "[" + i + "]/s:procedureRequest/s:componentOf1/s:encounter/s:id/s:item[@root='2.16.156.10011.2.5.1.9']/@extension"; + String hospitalNumberXpath = subjectXpath + "[" + i + "]/s:procedureRequest/s:componentOf1/s:encounter/s:subject/s:patient/s:id/s:item[@root='2.16.156.10011.1.12']/@extension"; String hospitalNumber = processDataByXpath(document, nameSpaceURIMap, hospitalNumberXpath); String patientNameXpath = subjectXpath + "[" + i + "]/s:procedureRequest/s:componentOf1/s:encounter/s:subject/s:patient/s:patientPerson/s:name/s:item/s:part/@value"; String patientName = processDataByXpath(document, nameSpaceURIMap, patientNameXpath); @@ -1156,7 +1156,7 @@ } for(int i=1;i<=subjectNodeList.size();i++){ PatientInfoVO vo = new PatientInfoVO(); - String hospitalNumberXpath = subjectXpath + "[" + i + "]/s:procedureRequest/s:componentOf1/s:encounter/s:id/s:item[@root='2.16.156.10011.2.5.1.9']/@extension"; + String hospitalNumberXpath = subjectXpath + "[" + i + "]/s:procedureRequest/s:componentOf1/s:encounter/s:subject/s:patient/s:id/s:item[@root='2.16.156.10011.1.12']/@extension"; String hospitalNumber = processDataByXpath(document, nameSpaceURIMap, hospitalNumberXpath); String patientNameXpath = subjectXpath + "[" + i + "]/s:procedureRequest/s:componentOf1/s:encounter/s:subject/s:patient/s:patientPerson/s:name/s:item/s:part/@value"; String patientName = processDataByXpath(document, nameSpaceURIMap, patientNameXpath); @@ -1212,7 +1212,7 @@ } for(int i=1;i<=subjectNodeList.size();i++){ PatientInfoVO vo = new PatientInfoVO(); - String hospitalNumberXpath = subjectXpath + "[" + i + "]/s:actAppointment/s:subject/s:patient/s:id/s:item[@root='2.16.156.10011.2.5.1.9']/@extension"; + String hospitalNumberXpath = subjectXpath + "[" + i + "]/s:actAppointment/s:subject/s:patient/s:id/s:item[@root='2.16.156.10011.1.12']/@extension"; String hospitalNumber = processDataByXpath(document, nameSpaceURIMap, hospitalNumberXpath); String operationScheduleIdXpath = subjectXpath + "[" + i + "]/s:actAppointment/s:referencedOrder/s:actOrder/s:id/@extension"; String operationScheduleId = processDataByXpath(document, nameSpaceURIMap, operationScheduleIdXpath); @@ -1311,7 +1311,7 @@ } for(int i=1;i<=subjectNodeList.size();i++){ PatientInfoVO vo = new PatientInfoVO(); - String hospitalNumberXpath = subjectXpath + "[" + i + "]/s:actAppointment/s:subject/s:patient/s:id/s:item[@root='2.16.156.10011.2.5.1.9']/@extension"; + String hospitalNumberXpath = subjectXpath + "[" + i + "]/s:actAppointment/s:subject/s:patient/s:id/s:item[@root='2.16.156.10011.1.12']/@extension"; String hospitalNumber = processDataByXpath(document, nameSpaceURIMap, hospitalNumberXpath); String operationScheduleIdXpath = subjectXpath + "[" + i + "]/s:actAppointment/s:referencedOrder/s:actOrder/s:id/@extension"; String operationScheduleId = processDataByXpath(document, nameSpaceURIMap, operationScheduleIdXpath);