Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r16312 -r16313 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 16312) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 16313) @@ -818,17 +818,17 @@ if (washRecord != null) { tousseInstance.setWashStartTime(washRecord.getStartDateStr()); - String personInCharge = ""; - String personInChargeCode =""; - List classifyBasketList = washRecord.getClassifyBaskets(); - if (classifyBasketList.size() > 0) { - personInCharge = classifyBasketList.get(0).getPersonInCharge(); - personInChargeCode = classifyBasketList.get(0).getPersonInChargeCode(); - - } - - tousseInstance.setWashOperator(StringUtils.isNotBlank(personInCharge)?personInCharge:washRecord.getOperator()); - tousseInstance.setWashOperatorCode(StringUtils.isNotBlank(personInChargeCode)?personInChargeCode:washRecord.getOperatorCode()); +// String personInCharge = ""; +// String personInChargeCode =""; +// List classifyBasketList = washRecord.getClassifyBaskets(); +// if (classifyBasketList.size() > 0) { +// personInCharge = classifyBasketList.get(0).getPersonInCharge(); +// personInChargeCode = classifyBasketList.get(0).getPersonInChargeCode(); +// +// } +// +// tousseInstance.setWashOperator(StringUtils.isNotBlank(personInCharge)?personInCharge:washRecord.getOperator()); +// tousseInstance.setWashOperatorCode(StringUtils.isNotBlank(personInChargeCode)?personInChargeCode:washRecord.getOperatorCode()); } }