Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java =================================================================== diff -u -r33654 -r34451 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java (.../DataSynchronizationManagerImpl.java) (revision 33654) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java (.../DataSynchronizationManagerImpl.java) (revision 34451) @@ -133,6 +133,11 @@ private FindPatientInfoByHospitalNumDao findPatientInfoByHospitalNumDao2; /** + * 根据住院号查询病人信息(第3个数据源)GYEY-775 + */ + private FindPatientInfoByHospitalNumDao findPatientInfoByHospitalNumDao3; + + /** * 根据诊疗号查询病人信息(第2个数据源) */ private FindPatientInfoByTreatmentNumDao findPatientInfoByTreatmentNumDao2; @@ -164,7 +169,12 @@ private DateQueryAdapter dateQueryAdapter; private ForeignTousseInfoPushDao foreignTousseInfoPushDao; - + + public void setFindPatientInfoByHospitalNumDao3( + FindPatientInfoByHospitalNumDao findPatientInfoByHospitalNumDao3) { + this.findPatientInfoByHospitalNumDao3 = findPatientInfoByHospitalNumDao3; + } + public void setForeignTousseInfoPushDao( ForeignTousseInfoPushDao foreignTousseInfoPushDao) { this.foreignTousseInfoPushDao = foreignTousseInfoPushDao; @@ -350,6 +360,19 @@ "根据住院号"+ hospitalNum +"(第2个数据源)同步到的结果为:" + JSONArray.fromObject(patientInfoVOArray)); } } + + //判断如果第一个数据源、第二个数据未查到相应病人数据时,则从第三个数据源查询病人信息GYEY-775 + if(patientInfoVOArray == null || patientInfoVOArray.length == 0){ + if(findPatientInfoByHospitalNumDao3 != null){ + if(sourcePage == null || sourcePage.intValue() == DataSynchronizationTableManager.SOURCE_PAGE_USERECORD){ + patientInfoVOArray = findPatientInfoByHospitalNumDao3.findPatientInfoByHospitalNum(hospitalNum); + }else{ + patientInfoVOArray = findPatientInfoByHospitalNumDao3.findPatientInfoByHospitalNumBeforeOperation(hospitalNum); + } + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_SYNC, Log.TYPE_QUERY, + "根据住院号"+ hospitalNum +"(第3个数据源)同步到的结果为:" + JSONArray.fromObject(patientInfoVOArray)); + } + } return patientInfoVOArray; } Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml =================================================================== diff -u -r34433 -r34451 --- ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml (.../applicationContext-his-gyey.xml) (revision 34433) +++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/spring/applicationContext-his-gyey.xml (.../applicationContext-his-gyey.xml) (revision 34451) @@ -82,8 +82,6 @@ - - @@ -96,6 +94,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file