Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r29392 -r29394 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 29392) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 29394) @@ -47,6 +47,7 @@ import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; +import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils; import com.forgon.disinfectsystem.common.CssdUtils; @@ -140,6 +141,12 @@ private DateQueryAdapter dateQueryAdapter; + private SterilisationManager sterilisationManager; + + public void setSterilisationManager(SterilisationManager sterilisationManager) { + this.sterilisationManager = sterilisationManager; + } + public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { this.dateQueryAdapter = dateQueryAdapter; } @@ -1039,7 +1046,8 @@ returnDataJsonObject.put("fixedBarcode", fixedBarcode); TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByFixedBarcode(fixedBarcode); returnDataJsonObject.put("stockAmount", tousseInstanceManager.getTousseInstanceStockAmount(td)); - returnDataJsonObject.put("sterilingMode", tousseInstance.getSterilingMode()); + Sterilisation sterilisation = sterilisationManager.getSterilisationByName(tousseDefinition.getSterilingMethod() == null ? "" : tousseDefinition.getSterilingMethod()); + returnDataJsonObject.put("sterilingMode", sterilisation == null ? "" : sterilisation.getSterilizationMode()); }else{ returnDataJsonObject.put("sterilingType", tousseInstance.getSterilingType()); returnDataJsonObject.put("depart", StringUtils.defaultString(tousseInstance.getDepart()," ")); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r29392 -r29394 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 29392) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 29394) @@ -6604,17 +6604,18 @@ + " union " - + "(select tdancestor.id ,null depart,tdancestor.name tousseName,null,ti.sterilingMode sterilingMode,null,ti.taskGroup taskGroup," + + "(select tdancestor.id ,null depart,tdancestor.name tousseName,null,s.sterilizationMode sterilingMode,null,ti.taskGroup taskGroup," + firstBarcodeSql + "barcode,null reviewTime,count(0) amount, max(tdancestor.includeImplant) " + nullSql + " from "+ TousseInstance.class.getSimpleName() +" ti " + " join "+ BarcodeDevice.class.getSimpleName() +" b on b.id=ti.id " + "join "+ TousseDefinition.class.getSimpleName() +" td on ti.tousseDefinition_id=td.id join "+ TousseDefinition.class.getSimpleName() +" tdancestor " + "on td.ancestorID=tdancestor.id left join "+ InvoicePlan.class.getSimpleName() +" pd on pd.id=ti.proxyDisinfection_id " + + " left join " + Sterilisation.class.getSimpleName() + " s on s.sterilisation = td.sterilingMethod" + " where 1=1 and tdancestor.isTraceable='"+ Constants.STR_NO +"' and ti.status='"+ TousseInstance.STATUS_REVIEWED +"' and ti.comboTousseInstanceId is null " + dateSql - + " and ti.reviewBasket_id is null and (pd.id is null and ti.orgunitcoding='"+orgUnitCode+"' or pd.id is not null and pd.handleDepartCoding='"+orgUnitCode+"') group by tdancestor.id,tdancestor.name,ti.taskGroup,ti.sterilingMode" + + " and ti.reviewBasket_id is null and (pd.id is null and ti.orgunitcoding='"+orgUnitCode+"' or pd.id is not null and pd.handleDepartCoding='"+orgUnitCode+"') group by tdancestor.id,tdancestor.name,ti.taskGroup,s.sterilizationMode" + "))t"; if(StringUtils.isNotBlank(extraOrder)){ sql += " order by " + extraOrder;