Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r24532 -r24946 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 24532) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 24946) @@ -2836,37 +2836,39 @@ private String compareTousseDefinition(TousseDefinition origineTd , TousseDefinition tousseDefinition){ StringBuffer modifyContent = new StringBuffer(""); if(!StringUtils.equals(origineTd.getName(), tousseDefinition.getName())){ - modifyContent.append("name属性修改前=").append(origineTd.getName()).append(",修改后=").append(tousseDefinition.getName()).append(";"); + modifyContent.append("名称属性修改前=").append(origineTd.getName()).append(",修改后=").append(tousseDefinition.getName()).append(";"); + }else{ + modifyContent.append("器械包名称=").append(tousseDefinition.getName()).append(";"); } if(!StringUtils.equals(origineTd.getTousseType(), tousseDefinition.getTousseType())){ - modifyContent.append("tousseType属性修改前=").append(origineTd.getTousseType()).append(",修改后=").append(tousseDefinition.getTousseType()).append(";"); + modifyContent.append("器械包类型属性修改前=").append(origineTd.getTousseType()).append(",修改后=").append(tousseDefinition.getTousseType()).append(";"); } if(!StringUtils.equals(origineTd.getAssetsBelong(), tousseDefinition.getAssetsBelong())){ - modifyContent.append("assetsBelong属性修改前=").append(origineTd.getAssetsBelong()).append(",修改后=").append(tousseDefinition.getAssetsBelong()).append(";"); + modifyContent.append("资产归属属性修改前=").append(origineTd.getAssetsBelong()).append(",修改后=").append(tousseDefinition.getAssetsBelong()).append(";"); } if(!StringUtils.equals(origineTd.getAutoOutStockForPacking(), tousseDefinition.getAutoOutStockForPacking())){ modifyContent.append("autoOutStockForPacking属性修改前=").append(origineTd.getAutoOutStockForPacking()).append(",修改后=").append(tousseDefinition.getAutoOutStockForPacking()).append(";"); } if((origineTd.getBorrowPrice() == null ? 0 : origineTd.getBorrowPrice().doubleValue()) != (tousseDefinition.getBorrowPrice() == null ? 0 : tousseDefinition.getBorrowPrice().doubleValue())){ - modifyContent.append("borrowPrice属性修改前=").append(origineTd.getBorrowPrice()).append(",修改后=").append(tousseDefinition.getBorrowPrice()).append(";"); + modifyContent.append("借出价格属性修改前=").append(origineTd.getBorrowPrice()).append(",修改后=").append(tousseDefinition.getBorrowPrice()).append(";"); } if(!StringUtils.equals(origineTd.getBarcodePaperType(), tousseDefinition.getBarcodePaperType())){ - modifyContent.append("barcodePaperType属性修改前=").append(origineTd.getBarcodePaperType()).append(",修改后=").append(tousseDefinition.getBarcodePaperType()).append(";"); + modifyContent.append("标签纸类型属性修改前=").append(origineTd.getBarcodePaperType()).append(",修改后=").append(tousseDefinition.getBarcodePaperType()).append(";"); } if(!StringUtils.equals(origineTd.getCleanMethod(), tousseDefinition.getCleanMethod())){ - modifyContent.append("cleanMethod属性修改前=").append(origineTd.getCleanMethod()).append(",修改后=").append(tousseDefinition.getCleanMethod()).append(";"); + modifyContent.append("清洗程序属性修改前=").append(origineTd.getCleanMethod()).append(",修改后=").append(tousseDefinition.getCleanMethod()).append(";"); } if(!StringUtils.equals(origineTd.getExpressRecycling(), tousseDefinition.getExpressRecycling())){ modifyContent.append("expressRecycling属性修改前=").append(origineTd.getExpressRecycling()).append(",修改后=").append(tousseDefinition.getExpressRecycling()).append(";"); } if(!StringUtils.equals(origineTd.getExternalCode(), tousseDefinition.getExternalCode())){ - modifyContent.append("externalCode属性修改前=").append(origineTd.getExternalCode()).append(",修改后=").append(tousseDefinition.getExternalCode()).append(";"); + modifyContent.append("外编码属性修改前=").append(origineTd.getExternalCode()).append(",修改后=").append(tousseDefinition.getExternalCode()).append(";"); } if(!StringUtils.equals(origineTd.getHandlerDepartCode(), tousseDefinition.getHandlerDepartCode())){ - modifyContent.append("handlerDepartCode属性修改前=").append(origineTd.getHandlerDepartCode()).append(",修改后=").append(tousseDefinition.getHandlerDepartCode()).append(";"); + modifyContent.append("处理科室编码属性修改前=").append(origineTd.getHandlerDepartCode()).append(",修改后=").append(tousseDefinition.getHandlerDepartCode()).append(";"); } if(!StringUtils.equals(origineTd.getHandlerDepartName(), tousseDefinition.getHandlerDepartName())){ - modifyContent.append("handlerDepartName属性修改前=").append(origineTd.getHandlerDepartName()).append(",修改后=").append(tousseDefinition.getHandlerDepartName()).append(";"); + modifyContent.append("处理科室名称属性修改前=").append(origineTd.getHandlerDepartName()).append(",修改后=").append(tousseDefinition.getHandlerDepartName()).append(";"); } if((origineTd.getHaveDisposableMaterial() == null ? false : origineTd.getHaveDisposableMaterial().booleanValue()) != (tousseDefinition.getHaveDisposableMaterial() == null ? false : tousseDefinition.getHaveDisposableMaterial().booleanValue())){ modifyContent.append("haveDisposableMaterial属性修改前=").append(origineTd.getHaveDisposableMaterial()).append(",修改后=").append(tousseDefinition.getHaveDisposableMaterial()).append(";"); @@ -2881,22 +2883,22 @@ modifyContent.append("intoBasketMaxAmount属性修改前=").append(origineTd.getIntoBasketMaxAmount()).append(",修改后=").append(tousseDefinition.getIntoBasketMaxAmount()).append(";"); } if(!StringUtils.equals(origineTd.getIsApplyEntireTousse(), tousseDefinition.getIsApplyEntireTousse())){ - modifyContent.append("isApplyEntireTousse属性修改前=").append(origineTd.getIsApplyEntireTousse()).append(",修改后=").append(tousseDefinition.getIsApplyEntireTousse()).append(";"); + modifyContent.append("是否整包申请属性修改前=").append(origineTd.getIsApplyEntireTousse()).append(",修改后=").append(tousseDefinition.getIsApplyEntireTousse()).append(";"); } if(!StringUtils.equals(origineTd.getIsBigPackage(), tousseDefinition.getIsBigPackage())){ modifyContent.append("isBigPackage属性修改前=").append(origineTd.getIsBigPackage()).append(",修改后=").append(tousseDefinition.getIsBigPackage()).append(";"); } if(!StringUtils.equals(origineTd.getIsCleanedEntirely(), tousseDefinition.getIsCleanedEntirely())){ - modifyContent.append("isCleanedEntirely属性修改前=").append(origineTd.getIsCleanedEntirely()).append(",修改后=").append(tousseDefinition.getIsCleanedEntirely()).append(";"); + modifyContent.append("是否整包清洗属性修改前=").append(origineTd.getIsCleanedEntirely()).append(",修改后=").append(tousseDefinition.getIsCleanedEntirely()).append(";"); } if(!StringUtils.equals(origineTd.getIsConvertApplyGoods(), tousseDefinition.getIsConvertApplyGoods())){ - modifyContent.append("isConvertApplyGoods属性修改前=").append(origineTd.getIsConvertApplyGoods()).append(",修改后=").append(tousseDefinition.getIsConvertApplyGoods()).append(";"); + modifyContent.append("转换申请物品属性修改前=").append(origineTd.getIsConvertApplyGoods()).append(",修改后=").append(tousseDefinition.getIsConvertApplyGoods()).append(";"); } if(!StringUtils.equals(origineTd.getIsCustomPacking(), tousseDefinition.getIsCustomPacking())){ - modifyContent.append("isCustomPacking属性修改前=").append(origineTd.getIsCustomPacking()).append(",修改后=").append(tousseDefinition.getIsCustomPacking()).append(";"); + modifyContent.append("是否自定义装配属性修改前=").append(origineTd.getIsCustomPacking()).append(",修改后=").append(tousseDefinition.getIsCustomPacking()).append(";"); } if(!StringUtils.equals(origineTd.getIsDisable(), tousseDefinition.getIsDisable())){ - modifyContent.append("isDisable属性修改前=").append(origineTd.getIsDisable()).append(",修改后=").append(tousseDefinition.getIsDisable()).append(";"); + modifyContent.append("是否停用属性修改前=").append(origineTd.getIsDisable()).append(",修改后=").append(tousseDefinition.getIsDisable()).append(";"); } if(!StringUtils.equals(origineTd.getIsDisableIDCard(), tousseDefinition.getIsDisableIDCard())){ modifyContent.append("isDisableIDCard属性修改前=").append(origineTd.getIsDisableIDCard()).append(",修改后=").append(tousseDefinition.getIsDisableIDCard()).append(";"); @@ -2908,40 +2910,40 @@ modifyContent.append("hidePackingTask属性修改前=").append(origineTd.getHidePackingTask()).append(",修改后=").append(tousseDefinition.getHidePackingTask()).append(";"); } if(!StringUtils.equals(origineTd.getIsPacking(), tousseDefinition.getIsPacking())){ - modifyContent.append("isPacking属性修改前=").append(origineTd.getIsPacking()).append(",修改后=").append(tousseDefinition.getIsPacking()).append(";"); + modifyContent.append("是否装配属性修改前=").append(origineTd.getIsPacking()).append(",修改后=").append(tousseDefinition.getIsPacking()).append(";"); } if(!StringUtils.equals(origineTd.getIsPecPack(), tousseDefinition.getIsPecPack())){ modifyContent.append("isPecPack属性修改前=").append(origineTd.getIsPecPack()).append(",修改后=").append(tousseDefinition.getIsPecPack()).append(";"); } if(!StringUtils.equals(origineTd.getIsPrint(), tousseDefinition.getIsPrint())){ - modifyContent.append("isPrint属性修改前=").append(origineTd.getIsPrint()).append(",修改后=").append(tousseDefinition.getIsPrint()).append(";"); + modifyContent.append("是否打印属性修改前=").append(origineTd.getIsPrint()).append(",修改后=").append(tousseDefinition.getIsPrint()).append(";"); } if(!StringUtils.equals(origineTd.getIsPrintMaterialForPacking(), tousseDefinition.getIsPrintMaterialForPacking())){ modifyContent.append("isPrintMaterialForPacking属性修改前=").append(origineTd.getIsPrintMaterialForPacking()).append(",修改后=").append(tousseDefinition.getIsPrintMaterialForPacking()).append(";"); } if(!StringUtils.equals(origineTd.getIsPrintOnDirectPacking(), tousseDefinition.getIsPrintOnDirectPacking())){ - modifyContent.append("isPrintOnDirectPacking属性修改前=").append(origineTd.getIsPrintOnDirectPacking()).append(",修改后=").append(tousseDefinition.getIsPrintOnDirectPacking()).append(";"); + modifyContent.append("是否自定义装配打印属性修改前=").append(origineTd.getIsPrintOnDirectPacking()).append(",修改后=").append(tousseDefinition.getIsPrintOnDirectPacking()).append(";"); } if(!StringUtils.equals(origineTd.getIsPrintOrg(), tousseDefinition.getIsPrintOrg())){ modifyContent.append("isPrintOrg属性修改前=").append(origineTd.getIsPrintOrg()).append(",修改后=").append(tousseDefinition.getIsPrintOrg()).append(";"); } if(!StringUtils.equals(origineTd.getPrintOrgSource(), tousseDefinition.getPrintOrgSource())){ - modifyContent.append("printOrgSource属性修改前=").append(origineTd.getPrintOrgSource()).append(",修改后=").append(tousseDefinition.getPrintOrgSource()).append(";"); + modifyContent.append("打印科室来源属性修改前=").append(origineTd.getPrintOrgSource()).append(",修改后=").append(tousseDefinition.getPrintOrgSource()).append(";"); } if(!StringUtils.equals(origineTd.getIsRecycling(), tousseDefinition.getIsRecycling())){ - modifyContent.append("isRecycling属性修改前=").append(origineTd.getIsRecycling()).append(",修改后=").append(tousseDefinition.getIsRecycling()).append(";"); + modifyContent.append("是否回收属性修改前=").append(origineTd.getIsRecycling()).append(",修改后=").append(tousseDefinition.getIsRecycling()).append(";"); } if(!StringUtils.equals(origineTd.getIsReview(), tousseDefinition.getIsReview())){ - modifyContent.append("isReview属性修改前=").append(origineTd.getIsReview()).append(",修改后=").append(tousseDefinition.getIsReview()).append(";"); + modifyContent.append("是否审核属性修改前=").append(origineTd.getIsReview()).append(",修改后=").append(tousseDefinition.getIsReview()).append(";"); } if(!StringUtils.equals(origineTd.getIsSterile(), tousseDefinition.getIsSterile())){ - modifyContent.append("isSterile属性修改前=").append(origineTd.getIsSterile()).append(",修改后=").append(tousseDefinition.getIsSterile()).append(";"); + modifyContent.append("是否灭菌属性修改前=").append(origineTd.getIsSterile()).append(",修改后=").append(tousseDefinition.getIsSterile()).append(";"); } if(!StringUtils.equals(origineTd.getIsInvoice(), tousseDefinition.getIsInvoice())){ - modifyContent.append("isInvoice属性修改前=").append(origineTd.getIsInvoice()).append(",修改后=").append(tousseDefinition.getIsInvoice()).append(";"); + modifyContent.append("是否发货属性修改前=").append(origineTd.getIsInvoice()).append(",修改后=").append(tousseDefinition.getIsInvoice()).append(";"); } if(!StringUtils.equals(origineTd.getIsTraceable(), tousseDefinition.getIsTraceable())){ - modifyContent.append("isTraceable属性修改前=").append(origineTd.getIsTraceable()).append(",修改后=").append(tousseDefinition.getIsTraceable()).append(";"); + modifyContent.append("是否追溯属性修改前=").append(origineTd.getIsTraceable()).append(",修改后=").append(tousseDefinition.getIsTraceable()).append(";"); } if(!StringUtils.equals(origineTd.getIsUploadImage(), tousseDefinition.getIsUploadImage())){ modifyContent.append("isUploadImage属性修改前=").append(origineTd.getIsUploadImage()).append(",修改后=").append(tousseDefinition.getIsUploadImage()).append(";"); @@ -2950,7 +2952,7 @@ modifyContent.append("isUploadVideo属性修改前=").append(origineTd.getIsUploadVideo()).append(",修改后=").append(tousseDefinition.getIsUploadVideo()).append(";"); } if(!StringUtils.equals(origineTd.getLimitInvoiceDepart(), tousseDefinition.getLimitInvoiceDepart())){ - modifyContent.append("limitInvoiceDepart属性修改前=").append(origineTd.getLimitInvoiceDepart()).append(",修改后=").append(tousseDefinition.getLimitInvoiceDepart()).append(";"); + modifyContent.append("限制发货科室属性修改前=").append(origineTd.getLimitInvoiceDepart()).append(",修改后=").append(tousseDefinition.getLimitInvoiceDepart()).append(";"); } if(!StringUtils.equals(origineTd.getMaterialsMD5(), tousseDefinition.getMaterialsMD5())){ modifyContent.append("materialsMD5属性修改前=").append(origineTd.getMaterialsMD5()).append(",修改后=").append(tousseDefinition.getMaterialsMD5()).append(";"); @@ -2971,18 +2973,14 @@ modifyContent.append("packageSize属性修改前=").append(origineTd.getPackageSize()).append(",修改后=").append(tousseDefinition.getPackageSize()).append(";"); } if(!StringUtils.equals(origineTd.getPackageType(), tousseDefinition.getPackageType())){ - modifyContent.append("packageType属性修改前=").append(origineTd.getPackageType()).append(",修改后=").append(tousseDefinition.getPackageType()).append(";"); + modifyContent.append("包装类型属性修改前=").append(origineTd.getPackageType()).append(",修改后=").append(tousseDefinition.getPackageType()).append(";"); } if((origineTd.getPackingAmountPerVirtualBasket() == null ? 0 : origineTd.getPackingAmountPerVirtualBasket().intValue()) != (tousseDefinition.getPackingAmountPerVirtualBasket() == null ? 0 : tousseDefinition.getPackingAmountPerVirtualBasket().intValue())){ modifyContent.append("packingAmountPerVirtualBasket属性修改前=").append(origineTd.getPackingAmountPerVirtualBasket()).append(",修改后=").append(tousseDefinition.getPackingAmountPerVirtualBasket()).append(";"); } if((origineTd.getPrice() == null ? 0 : origineTd.getPrice().doubleValue()) != (tousseDefinition.getPrice() == null ? 0 : tousseDefinition.getPrice().doubleValue())){ - modifyContent.append("price属性修改前=").append(origineTd.getPrice()).append(",修改后=").append(tousseDefinition.getPrice()).append(";"); + modifyContent.append("价格属性修改前=").append(origineTd.getPrice()).append(",修改后=").append(tousseDefinition.getPrice()).append(";"); } - if(!ForgonNumberUtils.doubleEquals(origineTd.getBorrowPrice(), tousseDefinition.getBorrowPrice())){ - modifyContent.append("borrowPrice属性修改前=").append(origineTd.getBorrowPrice()).append(",修改后=").append(tousseDefinition.getBorrowPrice()).append(";"); - } - if(!ForgonNumberUtils.doubleEquals(origineTd.getProxyDisinfectionPrice(), tousseDefinition.getProxyDisinfectionPrice())){ modifyContent.append("proxyDisinfectionPrice属性修改前=").append(origineTd.getProxyDisinfectionPrice()).append(",修改后=").append(tousseDefinition.getProxyDisinfectionPrice()).append(";"); } @@ -2991,11 +2989,11 @@ modifyContent.append("discountPrice属性修改前=").append(origineTd.getDiscountPrice()).append(",修改后=").append(tousseDefinition.getDiscountPrice()).append(";"); } if((origineTd.getPrintAmount() == null ? 0 : origineTd.getPrintAmount().intValue()) != (tousseDefinition.getPrintAmount()== null ? 0 : tousseDefinition.getPrintAmount().intValue())){ - modifyContent.append("printAmount属性修改前=").append(origineTd.getPrintAmount()).append(",修改后=").append(tousseDefinition.getPrintAmount()).append(";"); + modifyContent.append("打印份数属性修改前=").append(origineTd.getPrintAmount()).append(",修改后=").append(tousseDefinition.getPrintAmount()).append(";"); } if(!StringUtils.equals(origineTd.getSterilingMethod(), tousseDefinition.getSterilingMethod())){ - modifyContent.append("sterilingMethod属性修改前=").append(origineTd.getSterilingMethod()).append(",修改后=").append(tousseDefinition.getSterilingMethod()).append(";"); + modifyContent.append("灭菌方式属性修改前=").append(origineTd.getSterilingMethod()).append(",修改后=").append(tousseDefinition.getSterilingMethod()).append(";"); } if(!StringUtils.equals(origineTd.getSupplierName(), tousseDefinition.getSupplierName())){ modifyContent.append("supplierName属性修改前=").append(origineTd.getSupplierName()).append(",修改后=").append(tousseDefinition.getSupplierName()).append(";"); @@ -3004,10 +3002,10 @@ modifyContent.append("scanAmount属性修改前=").append(origineTd.getScanAmount()).append(",修改后=").append(tousseDefinition.getScanAmount()).append(";"); } if(!StringUtils.equals(origineTd.getTaskGroup(), tousseDefinition.getTaskGroup())){ - modifyContent.append("taskGroup属性修改前=").append(origineTd.getTaskGroup()).append(",修改后=").append(tousseDefinition.getTaskGroup()).append(";"); + modifyContent.append("任务组属性修改前=").append(origineTd.getTaskGroup()).append(",修改后=").append(tousseDefinition.getTaskGroup()).append(";"); } if(!StringUtils.equals(origineTd.getTousseGroupName(), tousseDefinition.getTousseGroupName())){ - modifyContent.append("tousseGroupName属性修改前=").append(origineTd.getTousseGroupName()).append(",修改后=").append(tousseDefinition.getTousseGroupName()).append(";"); + modifyContent.append("器械包分组属性修改前=").append(origineTd.getTousseGroupName()).append(",修改后=").append(tousseDefinition.getTousseGroupName()).append(";"); } if((origineTd.getTousseAmount() == null ? 0 : origineTd.getTousseAmount().intValue()) != (tousseDefinition.getTousseAmount() == null ? 0 : tousseDefinition.getTousseAmount().intValue())){ modifyContent.append("tousseAmount属性修改前=").append(origineTd.getTousseAmount()).append(",修改后=").append(tousseDefinition.getTousseAmount()).append(";");