Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r17006 -r17028 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 17006) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 17028) @@ -173,9 +173,9 @@ */ private String printOrgSource = PRINGORGSOURCE_NONE; - public static String PRINGORGSOURCE_ASSERTBELONG = "资产归属"; - public static String PRINGORGSOURCE_RECYCLINGDEPART = "回收科室"; - public static String PRINGORGSOURCE_NONE = "无"; + public final static String PRINGORGSOURCE_ASSERTBELONG = "资产归属"; + public final static String PRINGORGSOURCE_RECYCLINGDEPART = "回收科室"; + public final static String PRINGORGSOURCE_NONE = "无"; private String isTraceable = STR_YES; //是否追溯 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r16825 -r17028 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 16825) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 17028) @@ -928,7 +928,7 @@ * @param toolAmount * @param implantAmount * @param department - * @param isPrintOrg + * @param printOrgSource * @param idCardDefinitionUseAmount 标识牌定义的使用次数,每个标识牌定义对应一个实体的器械包 * @param objectDao * @return @@ -948,7 +948,7 @@ boolean isReview, boolean isTraceable, String bigPackage, String fixedBarcode, JSONArray materialsJsonArray, long foreignTousseApp_id, String supplierName, int toolAmount, - int implantAmount, String department, boolean isPrintOrg, + int implantAmount, String department, String printOrgSource, Long idCardDefinitionUseAmount, ObjectDao objectDao, String barcodePaperType, String washOperator, String washOperatorCode, String weight, int printAmount) { @@ -969,7 +969,7 @@ obj.put("printExpirationDate", isDisinfectionGoodsPrintExpirationDate); obj.put("isPrint", isPrint); obj.put("isReview", isReview); - obj.put("isPrintOrg", isPrintOrg);//新增器械包打印科室 + obj.put("printOrgSource", printOrgSource);//新增器械包打印科室 if(StringUtils.isNotBlank(department)){ obj.put("department", department);//新增器械包打印科室 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java =================================================================== diff -u -r16708 -r17028 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java (.../TousseInstanceUtils.java) (revision 16708) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java (.../TousseInstanceUtils.java) (revision 17028) @@ -400,4 +400,26 @@ } return id.toString(); } + + public static String getTousseInstanceDepartForPrint(TousseInstance tousseInstance) { + if(tousseInstance == null){ + return null; + } + TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition(); + if(tousseDefinition == null){ + return tousseInstance.getDepart(); + } + String printOrgSource = tousseDefinition.getPrintOrgSource(); + if(printOrgSource == null){ + return tousseInstance.getDepart(); + } + switch(printOrgSource){ + case TousseDefinition.PRINGORGSOURCE_ASSERTBELONG: + return tousseDefinition.getAssetsBelong(); + case TousseDefinition.PRINGORGSOURCE_RECYCLINGDEPART: + case TousseDefinition.PRINGORGSOURCE_NONE: + return tousseInstance.getDepart(); + } + return tousseInstance.getDepart(); + } }