Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java =================================================================== diff -u -r34275 -r34282 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java (.../ForeignTousseWebServiceExImpl.java) (revision 34275) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java (.../ForeignTousseWebServiceExImpl.java) (revision 34282) @@ -347,6 +347,7 @@ return xmlSerializer.write(returnJSONObject); } foreignTousseApplication.setApplicationTime(ForgonDateUtils.safelyParseDate(applicationTime)); + foreignTousseApplication.setSurgery(surgery); foreignTousseApplication.setHospitalNumber(hospitalNumber); PatientInfoVO[] patientInfoVOs = dataSynchronizationManager.findPatientInfoByHospitalNum(hospitalNumber); if(patientInfoVOs != null && patientInfoVOs.length > 0){ @@ -402,6 +403,9 @@ orginalForeignTousseApplication.setSettleAccountsDepartCoding(settlementDepartCode); } orginalForeignTousseApplication.setApplicationTime(ForgonDateUtils.safelyParseDate(applicationTime)); + if(StringUtils.isNotBlank(surgery) && !StringUtils.equals(surgery, orginalForeignTousseApplication.getSurgery())){ + orginalForeignTousseApplication.setSurgery(surgery); + } if(!StringUtils.equals(orginalForeignTousseApplication.getHospitalNumber(), hospitalNumber)){ orginalForeignTousseApplication.setHospitalNumber(hospitalNumber); PatientInfoVO[] patientInfoVOs = dataSynchronizationManager.findPatientInfoByHospitalNum(hospitalNumber);