Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js =================================================================== diff -u -r16895 -r16898 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js (.../comboTousseForm.js) (revision 16895) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js (.../comboTousseForm.js) (revision 16898) @@ -129,6 +129,22 @@ } }); DWREngine.setAsync(true); + + //处理科室数据源 + var cssdNameStore = new Ext.data.Store({ + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getHandlerDeparts.do', + method: 'POST' + }), + reader: new Ext.data.JsonReader({ + totalProperty: 'totalCount', + root: 'data' + }, [ + {name: 'departCode', mapping: 'departCode'}, + {name: 'departName', mapping: 'departName'} + ]) + }); + //任务组数据源 var taskGroupJsonStore = new Ext.data.SimpleStore({ fields: ['taskGroupName'], url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTaskGroupName.do', @@ -755,19 +771,7 @@ editable: false, valueField: 'departName', displayField: 'departName', - store: new Ext.data.Store({ - proxy: new Ext.data.HttpProxy({ - url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getHandlerDeparts.do', - method: 'POST' - }), - reader: new Ext.data.JsonReader({ - totalProperty: 'totalCount', - root: 'data' - }, [ - {name: 'departCode', mapping: 'departCode'}, - {name: 'departName', mapping: 'departName'} - ]) - }), + store: cssdNameStore, forceSelection: true, allowBlank: false, triggerAction: 'all', @@ -993,6 +997,27 @@ } //读取聚合包下的器械包 configStore.load({params: {id: tousseDefinition.id}}); + //读取聚合包下的处理科室与任务组 + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadComboTousseTaskGroup.do', + params: {id: id}, + success: function (response, options) { + var result = Ext.decode(response.responseText); + if (result.success) { + + top.Ext.getCmp('cssdCode').setValue(result.cssdCode); + cssdNameStore.loadData([{departCode:result.cssdCode,departName:result.cssdName}]); + //top.Ext.getCmp('cssdName').setValue(result.cssdName); + taskGroupJsonStore.loadData([{taskGroupName:result.taskGroup}]); + //top.Ext.getCmp('taskGroup').setValue(result.taskGroup); + } else { + showResult("未找到聚合包处理科室与任务组配置数据"); + } + }, + failure: function (response, options) { + showResult("加载聚合包处理科室与任务组报错"); + } + }); }, failure: function (form, action) { } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/service/CssdHandleTousseManager.java =================================================================== diff -u -r14297 -r16898 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/service/CssdHandleTousseManager.java (.../CssdHandleTousseManager.java) (revision 14297) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/service/CssdHandleTousseManager.java (.../CssdHandleTousseManager.java) (revision 16898) @@ -1,13 +1,15 @@ package com.forgon.disinfectsystem.tousse.cssdhandletousses.service; +import com.forgon.directory.model.CssdHandleTousses; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.tools.hibernate.BasePoManager; /** * 供应室处理器械包的操作类 * @author kzh * */ -public interface CssdHandleTousseManager { +public interface CssdHandleTousseManager extends BasePoManager { /** * 查询包定义的任务组,根据科室编码取供应室处理器械包配置的器械包任务组 * @param tousseInstance Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/service/CssdHandleTousseManagerImpl.java =================================================================== diff -u -r14297 -r16898 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/service/CssdHandleTousseManagerImpl.java (.../CssdHandleTousseManagerImpl.java) (revision 14297) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/service/CssdHandleTousseManagerImpl.java (.../CssdHandleTousseManagerImpl.java) (revision 16898) @@ -2,15 +2,16 @@ import java.sql.ResultSet; +import com.forgon.directory.model.CssdHandleTousses; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.tools.db.DatabaseUtil; +import com.forgon.tools.hibernate.BasePoManagerImpl; import com.forgon.tools.hibernate.ObjectDao; -public class CssdHandleTousseManagerImpl implements CssdHandleTousseManager { - private ObjectDao objectDao; - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; +public class CssdHandleTousseManagerImpl extends BasePoManagerImpl implements CssdHandleTousseManager { + + public CssdHandleTousseManagerImpl(){ + super(CssdHandleTousses.class); } @Override Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r16893 -r16898 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16893) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16898) @@ -27,6 +27,8 @@ import com.forgon.disinfectsystem.goodFilterConfig.service.GoodFilterConfigManager; import com.forgon.disinfectsystem.tousse.comboTousse.service.ComboTousseManager; +import com.forgon.disinfectsystem.tousse.cssdhandletousses.service.CssdHandleTousseManager; + import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; @@ -48,6 +50,7 @@ import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.CssdHandleTousses; import com.forgon.directory.model.OrgUnit; +import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.taskGroup.service.TaskGroupManager; import com.forgon.disinfectsystem.common.CssdUtils; @@ -73,6 +76,8 @@ import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.FileSystemHelper; +import com.forgon.tools.GB2Alpha; +import com.forgon.tools.GB2WB; import com.forgon.tools.ImageUtils; import com.forgon.tools.SpringBeanManger; import com.forgon.tools.StrutsParamUtils; @@ -107,6 +112,8 @@ protected final Logger logger = Logger.getLogger(this.getClass()); private TousseDefinition tousseDefinition; + + private TousseDefinition origineTd; private TousseDefinitionManager tousseDefinitionManager; @@ -129,7 +136,14 @@ private GoodFilterConfigManager goodFilterConfigManagerImpl; private ComboTousseManager comboTousseManagerImpl; + + private CssdHandleTousseManager cssdHandleTousseManager; + public void setCssdHandleTousseManager( + CssdHandleTousseManager cssdHandleTousseManager) { + this.cssdHandleTousseManager = cssdHandleTousseManager; + } + public void setComboTousseManagerImpl(ComboTousseManager comboTousseManagerImpl) { this.comboTousseManagerImpl = comboTousseManagerImpl; } @@ -317,7 +331,8 @@ public void saveTousseDefinition() { String msg = "{success:true,message:\"保存成功！\"}"; String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String userName = AcegiHelper.getLoginUser().getUserFullName(); + LoginUserData loginUserData = AcegiHelper.getLoginUser(); + String userName = loginUserData.getUserFullName(); Authentication auth = SecurityContextHolder.getContext() .getAuthentication(); appLogManager = (LogManager) SpringBeanManger.getBean("appLogManager"); @@ -351,6 +366,13 @@ //如果为新增器械包,则自动配置到一级供应室处理的器械包配置数据里 if(!DatabaseUtil.isPoIdValid(tousseDefinition.getId())){ newTousse = true; + }else{ + if(origineTd != null){ + String result = "包定义id=" + origineTd.getId() + ";" + compareTousseDefinition(origineTd , tousseDefinition); + if(StringUtils.isNotBlank(result)){ + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_TOUSSEDEFINITION, Log.TYPE_UPDATE, result); + } + } } //如果是聚合包,则清空他的任务组 @@ -369,6 +391,17 @@ String taskGroup = StrutsParamUtils.getPraramValue("taskGroup", null); String comboTousseArray = StrutsParamUtils.getPraramValue("comboTousseArray", null); comboTousseManagerImpl.saveOrUpdateComboTousses(comboTousseArray, tousseDefinition, newTousse); + + //添加相应的供应室处理器械包配置 + CssdHandleTousses cssdHandleTousses = new CssdHandleTousses(); + cssdHandleTousses.setOrgUnitCode(cssdCode); + cssdHandleTousses.setOrgUnitName(cssdName); + cssdHandleTousses.setSpelling(GB2Alpha.string2Alpha(tousseDefinition.getName())); + cssdHandleTousses.setWbCode(GB2WB.getWBCode(tousseDefinition.getName())); + cssdHandleTousses.setTaskGroup(taskGroup); + cssdHandleTousses.setTousseDefinitionId(tousseDefinition.getId()); + cssdHandleTousses.setTousseName(tousseDefinition.getName()); + cssdHandleTousseManager.save(cssdHandleTousses); // } } @@ -414,6 +447,188 @@ e.printStackTrace(); } } + + /** + * 比较包定义的修改 + * @param origineTd 修改前的包定义 + * @param tousseDefinition 修改后的包定义 + * @return + */ + 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(";"); + } + if(!StringUtils.equals(origineTd.getTousseType(), tousseDefinition.getTousseType())){ + modifyContent.append("tousseType属性修改前=").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(";"); + } + 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(";"); + } + if(!StringUtils.equals(origineTd.getBarcodePaperType(), tousseDefinition.getBarcodePaperType())){ + modifyContent.append("barcodePaperType属性修改前=").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(";"); + } + 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(";"); + } + if(!StringUtils.equals(origineTd.getHandlerDepartCode(), tousseDefinition.getHandlerDepartCode())){ + modifyContent.append("handlerDepartCode属性修改前=").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(";"); + } + 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(";"); + } + if(!StringUtils.equals(origineTd.getIdCardPaperType(), tousseDefinition.getIdCardPaperType())){ + modifyContent.append("idCardPaperType属性修改前=").append(origineTd.getIdCardPaperType()).append(",修改后=").append(tousseDefinition.getIdCardPaperType()).append(";"); + } + if(!StringUtils.equals(origineTd.getIncludeImplantStr(), tousseDefinition.getIncludeImplantStr())){ + modifyContent.append("includeImplantStr属性修改前=").append(origineTd.getIncludeImplantStr()).append(",修改后=").append(tousseDefinition.getIncludeImplantStr()).append(";"); + } + if((origineTd.getIntoBasketMaxAmount() == null ? 0 : origineTd.getIntoBasketMaxAmount().intValue()) != (tousseDefinition.getIntoBasketMaxAmount() == null ? 0 : tousseDefinition.getIntoBasketMaxAmount().intValue())){ + 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(";"); + } + 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(";"); + } + if(!StringUtils.equals(origineTd.getIsConvertApplyGoods(), tousseDefinition.getIsConvertApplyGoods())){ + modifyContent.append("isConvertApplyGoods属性修改前=").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(";"); + } + if(!StringUtils.equals(origineTd.getIsDisable(), tousseDefinition.getIsDisable())){ + modifyContent.append("isDisable属性修改前=").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(";"); + } + if(!StringUtils.equals(origineTd.getIsForeignTousse(), tousseDefinition.getIsForeignTousse())){ + modifyContent.append("isForeignTousse属性修改前=").append(origineTd.getIsForeignTousse()).append(",修改后=").append(tousseDefinition.getIsForeignTousse()).append(";"); + } + if(!StringUtils.equals(origineTd.getIsPacking(), tousseDefinition.getIsPacking())){ + modifyContent.append("isPacking属性修改前=").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(";"); + } + 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(";"); + } + if(!StringUtils.equals(origineTd.getIsPrintOrg(), tousseDefinition.getIsPrintOrg())){ + modifyContent.append("isPrintOrg属性修改前=").append(origineTd.getIsPrintOrg()).append(",修改后=").append(tousseDefinition.getIsPrintOrg()).append(";"); + } + if(!StringUtils.equals(origineTd.getIsRecycling(), tousseDefinition.getIsRecycling())){ + modifyContent.append("isRecycling属性修改前=").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(";"); + } + if(!StringUtils.equals(origineTd.getIsSterile(), tousseDefinition.getIsSterile())){ + modifyContent.append("isSterile属性修改前=").append(origineTd.getIsSterile()).append(",修改后=").append(tousseDefinition.getIsSterile()).append(";"); + } + if(!StringUtils.equals(origineTd.getIsTraceable(), tousseDefinition.getIsTraceable())){ + modifyContent.append("isTraceable属性修改前=").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(";"); + } + if(!StringUtils.equals(origineTd.getIsUploadVideo(), tousseDefinition.getIsUploadVideo())){ + 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(";"); + } + if(!StringUtils.equals(origineTd.getMaterialsMD5(), tousseDefinition.getMaterialsMD5())){ + modifyContent.append("materialsMD5属性修改前=").append(origineTd.getMaterialsMD5()).append(",修改后=").append(tousseDefinition.getMaterialsMD5()).append(";"); + } + if(!StringUtils.equals(origineTd.getMoreBoxPacked(), tousseDefinition.getMoreBoxPacked())){ + modifyContent.append("moreBoxPacked属性修改前=").append(origineTd.getMoreBoxPacked()).append(",修改后=").append(tousseDefinition.getMoreBoxPacked()).append(";"); + } + if((origineTd.getMaintainIntervalCount() == null ? 0 : origineTd.getMaintainIntervalCount().intValue()) != (tousseDefinition.getMaintainIntervalCount() == null ? 0 : tousseDefinition.getMaintainIntervalCount().intValue())){ + modifyContent.append("maintainIntervalCount属性修改前=").append(origineTd.getMaintainIntervalCount()).append(",修改后=").append(tousseDefinition.getMaintainIntervalCount()).append(";"); + } + if((origineTd.getMaintainIntervalTime() == null ? 0 : origineTd.getMaintainIntervalTime().intValue()) != (tousseDefinition.getMaintainIntervalTime() == null ? 0 : tousseDefinition.getMaintainIntervalTime().intValue())){ + modifyContent.append("maintainIntervalTime属性修改前=").append(origineTd.getMaintainIntervalTime()).append(",修改后=").append(tousseDefinition.getMaintainIntervalTime()).append(";"); + } + if(!StringUtils.equals(origineTd.getPackageCode(), tousseDefinition.getPackageCode())){ + modifyContent.append("packageCode属性修改前=").append(origineTd.getPackageCode()).append(",修改后=").append(tousseDefinition.getPackageCode()).append(";"); + } + if(!StringUtils.equals(origineTd.getPackageSize(), tousseDefinition.getPackageSize())){ + 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(";"); + } + 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(";"); + } + 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(";"); + } + if((origineTd.getProxyDisinfectionPrice() == null ? 0 : origineTd.getProxyDisinfectionPrice().doubleValue()) != (tousseDefinition.getProxyDisinfectionPrice() == null ? 0 : tousseDefinition.getProxyDisinfectionPrice().doubleValue())){ + modifyContent.append("proxyDisinfectionPrice属性修改前=").append(origineTd.getProxyDisinfectionPrice()).append(",修改后=").append(tousseDefinition.getProxyDisinfectionPrice()).append(";"); + } + if(!StringUtils.equals(origineTd.getSterilingMethod(), tousseDefinition.getSterilingMethod())){ + modifyContent.append("sterilingMethod属性修改前=").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(";"); + } + if((origineTd.getScanAmount() == null ? 0 : origineTd.getScanAmount().intValue()) != (tousseDefinition.getScanAmount() == null ? 0 : tousseDefinition.getScanAmount().intValue())){ + 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(";"); + } + if(!StringUtils.equals(origineTd.getTousseGroupName(), tousseDefinition.getTousseGroupName())){ + modifyContent.append("tousseGroupName属性修改前=").append(origineTd.getTousseGroupName()).append(",修改后=").append(tousseDefinition.getTousseGroupName()).append(";"); + } + if((origineTd.getTousseAmount() == null ? 0 : origineTd.getTousseAmount().intValue()) != (tousseDefinition.getTousseAmount())){ + modifyContent.append("tousseAmount属性修改前=").append(origineTd.getTousseAmount()).append(",修改后=").append(tousseDefinition.getTousseAmount()).append(";"); + } + if((origineTd.getTousseGroupID() == null ? 0 : origineTd.getTousseGroupID().longValue()) != (tousseDefinition.getTousseGroupID() == null ? 0 : tousseDefinition.getTousseGroupID().longValue())){ + modifyContent.append("tousseGroupID属性修改前=").append(origineTd.getTousseGroupID()).append(",修改后=").append(tousseDefinition.getTousseGroupID()).append(";"); + } + if(!StringUtils.equals(origineTd.getUnit(), tousseDefinition.getUnit())){ + modifyContent.append("unit属性修改前=").append(origineTd.getUnit()).append(",修改后=").append(tousseDefinition.getUnit()).append(";"); + } + if(!StringUtils.equals(origineTd.getUuid_vedioNames(), tousseDefinition.getUuid_vedioNames())){ + modifyContent.append("uuid_vedioNames属性修改前=").append(origineTd.getUuid_vedioNames()).append(",修改后=").append(tousseDefinition.getUuid_vedioNames()).append(";"); + } + if(!StringUtils.equals(origineTd.getWorkLoadStatisticalMethod(), tousseDefinition.getWorkLoadStatisticalMethod())){ + modifyContent.append("workLoadStatisticalMethod属性修改前=").append(origineTd.getWorkLoadStatisticalMethod()).append(",修改后=").append(tousseDefinition.getWorkLoadStatisticalMethod()).append(";"); + } + return modifyContent.toString(); + } /** * 获取包上传图片总数 @@ -442,11 +657,11 @@ .getSystemParamsObj(); String saveImagePath = systemParamsObj.getSaveImagePath(); String name = StrutsParamUtils.getPraramValue("name", null); - if(!DatabaseUtil.isPoIdValid(tousseDefinition.getId())){ + if(!DatabaseUtil.isPoIdValid(tousseDefinition.getId()) && StringUtils.isNotBlank(name)){ tousseDefinition = tousseDefinitionManager .getTousseDefinitionByNameForDisplay(name);// 因为现在外来器械包，消毒物品，自定义的包，每次申请时会创建包定义，但是没有记住正确的祖先id，所以此处不能简单的根据包名来取包定义 } - if (StringUtils.isNumeric(page) && DatabaseUtil.isPoIdValid(tousseDefinition.getId())) { + if (StringUtils.isNumeric(page) && tousseDefinition != null && DatabaseUtil.isPoIdValid(tousseDefinition.getId())) { int index = Integer.parseInt(page); int count = tousseDefinition.getImagesCount(objectDao); @@ -1178,6 +1393,53 @@ logger.error(e,e); } } + + /** + * 读取聚合包的处理科室与任务组信息 + */ + public void loadComboTousseTaskGroup(){ + try { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("success", false); + String id = StrutsParamUtils.getPraramValue("id", ""); + if(DatabaseUtil.isPoIdValid(id)){ + TousseDefinition td = tousseDefinitionManager.get(id); + //如果是聚合包(则处理科室与任务组需要从供应室处理器械包配置中查询) + if(td != null && td.isComboTousse()){ + LoginUserData loginUserData = AcegiHelper.getLoginUser(); + List cssdHandleTousseList + = cssdHandleTousseManager.getByHql("tousseDefinitionId=" + id); + if(CollectionUtils.isNotEmpty(cssdHandleTousseList)){ + //是否能找到该包属于本科室的供应室处理包配置 + boolean foundBelongCurrentOrgunit = false; + for (CssdHandleTousses cssdHandleTousses : cssdHandleTousseList) { + if(StringUtils.equals(cssdHandleTousses.getOrgUnitCode(), loginUserData.getCurrentOrgUnitCode())){ + jsonObject.put("success", true); + jsonObject.put("cssdCode", cssdHandleTousses.getOrgUnitCode()); + jsonObject.put("cssdName", cssdHandleTousses.getOrgUnitName()); + jsonObject.put("taskGroup", cssdHandleTousses.getTaskGroup()); + foundBelongCurrentOrgunit = true; + break; + } + } + //如果未找到该包属于本科室的供应室处理包配置 + if(!foundBelongCurrentOrgunit){ + CssdHandleTousses cssdHandleTousses = cssdHandleTousseList.get(0); + jsonObject.put("success", true); + jsonObject.put("cssdCode", cssdHandleTousses.getOrgUnitCode()); + jsonObject.put("cssdName", cssdHandleTousses.getOrgUnitName()); + jsonObject.put("taskGroup", cssdHandleTousses.getTaskGroup()); + } + } + } + } + + StrutsResponseUtils.output(jsonObject); + } + catch (Exception e) { + logger.error(e,e); + } + } /** * 获取器械包(不包括聚合包) @@ -1775,7 +2037,7 @@ } /** - * 搜索器械包 + * 搜索器械包(器械包类型为器械包、消毒物品、敷料包(如果启用聚合包功能的话需要能搜索到聚合包)) * @return */ public void searchComboTousseData() { @@ -1923,6 +2185,69 @@ if (StringUtils.isNotBlank(id) && !id.equals("0")) { tousseDefinition = tousseDefinitionManager .getTousseDefinitionById(id); + if(origineTd == null){ + origineTd = new TousseDefinition(); + origineTd.setId(tousseDefinition.getId()); + origineTd.setName(tousseDefinition.getName()); + origineTd.setTousseType(tousseDefinition.getTousseType()); + origineTd.setAssetsBelong(tousseDefinition.getAssetsBelong()); + origineTd.setAutoOutStockForPacking(tousseDefinition.getAutoOutStockForPacking()); + origineTd.setBarcodePaperType(tousseDefinition.getBarcodePaperType()); + origineTd.setBorrowPrice(tousseDefinition.getBorrowPrice()); + origineTd.setCleanMethod(tousseDefinition.getCleanMethod()); + origineTd.setExpressRecycling(tousseDefinition.getExpressRecycling()); + origineTd.setExternalCode(tousseDefinition.getExternalCode()); + origineTd.setHandlerDepartCode(tousseDefinition.getHandlerDepartCode()); + origineTd.setHandlerDepartName(tousseDefinition.getHandlerDepartName()); + origineTd.setIdCardPaperType(tousseDefinition.getIdCardPaperType()); + origineTd.setIncludeImplant(tousseDefinition.getIncludeImplant()); + origineTd.setIntoBasketMaxAmount(tousseDefinition.getIntoBasketMaxAmount()); + origineTd.setIsApplyEntireTousse(tousseDefinition.getIsApplyEntireTousse()); + origineTd.setIsBigPackage(tousseDefinition.getIsBigPackage()); + origineTd.setIsCleanedEntirely(tousseDefinition.getIsCleanedEntirely()); + origineTd.setIsConvertApplyGoods(tousseDefinition.getIsConvertApplyGoods()); + origineTd.setIsCustomPacking(tousseDefinition.getIsCustomPacking()); + origineTd.setIsDisable(tousseDefinition.getIsDisable()); + origineTd.setIsDisableIDCard(tousseDefinition.getIsDisableIDCard()); + origineTd.setIsForeignTousse(tousseDefinition.getIsForeignTousse()); + origineTd.setIsPacking(tousseDefinition.getIsPacking()); + origineTd.setIsPecPack(tousseDefinition.getIsPecPack()); + origineTd.setIsPrint(tousseDefinition.getIsPrint()); + origineTd.setIsPrintMaterialForPacking(tousseDefinition.getIsPrintMaterialForPacking()); + origineTd.setIsPrintOnDirectPacking(tousseDefinition.getIsPrintOnDirectPacking()); + origineTd.setIsPrintOrg(tousseDefinition.getIsPrintOrg()); + origineTd.setIsRecycling(tousseDefinition.getIsRecycling()); + origineTd.setIsReview(tousseDefinition.getIsReview()); + origineTd.setIsSterile(tousseDefinition.getIsSterile()); + origineTd.setIsTraceable(tousseDefinition.getIsTraceable()); + origineTd.setIsUploadImage(tousseDefinition.getIsUploadImage()); + origineTd.setIsUploadVideo(tousseDefinition.getIsUploadVideo()); + origineTd.setLimitInvoiceDepart(tousseDefinition.getLimitInvoiceDepart()); + origineTd.setMaintainIntervalCount(tousseDefinition.getMaintainIntervalCount()); + origineTd.setMaintainIntervalTime(tousseDefinition.getMaintainIntervalTime()); + origineTd.setMaterialsMD5(tousseDefinition.getMaterialsMD5()); + origineTd.setMoreBoxPacked(tousseDefinition.getMoreBoxPacked()); + origineTd.setNote(tousseDefinition.getNote()); + origineTd.setPackageCode(tousseDefinition.getPackageCode()); + origineTd.setPackageSize(tousseDefinition.getPackageSize()); + origineTd.setPackageType(tousseDefinition.getPackageType()); + origineTd.setPackingAmountPerVirtualBasket(tousseDefinition.getPackingAmountPerVirtualBasket()); + origineTd.setPrice(tousseDefinition.getPrice()); + origineTd.setPrintAmount(tousseDefinition.getPrintAmount()); + origineTd.setProxyDisinfectionPrice(tousseDefinition.getProxyDisinfectionPrice()); + origineTd.setScanAmount(tousseDefinition.getScanAmount()); + origineTd.setSterilingMethod(tousseDefinition.getSterilingMethod()); + origineTd.setSupplierName(tousseDefinition.getSupplierName()); + origineTd.setTaskGroup(tousseDefinition.getTaskGroup()); + origineTd.setTousseAmount(tousseDefinition.getTousseAmount()); + origineTd.setTousseGroupID(tousseDefinition.getTousseGroupID()); + origineTd.setTousseGroupName(tousseDefinition.getTousseGroupName()); + origineTd.setUnit(tousseDefinition.getUnit()); + origineTd.setUuid_vedioNames(tousseDefinition.getUuid_vedioNames()); + origineTd.setWorkLoadStatisticalMethod(tousseDefinition.getWorkLoadStatisticalMethod()); + + } + } else { tousseDefinition = new TousseDefinition(); }