Index: ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/action/TousseReturnDisinfectRecordAction.java =================================================================== diff -u -r16658 -r19643 --- ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/action/TousseReturnDisinfectRecordAction.java (.../TousseReturnDisinfectRecordAction.java) (revision 16658) +++ ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/action/TousseReturnDisinfectRecordAction.java (.../TousseReturnDisinfectRecordAction.java) (revision 19643) @@ -2,8 +2,6 @@ import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -21,7 +19,6 @@ import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.ParentPackage; -import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; @@ -32,8 +29,6 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussereturndisinfect.TousseReturnDisinfectRecord; import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; -import com.forgon.disinfectsystem.entity.useRecord.UseDiposableGoodsItem; -import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.disinfectsystem.tousseReturnDisinfectRecord.service.TousseReturnDisinfectRecordManager; @@ -42,8 +37,6 @@ import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.json.JSONUtil; -import com.forgon.tools.string.StringTools; -import com.google.gson.Gson; import com.opensymphony.xwork2.ModelDriven; /** @@ -212,7 +205,7 @@ obj.put("status", ti.getStatus()); }else if (bd instanceof IDCardInstance){ IDCardInstance ii = (IDCardInstance) bd; - ti = tousseInstanceManager.getTousseInstanceById(String.valueOf(ii.getLastTousseInstanceId())); + ti = tousseInstanceManager.get(ii.getLastTousseInstanceId()); obj.put("id", ti.getId()); obj.put("barcode", ti.getBarcode()); obj.put("tousseName", ti.getTousseName()); @@ -281,6 +274,7 @@ } } + @Override public TousseReturnDisinfectRecord getModel() { if (tousseReturnDisinfectRecord == null) tousseReturnDisinfectRecord = new TousseReturnDisinfectRecord(); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r19546 -r19643 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 19546) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 19643) @@ -2090,7 +2090,7 @@ + " where id = " + sterilizationRecord_id; objectDao.excuteSQL(sql2); - TousseInstance ti = tousseInstanceManager.getTousseInstanceById(id); + TousseInstance ti = tousseInstanceManager.get(id); String description = ti.getBarcode() + "修改开始时间："+startDate+",结束时间："+endDate+",灭菌方式："+sterilizationType+",sterilizationUser:"+sterilizationUser; appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INTERFERE, Log.TYPE_UPDATE, description); } @@ -2301,7 +2301,7 @@ @Override public void tousseConvertSterilizationRecord(Long tousseId,Long recordId,String isBasketConvert,Long reviewedBasketId,String sterilizationBasket){ - TousseInstance ti = tousseInstanceManager.getTousseInstanceById(""+tousseId); + TousseInstance ti = tousseInstanceManager.get(tousseId); SterilizationRecord record = getSterilizationRecordById(recordId); if(ti != null && record != null){ Long oldRecordId = ti.getSterilizationRecord_id(); Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/mobilenursing/common/service/MobileNursingWebServiceImpl.java =================================================================== diff -u -r17560 -r19643 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/mobilenursing/common/service/MobileNursingWebServiceImpl.java (.../MobileNursingWebServiceImpl.java) (revision 17560) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/mobilenursing/common/service/MobileNursingWebServiceImpl.java (.../MobileNursingWebServiceImpl.java) (revision 19643) @@ -6,14 +6,14 @@ import javax.jws.WebService; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang.StringUtils; - +import jxl.common.Logger; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.xml.XMLSerializer; -import jxl.common.Logger; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.StringUtils; + import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.OrgUnit; @@ -325,7 +325,7 @@ if(bd instanceof IDCardInstance){ IDCardInstance ii = (IDCardInstance)bd; - TousseInstance ti = tousseInstanceManager.getTousseInstanceById(String.valueOf(ii.getLastTousseInstanceId())); + TousseInstance ti = tousseInstanceManager.get(ii.getLastTousseInstanceId()); if(notSignedItemsCanRegistUseRecord){ if(ti.isShipped() || ti.isSigned()){ ti.setStatus(TousseInstance.STATUS_USED); Index: ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/service/TousseReturnDisinfectRecordManagerImpl.java =================================================================== diff -u -r16658 -r19643 --- ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/service/TousseReturnDisinfectRecordManagerImpl.java (.../TousseReturnDisinfectRecordManagerImpl.java) (revision 16658) +++ ssts-toussereturndisinfect/src/main/java/com/forgon/disinfectsystem/tousseReturnDisinfectRecord/service/TousseReturnDisinfectRecordManagerImpl.java (.../TousseReturnDisinfectRecordManagerImpl.java) (revision 19643) @@ -100,6 +100,7 @@ /** * 根据器械返消记录的id加载器械返消记录及其明细数据 */ + @Override public TousseReturnDisinfectRecord getTousseReturnDisinfectRecordById(String id) { return getTousseReturnDisinfectRecordById(Long.valueOf(id)); } @@ -127,6 +128,7 @@ firstIndex, maxResults, "operateDate desc"); } + @Override public void saveTousseReturnDisinfectRecord_TRANS_REQUIRED(TousseReturnDisinfectRecord modified , String applicationFormType) { saveTousseReturnDisinfectRecord_internal(modified , applicationFormType); } @@ -189,7 +191,7 @@ ti = (TousseInstance)barcodeDevice; }else if(barcodeDevice instanceof IDCardInstance){ IDCardInstance ii = (IDCardInstance)barcodeDevice; - ti = tousseInstanceManager.getTousseInstanceById(String.valueOf(ii.getLastTousseInstanceId())); + ti = tousseInstanceManager.get(ii.getLastTousseInstanceId()); } if(!TousseDefinition.PACKAGE_TYPE_INSIDE.equals(ti.getTousseDefinition().getTousseType())){ throw new RuntimeException("只能对器械包进行返消."); @@ -309,6 +311,7 @@ * @param tousseInstanceId * @return */ + @Override public TousseReturnDisinfectRecord getTousseReturnDisinfectRecordByTousseInstanceId(String tousseInstanceId){ return (TousseReturnDisinfectRecord)objectDao.getBySql(TousseReturnDisinfectRecord.class.getSimpleName(), "where id in (select tousseReturnDisinfectRecordId from TousseReturnDisinfectItem where tousseInstanceIds='" + tousseInstanceId + "')"); Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r19463 -r19643 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 19463) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 19643) @@ -880,7 +880,7 @@ String id = StrutsParamUtils.getPraramValue("tousseInstanceId", ""); if (DatabaseUtil.isPoIdValid(id)) { - TousseInstance ti = tousseInstanceManager.getTousseInstanceById(id); + TousseInstance ti = tousseInstanceManager.get(id); if (ti != null) { TousseTransitionRecord tousseTransitionRecord = tousseTransitionRecordManager .getByTousseInstanceBarcode(ti.getBarcode()); //交接记录 Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java =================================================================== diff -u -r19618 -r19643 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 19618) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 19643) @@ -22,7 +22,6 @@ import org.apache.commons.lang3.StringUtils; import com.fasterxml.jackson.databind.ObjectMapper; -import com.forgon.Constants; import com.forgon.component.grid.GridManager; import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.acegi.tools.AcegiHelper; @@ -33,11 +32,9 @@ import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils; import com.forgon.disinfectsystem.common.CssdUtils; -import com.forgon.disinfectsystem.diposablegoods.util.DisposableGoodsUtils; import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; -import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; @@ -54,7 +51,6 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.string.StringTools; -import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.SqlUtils; /** @@ -585,8 +581,7 @@ } public TousseInstance getTousseInstanceById(String id) { - TousseInstance tousseInstance = tousseInstanceManager - .getTousseInstanceById(id); + TousseInstance tousseInstance = tousseInstanceManager.get(id); return tousseInstance; } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java =================================================================== diff -u -r19097 -r19643 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 19097) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 19643) @@ -314,8 +314,7 @@ Set InvoiceItemSet = new HashSet(); String[] tousseInstanceIdArr = foreignTousseIds.split(";"); for (String tousseInstanceId : tousseInstanceIdArr) { - TousseInstance tousseInstance = tousseInstanceManager - .getTousseInstanceById(tousseInstanceId); + TousseInstance tousseInstance = tousseInstanceManager.get(tousseInstanceId); tousseInstance.setStatus(TousseInstance.STATUS_NO_DELIVER); tousseInstanceManager.saveOrUpdate(tousseInstance); // 待发货物品 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java =================================================================== diff -u -r17817 -r19643 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java (.../ScanBasketInvoiceTests.java) (revision 17817) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java (.../ScanBasketInvoiceTests.java) (revision 19643) @@ -1,15 +1,19 @@ package test.forgon.disinfectsystem.invoicemanager.service; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; import java.util.Calendar; import java.util.Date; +import net.sf.json.JSONObject; + import org.json.JSONArray; import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; -import net.sf.json.JSONObject; +import test.forgon.constant.Constants; +import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.model.BarcodeDevice; import com.forgon.disinfectsystem.basedatamanager.container.service.ReviewedBasketManager; @@ -25,9 +29,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import test.forgon.constant.Constants; -import test.forgon.disinfectsystem.AbstractCSSDTest; - /** * 整筐发货测试 * @author WangYi @@ -193,17 +194,17 @@ for (int i = 0; i < array.length(); i++) { String id = array.optString(i); - TousseInstance ti = tousseInstanceManager.getTousseInstanceById(id); + TousseInstance ti = tousseInstanceManager.get(id); ti.setStatus(TousseInstance.STATUS_STERILED); } for (int i = 0; i < array2.length(); i++) { String id = array2.optString(i); - TousseInstance ti = tousseInstanceManager.getTousseInstanceById(id); + TousseInstance ti = tousseInstanceManager.get(id); ti.setStatus(TousseInstance.STATUS_STERILED); } for(int i = 0; i < array4.length(); i++){ String id = array4.optString(i); - TousseInstance ti = tousseInstanceManager.getTousseInstanceById(id); + TousseInstance ti = tousseInstanceManager.get(id); ti.setStatus(TousseInstance.STATUS_STERILED); } Container c = containerManager.getContainerByBarcode("018000001"); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java =================================================================== diff -u -r19493 -r19643 --- ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java (.../TestSecondSupplyRoom.java) (revision 19493) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java (.../TestSecondSupplyRoom.java) (revision 19643) @@ -150,8 +150,7 @@ assertNotNull(invoice); assertEquals(SterilizationRecord.STERILIZATION_STATUS_END, sterilizationRecord.getStatus()); - tousseInstance1 = tousseInstanceManager - .getTousseInstanceById(tousseInstance1.getId().toString()); + tousseInstance1 = tousseInstanceManager.get(tousseInstance1.getId()); //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) if("false".equalsIgnoreCase(CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"))){ assertEquals(tousseInstance1.getStatus(), TousseInstance.STATUS_SIGNED); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r19555 -r19643 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 19555) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 19643) @@ -5,7 +5,6 @@ import java.io.PrintWriter; import java.sql.ResultSet; import java.sql.SQLException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -17,39 +16,34 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.stream.Collectors; import java.util.Set; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import net.sf.json.JsonConfig; -import net.sf.json.util.CycleDetectionStrategy; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.ParentPackage; -import org.apache.taglibs.standard.lang.jstl.ArraySuffix; import com.forgon.Constants; import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; import com.forgon.disinfectsystem.barcode.dwr.table.BarcodeTableManager; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; -import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager; import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.basedatamanager.container.service.ReviewedBasketManager; import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager; import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; -import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; @@ -61,16 +55,11 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstanceImplantData; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseMaterialErrorDamage; -import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; -import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; -import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO; -import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; -import com.forgon.disinfectsystem.entity.toussetransition.TousseTransitionRecord; import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.packing.service.PackingManager; @@ -83,7 +72,6 @@ import com.forgon.log.service.LogManager; import com.forgon.timeout.model.TimeoutSetting; import com.forgon.timeout.service.TimeoutManager; -import com.forgon.tools.FileSystemHelper; import com.forgon.tools.ImageUtils; import com.forgon.tools.SqlBuilder; import com.forgon.tools.StrutsParamUtils; @@ -266,8 +254,7 @@ Map map = new HashMap(); String tousseInstanceId = StrutsParamUtils.getRequest().getParameter( "id"); - TousseInstance tousseInstance = tousseInstanceManager - .getTousseInstanceById(tousseInstanceId); + TousseInstance tousseInstance = tousseInstanceManager.get(tousseInstanceId); map.put("success", true); map.put("data", tousseInstance); JSONObject jsonObject = JSONObject.fromObject(map); @@ -285,8 +272,7 @@ public void getTousseDefinitionImage() { String id = StrutsParamUtils.getPraramValue("id", ""); if (DatabaseUtil.isPoIdValid(id)) { - TousseInstance tousseInstance = tousseInstanceManager - .getTousseInstanceById(id); + TousseInstance tousseInstance = tousseInstanceManager.get(id); TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition(); Long tdId = tousseDefinitionManager.getAncestorIdOrId(tousseDefinition); int count = imageFileManager.getImagesCount(tdId, ImageFile.IMAGE_TYPE_TOUSSE); @@ -314,8 +300,7 @@ String id = StrutsParamUtils.getPraramValue("tousseInstanceId", ""); StringBuffer jsonStr = new StringBuffer(); if (StringUtils.isNotBlank(id)) { - TousseInstance tousseInstance = tousseInstanceManager - .getTousseInstanceById(id); + TousseInstance tousseInstance = tousseInstanceManager.get(id); if (tousseInstance != null && tousseInstance.getClassifyBasket_id() != null && tousseInstance.getClassifyBasket_id() > 0) { @@ -1335,8 +1320,7 @@ String comboTousseInstanceId = StrutsParamUtils.getPraramValue("comboTousseInstanceId", null); if (DatabaseUtil.isPoIdValid(comboTousseInstanceId)) { - TousseInstance comboTousseInstance = tousseInstanceManager - .getTousseInstanceById(comboTousseInstanceId); //聚合包实例 + TousseInstance comboTousseInstance = tousseInstanceManager.get(comboTousseInstanceId); //聚合包实例 List insideTousseInstanceList = comboTousseInstance .getTousseInstancesBelongToThisComboTousse(objectDao); //聚合包实例里面的包实例 @@ -1559,8 +1543,8 @@ //查出该包实例的所有植入物使用数量的数据(修改前的数据) @SuppressWarnings("unchecked") List tousseInstanceImplantDataList = - (List)objectDao.findBySql(TousseInstanceImplantData.class.getSimpleName(), - " where tousseInstanceId=" + ti.getId()); + objectDao.findBySql(TousseInstanceImplantData.class.getSimpleName(), + " where tousseInstanceId=" + ti.getId()); //提交的最新数据 JSONArray jsonArray = JSONArray.fromObject(materialItems); Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java =================================================================== diff -u -r18534 -r19643 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 18534) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 19643) @@ -17,7 +17,6 @@ import java.util.Map; import java.util.Set; - import net.sf.json.JSONObject; import org.apache.commons.collections4.CollectionUtils; @@ -33,9 +32,6 @@ import org.hibernate.Query; import org.hibernate.Session; -import sun.util.calendar.CalendarUtils; - -import com.fasterxml.jackson.annotation.JsonIgnore; import com.forgon.Constants; import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.dataupdater.model.UpdateDataContext; @@ -50,7 +46,6 @@ import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialType; -import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier; @@ -71,7 +66,6 @@ import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringGoods; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition; -import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem; import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection; @@ -99,8 +93,6 @@ import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.FileUtils; -import freemarker.template.utility.DateUtil; - /** * @author Terry Kwan * @@ -199,10 +191,12 @@ this.objectDao = objectDao; } + @Override public void deleteTousseInstances(){ objectDao.excuteSQL("delete from tousseInstance"); } + @Override public void deleteRecyclingRecords(){ objectDao.excuteSQL("delete from MaterialErrorDamageDetail"); @@ -216,6 +210,7 @@ objectDao.excuteSQL("delete from recyclingRecord"); } + @Override public void deleteWashRecords(){ @@ -229,13 +224,15 @@ } + @Override public void deletePackingRecord(){ objectDao.excuteSQL("delete from packingTask"); objectDao.excuteSQL("delete from PackingRecord"); } + @Override public void deleteSterilizationRecord(){ objectDao.excuteSQL("delete from sterilization_tousseinstance"); objectDao.excuteSQL("delete from sterilization_reviewed"); @@ -245,30 +242,35 @@ } + @Override public void deleteQualityMonitoring(){ objectDao.excuteSQL("delete from QualityMonitoringInstance"); objectDao.excuteSQL("delete from QualityMonitoringDefinition"); } + @Override public void deleteInvoice(){ objectDao.excuteSQL("delete from invoiceItem"); objectDao.excuteSQL("delete from LostMaterialItem"); objectDao.excuteSQL("delete from invoice"); objectDao.excuteSQL("delete from invoicePlan"); } + @Override public void deleteBorrowAndReturn(){ objectDao.excuteSQL("delete from returngoodsitem"); objectDao.excuteSQL("delete from returngoodsrecord"); } + @Override public void deleteRecyclingApplication(){ objectDao.excuteSQL("delete from recyclingApplication"); } + @Override public void deleteForeignTousseRelated(){ objectDao.excuteSQL("delete from ForeignTousseApplication"); objectDao.excuteSQL("delete from proxyDis_rBasket"); @@ -277,10 +279,12 @@ objectDao.excuteSQL("delete from ProxyDisinfection"); } + @Override public void deleteDiposableGoodsInvoice(){ objectDao.excuteSQL("delete from diposablegoodsitem"); } + @Override public void deleteStockTakeRecords(){ objectDao.excuteSQL("delete from InventoryItem"); @@ -293,15 +297,18 @@ } + @Override public void deleteUseRecords(){ objectDao.excuteSQL("delete from UseRecord"); } + @Override public void deleteRecallRecords(){ objectDao.excuteSQL("delete from RecallRecordItem"); objectDao.excuteSQL("delete from RecallRecord"); } + @Override public void deleteGodownEntry(){ // 删除一次性物品入库单 objectDao.excuteSQL("delete from GodownEntryItem"); @@ -319,6 +326,7 @@ } // 删除所有运行的数据，一般用于系统正式上线前清除测试的数据 + @Override public void deleteAllRunningData(){ deleteWashRecords(); @@ -355,6 +363,7 @@ } // 清除所有一次性物品的库存 + @Override public void setAllDisposableGoodsStorage(long amount){ Query query = objectDao.getHibernateSession() @@ -374,6 +383,7 @@ } + @Override public void updateClassifyItemNameForMaterial(){ String sql = "where po.itemType = '材料'"; List items = objectDao.findBySql(ClassifiedItem.class.getSimpleName(), sql); @@ -410,6 +420,7 @@ } + @Override public void compareInvoiceAmount(){ List invoices = objectDao.findBySql(Invoice.class.getSimpleName(), "where po.sendTime between '2015-07-01 00:00:00' and '2015-07-31 23:59:59'"); @@ -436,6 +447,7 @@ } } + @Override public void updateInvoiceAmount(){ List invoices = objectDao.findBySql(Invoice.class.getSimpleName(), "where po.sendTime between '2015-07-01 00:00:00' and '2015-07-31 23:59:00'"); @@ -510,6 +522,7 @@ /** * 终止回收申请单中的消毒物品 */ + @Override public void terminateErrorTousseItems(){ String sql = "where po.type = '回收申请单' and (po.deliverStatus = '待发货' or po.deliverStatus = '部分发货')"; List ps = objectDao.findBySql(InvoicePlan.class.getSimpleName(), sql); @@ -539,6 +552,7 @@ /** * 终止未生成包实例的消毒物品 */ + @Override public void terminateNotTousseInstanceTousseItems(){ String sql = "select i.id,i.tousseName,i.tousseType,t.id From TousseItem i " + "left join TousseInstance t on i.tousseName = t.tousseName where " @@ -588,6 +602,7 @@ } // 删除某个时间段内的申请单以及之后的关联记录，包含清洗记录 + @Override public int deleteApplicationsAndFollowingRecords(String fromDate,String toDate) { int amount = 0; String sql = "select po from InvoicePlan po where po.applicationTime " @@ -722,6 +737,7 @@ return amount; } + @Override public void updateDataFrom_3_1_2_To_3_2_6(Map msg) { String updateType = StrutsParamUtils.getPraramValue("updateType", null); if (StringUtils.isBlank(updateType)) { @@ -890,6 +906,7 @@ } + @Override public void loadHisMaterialType(){ InputStream ips; try { @@ -1216,6 +1233,7 @@ } } + @Override public void resetMaterialAmount(){ String sql = "where po.invoicePlan.type = '" + InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION @@ -1257,6 +1275,7 @@ } } + @Override public void copySterilizationRecordPicsFromDBToFileSystem() { while (true) { String sql = String.format( @@ -1311,6 +1330,7 @@ } } + @Override public void addCommonSupplier(){ //设置数据库里的供应商的五笔码、拼音码 @SuppressWarnings("unchecked") @@ -1352,6 +1372,7 @@ * 器械包定义去下划线处理方法 * @param updateDataContext */ + @Override public void UpdateData_4_0_5_4_0_6(UpdateDataContext updateDataContext) { DataUpdater dataUpdater = updateDataContext.getDataUpdater(); String msg = null; @@ -1758,6 +1779,7 @@ } } + @Override public void qualityMonitoringDataMove(){ qualityMonitoringConfigDataMove(); qualityMonitoringInstanceDataMove(); @@ -1947,7 +1969,7 @@ qmInstance.setType(rs.getString("type")); String tousseInstanceId = rs.getString("tousseInstance_id"); if(StringUtils.isNotBlank(tousseInstanceId)){ - qmInstance.setTousseInstance(tousseInstanceManager.getTousseInstanceById(tousseInstanceId)); + qmInstance.setTousseInstance(tousseInstanceManager.get(tousseInstanceId)); } qmInstance.setSourceId(rs.getLong("id")); qmInstance.setParentId(rs.getLong("qualityMonitoring_id")); @@ -2070,6 +2092,7 @@ } + @Override public void updateOperationRoomSpellingAndWBCode(){ String sql = String.format("where po.recyclingStatus in('%s','%s','%s') and po.operationRoom is not null ", InvoicePlan.class.getSimpleName(),InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, @@ -2092,6 +2115,7 @@ /** * 质量监测支持同时录入多个器械包改造数据升级,把材料和器械包信息写到QualityMonitoringGoods这个po类 */ + @Override public void qualityMonitoringDataMoveTousseAndMaterial(QualityMonitoringInstance qmi){ if(qmi == null){ return ; Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r19526 -r19643 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 19526) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 19643) @@ -4963,7 +4963,7 @@ if(!DatabaseUtil.isPoIdValid(tousseInstanceId)){ return ""; } - TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceById(tousseInstanceId); + TousseInstance tousseInstance = tousseInstanceManager.get(tousseInstanceId); TousseDefinition td = tousseInstance.getTousseDefinition(); if(tousseInstance == null || td == null || td.isDressing() || !td.recycling()){ Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceProduceParam.jsp =================================================================== diff -u -r12331 -r19643 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceProduceParam.jsp (.../tousseInstanceProduceParam.jsp) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceProduceParam.jsp (.../tousseInstanceProduceParam.jsp) (revision 19643) @@ -23,7 +23,7 @@ }else if(queryType.equals("material")){ TousseInstanceManager tousseInstanceManager = (TousseInstanceManager)SpringBeanManger.getApplicationContext().getBean("tousseInstanceManager"); - TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceById(id); + TousseInstance tousseInstance = tousseInstanceManager.get(id); response.setCharacterEncoding("utf-8"); StringBuffer buffer = new StringBuffer(); List materialDefinitionList = tousseInstance.getTousseDefinition().getMaterialInstance(); @@ -42,7 +42,7 @@ response.getWriter().print(buffer.toString()); }else if(queryType.equals("packing")){ TousseInstanceManager tousseInstanceManager = (TousseInstanceManager)SpringBeanManger.getApplicationContext().getBean("tousseInstanceManager"); - TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceById(id); + TousseInstance tousseInstance = tousseInstanceManager.get(id); response.setCharacterEncoding("utf-8"); StringBuffer buffer = new StringBuffer(); buffer.append(""); @@ -56,7 +56,7 @@ response.getWriter().print(buffer.toString()); }else if(queryType.equals("review")){ TousseInstanceManager tousseInstanceManager = (TousseInstanceManager)SpringBeanManger.getApplicationContext().getBean("tousseInstanceManager"); - TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceById(id); + TousseInstance tousseInstance = tousseInstanceManager.get(id); response.setCharacterEncoding("utf-8"); StringBuffer buffer = new StringBuffer(); buffer.append("
"); @@ -66,7 +66,7 @@ response.getWriter().print(buffer.toString()); }else if(queryType.equals("sterilization")){ TousseInstanceManager tousseInstanceManager = (TousseInstanceManager)SpringBeanManger.getApplicationContext().getBean("tousseInstanceManager"); - TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceById(id); + TousseInstance tousseInstance = tousseInstanceManager.get(id); response.setCharacterEncoding("utf-8"); StringBuffer buffer = new StringBuffer(); buffer.append("
"); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r19603 -r19643 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19603) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 19643) @@ -4945,7 +4945,7 @@ */ @Override public void createPackingTaskForRepacking(String tousseInstanceId) { - TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceById(tousseInstanceId); + TousseInstance tousseInstance = tousseInstanceManager.get(tousseInstanceId); if(tousseInstance == null){ return; } @@ -6332,8 +6332,7 @@ if (StringUtils.isNotBlank(ids)) { String[] idArray = ids.split(";"); for (String tousseInstanceId : idArray) { - TousseInstance ti = tousseInstanceManager - .getTousseInstanceById(tousseInstanceId); + TousseInstance ti = tousseInstanceManager.get(tousseInstanceId); if (ti != null && !StringUtils.equals(Constants.STR_YES,ti.getIsUrgentTousse())) { ti.setIsUrgentTousse(Constants.STR_YES); if (ti.getInvoicePlanID() == null) { Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java =================================================================== diff -u -r19314 -r19643 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 19314) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 19643) @@ -41,7 +41,6 @@ import com.forgon.tools.MathTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.BasePoManagerImpl; -import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.string.StringTools; /** @@ -190,7 +189,7 @@ } if (!ArrayUtils.isEmpty(tousseInstanceIdStrs)) { for (String idStr : tousseInstanceIdStrs) { - TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceById(idStr); + TousseInstance tousseInstance = tousseInstanceManager.get(idStr); // 如果器械包已经入灭菌筐了，需要把他从灭菌筐移除，如果这个灭菌筐除了这个器械包没有其他器械包了，则需要把篮筐状态重置成“空闲” Long reviewBasket_id = tousseInstance.getReviewBasket_id(); if (DatabaseUtil.isPoIdValid(reviewBasket_id)) { @@ -272,8 +271,7 @@ // 将所有新的器械包与代理灭菌关联 List proxyBasketTousses = new ArrayList(); for (String tousseId : tousseInstanceInBacketIdStrs) { - TousseInstance tousseInstance = tousseInstanceManager - .getTousseInstanceById(tousseId); + TousseInstance tousseInstance = tousseInstanceManager.get(tousseId); tousseInstance.setReviewBasket_id(reviewedBasket.getId()); Container container = reviewedBasket.getContainer(); if (container != null) { Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r18721 -r19643 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 18721) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 19643) @@ -145,6 +145,7 @@ objectDao.saveOrUpdate(qmInstance); } + @Override public void saveOrUpdate(QualityMonitoringInstance qmInstance, List needToRemove) { if (needToRemove != null && needToRemove.size() > 0) { @@ -516,7 +517,7 @@ qmInstance.setSterilizerName(sterilizerName); qmInstance.setSterilizerFrequency(sterilizerFre); if (StringUtils.isNotBlank(tousseInstanceId)) { - TousseInstance ti = tousseInstanceManager.getTousseInstanceById(tousseInstanceId); + TousseInstance ti = tousseInstanceManager.get(tousseInstanceId); if(ti != null){ qmInstance.setTousseInstance(ti); qmInstance.setSterilizerName(ti.getSterilizerName()); Index: ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java =================================================================== diff -u -r19154 -r19643 --- ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 19154) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java (.../RecallRecordManagerImpl.java) (revision 19643) @@ -60,7 +60,6 @@ import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.BasePoManagerImpl; -import com.forgon.tools.util.SqlUtils; /** * @@ -570,8 +569,7 @@ if (StringUtils.isNotBlank(tousseIds)) { String[] ids = tousseIds.split("#"); for (String id : ids) { - TousseInstance instance = tousseInstanceManager - .getTousseInstanceById(id); + TousseInstance instance = tousseInstanceManager.get(id); //非聚合包实例,只对状态为已灭菌、已发货和已签收的包变成待召回处理 if(instance.isSteriled() || instance.isShipped() || instance.isSigned()){ instance.setStatus(TousseInstance.STATUS_WAIT_FOR_RECALL);