Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r35445 -r35447 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 35445) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 35447) @@ -44,32 +44,25 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.ParentPackage; -import org.apache.struts2.dispatcher.StrutsRequestWrapper; 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.directory.vo.LoginUserData; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils; -import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; 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.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.basedatamanager.bioreader.Bioreader; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; import com.forgon.disinfectsystem.entity.basedatamanager.position.Position; import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation; -import com.forgon.disinfectsystem.entity.basedatamanager.sterilizationpurposedisposablegoods.SteriliPurposeDisposableGoods; import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; -import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationInterruptRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; @@ -156,15 +149,8 @@ private TousseDefinitionManager tousseDefinitionManager; - private DateQueryAdapter dateQueryAdapter; - private SterilisationManager sterilisationManager; - private WareHouseManager wareHouseManager; - - public void setWareHouseManager(WareHouseManager wareHouseManager) { - this.wareHouseManager = wareHouseManager; - } public File[] getUploadFiles() { return uploadFiles; } @@ -184,10 +170,6 @@ public void setSterilisationManager(SterilisationManager sterilisationManager) { this.sterilisationManager = sterilisationManager; } - - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } public void setTousseDefinitionManager( TousseDefinitionManager tousseDefinitionManager) { Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r35445 -r35447 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35445) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35447) @@ -20,7 +20,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -86,17 +85,13 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstance; -import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock; import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; -import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem; -import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecord; import com.forgon.disinfectsystem.entity.sterilizationTransition.SterilizationTransitionItem; -import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationInterruptRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecordPic; @@ -128,7 +123,6 @@ import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.vo.SterilizationRecordPrintTousseItem; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationunload.service.SterileUnloadScanTousseManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.SenohSterilizerRecordManager; -import com.forgon.disinfectsystem.stockmanage.departmentstock.service.DepartmentStockManager; import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; import com.forgon.disinfectsystem.tousse.instrumentinstance.service.InstrumentInstanceManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; @@ -186,8 +180,6 @@ private DateQueryAdapter dateQueryAdapter; - private DepartmentStockManager departmentStockManager; - private static final int DEFALUT_VALUE = 1; private ReviewedBasketManager reviewedBasketManager; @@ -330,11 +322,6 @@ this.tousseInstanceManager = tousseInstanceManager; } - public void setDepartmentStockManager( - DepartmentStockManager departmentStockManager) { - this.departmentStockManager = departmentStockManager; - } - public void setWareHouseManager(WareHouseManager wareHouseManager) { this.wareHouseManager = wareHouseManager; } @@ -470,19 +457,6 @@ } /** - * 灭菌完成. - * @param sterilizationRecordIds - * @param orgUnitCode - * @param finishOperater - * @param finishComfirmer - * @return - */ - private JSONObject completeSterilization(Collection sterilizationRecordIds, - String orgUnitCode,String finishOperater,String finishComfirmer){ - return completeSterilization(sterilizationRecordIds,orgUnitCode,finishOperater,finishComfirmer,false); - } - - /** * 检查此灭菌记录是否有植入物，有则返回true，否则返回false * @param sterilizationRecord 灭菌记录对象 * @return @@ -3827,323 +3801,6 @@ invoiceOptimizeManager.submitInvoice(invoiceParams); }*/ - /** - * 生成外来器械包的发货单. - * @param foreignTousseInstances - * @param deptName - * @param deptCode - */ - private void extractForeignTousseInvoice( - List foreignTousseInstances, String deptName, - String deptCode) { - if (foreignTousseInstances.size() > 0) { - Map> foreignTousseApplications = new HashMap>(); - for (TousseInstance instance : foreignTousseInstances) { - ForeignTousseApplication application = (ForeignTousseApplication) objectDao - .getByProperty(ForeignTousseApplication.class - .getSimpleName(), "id", instance - .getForeignTousseApp_id()); - - if (foreignTousseApplications.get(application) == null) { - List instanceOfForeignTousseApplication = new ArrayList(); - instanceOfForeignTousseApplication.add(instance); - foreignTousseApplications.put(application, - instanceOfForeignTousseApplication); - } else { - foreignTousseApplications.get(application).add(instance); - } - } - //String notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"); - for (ForeignTousseApplication application : foreignTousseApplications - .keySet()) { - Invoice invoice = new Invoice(); - invoice.setSerialNumber(serialNumManager - .getSerialNumberStr(SerialNum.TYPE_INVOICE)); - invoice.setSender(AcegiHelper.getLoginUser().getUserFullName()); - invoice.setSendTime(new Date()); - invoice.setApplicant(application.getApplicant()); - invoice.setApplicationTime(application.getApplicationTime()); - invoice.setDepart(deptName); - invoice.setSettleAccountsDepart(deptName); - invoice.setOrgUnitCoding(AcegiHelper.getLoginUser() - .getCurrentOrgUnitCode()); - invoice.setStatus(Invoice.STATUS_DELIVERED); - List tousseInstanceList = foreignTousseApplications - .get(application); - Double foreignToussePrice = supplyRoomConfigManager - .getSystemParamsObj().getForeignToussePrice(); - invoice.setTotalPrice(new BigDecimal(foreignToussePrice) - .multiply( - new BigDecimal(foreignTousseApplications.get( - application).size() - + "")).doubleValue()); - Set items = new HashSet(); - for (TousseInstance instance : foreignTousseApplications - .get(application)) { - InvoiceItem item = new InvoiceItem(); - item.setTousseName(instance.getTousseName()); - TousseDefinition tousseDefinition = instance.getTousseDefinition(); - item.setTousseDefinitionId(tousseDefinition.getId()); - item.setMaterialAmount(tousseDefinition.getMaterialAmount()); - item.setDiposable("否"); - item.setTousseType(tousseDefinition.getTousseType()); - item.setAmount(1); - if(instance.getUrgentLevel() != null){ - invoice.setUrgent(Constants.STR_YES); - } - items.add(item); - } - invoice.setInvoiceItem(items); - invoice.setInvoicePlan(application); - invoice.setTousseAmount(tousseInstanceList.size()); - Integer tousseNotDeliveredAmount = objectDao.countObjectBySql( - TousseInstance.class.getName(), - "where po.foreignTousseApp_id =" - + application.getId()); - if (application.getInvoice() != null) { - for (Invoice invoiceOfApplication : application - .getInvoice()) { - tousseNotDeliveredAmount -= invoiceOfApplication - .getTousseAmount(); - } - } - //全部发货 - if (tousseNotDeliveredAmount - invoice.getTousseAmount() == 0) { - application - .setDeliverStatus(InvoicePlan.DELIVERSTATUS_DELIVERED); - application.setOrderByFiled(InvoicePlan.DELIVER_DELIVERED); - } else if (tousseNotDeliveredAmount - invoice.getTousseAmount() > 0) { - application - .setDeliverStatus(InvoicePlan.DELIVERSTATUS_PARTDELIVERED); - application.setOrderByFiled(InvoicePlan.DELIVER_PARTDELIVERED); - } - objectDao.saveOrUpdate(application); - for (TousseInstance tousseInstance : tousseInstanceList) { - tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED); - //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) - //if("false".equalsIgnoreCase(notSignedItemsCanRegistUseRecord)){ - TousseDefinition td = tousseInstance.getTousseDefinition(); - TousseDefinition ancestor = td; - if(td.isSplit() && DatabaseUtil.isPoIdValid(td.getParentID())){ - td = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), td.getParentID()); - } - Long ancestorId = td.getAncestorID(); - if(DatabaseUtil.isPoIdValid(ancestorId)){ - ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestorId); - } - if(Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ - tousseInstance.setStatus(TousseInstance.STATUS_SIGNED); - tousseInstance.setSignedDate(new Date()); - tousseInstance.setSignedUser("二级供应室发货系统自动签收"); - } - tousseInstance.setLocation(deptCode); - tousseInstance.setLocationForDisplay(deptName); - //结算科室赋值为所在位置,解决不能退货的问题 - tousseInstance.setSettleAccountsDepartCode(deptCode); - tousseInstance.setSettleAccountsDepart(deptName); - tousseInstanceManager.save(tousseInstance); - } - objectDao.saveOrUpdate(invoice); - } - } - } - - /** - * 生成普通器械包的发货单. - * @param tousseInstances - * @param deptName - * @param deptCode - */ - private void extractTousseInvoice(List tousseInstances,String deptName,String deptCode) { - if (tousseInstances.size() > 0) { - Invoice invoice = new Invoice(); - invoice.setSerialNumber(serialNumManager - .getSerialNumberStr(SerialNum.TYPE_INVOICE)); - invoice.setSender(AcegiHelper.getLoginUser().getUserFullName()); - invoice.setSendTime(new Date()); - invoice.setDepart(deptName); - invoice.setDepartCoding(deptCode); - invoice.setSettleAccountsDepart(deptName); - invoice.setSettleAccountsDepartCoding(deptCode); - invoice.setOrgUnitCoding(AcegiHelper.getLoginUser() - .getCurrentOrgUnitCode()); - invoice.setStatus(Invoice.STATUS_DELIVERED); - objectDao.saveOrUpdate(invoice); - Map map = new HashMap(); - Double totalPrice = 0.0; - Map> tousseNameTousseInstances = new HashMap>(); - Map proxyDisinfectionMap = new HashMap(); - boolean containTousseInstance = false; - //String notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"); - Map tousseNameAndIdMap = new HashMap(); - for (TousseInstance tousseInstance : tousseInstances) { - //如果该器械包实例是代理灭菌单内的包实例、且代理灭菌单的是否二次发货为"是",包实例的状态修改为"已灭菌",否则修改为"已发货" - Long proxyDisinfectionId = tousseInstance.getProxyDisinfection_id(); - TousseDefinition td = tousseInstance.getTousseDefinition(); - TousseDefinition ancestor = td; - Long ancestorId = td.getAncestorID(); - if(DatabaseUtil.isPoIdValid(ancestorId)){ - ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestorId); - } - if(DatabaseUtil.isPoIdValid(proxyDisinfectionId)){ - ProxyDisinfection proxyDisinfection = null; - if(proxyDisinfectionMap.containsKey(proxyDisinfectionId)){ - proxyDisinfection = proxyDisinfectionMap.get(proxyDisinfectionId); - }else{ - proxyDisinfection = (ProxyDisinfection)objectDao.getByProperty(ProxyDisinfection.class.getSimpleName(), "id", proxyDisinfectionId); - } - proxyDisinfectionMap.put(proxyDisinfectionId, proxyDisinfection); - if(proxyDisinfection != null && proxyDisinfection.canResendout()){ - tousseInstance.setStatus(TousseInstance.STATUS_STERILED); - }else{ - tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED); - //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) - //if("false".equalsIgnoreCase(notSignedItemsCanRegistUseRecord)){ - if(Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ - tousseInstance.setStatus(TousseInstance.STATUS_SIGNED); - tousseInstance.setSignedDate(new Date()); - tousseInstance.setSignedUser("二级供应室发货系统自动签收"); - if(TousseDefinition.canAddDepartmentStock(td)){ - tousseNameAndIdMap.put(td.getName(), td.getAncestorID()); - } - } - } - }else{ - tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED); - //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) - //if("false".equalsIgnoreCase(notSignedItemsCanRegistUseRecord)){ - if(Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ - tousseInstance.setStatus(TousseInstance.STATUS_SIGNED); - tousseInstance.setSignedDate(new Date()); - tousseInstance.setSignedUser("二级供应室发货系统自动签收"); - if(TousseDefinition.canAddDepartmentStock(td)){ - tousseNameAndIdMap.put(td.getName(), td.getAncestorID()); - } - } - } - - tousseInstance.setLocation(deptCode); - tousseInstance.setLocationForDisplay(deptName); - //结算科室赋值为所在位置,解决不能退货的问题 - tousseInstance.setSettleAccountsDepartCode(deptCode); - tousseInstance.setSettleAccountsDepart(deptName); - tousseInstance.setInvoice_id(invoice.getId()); - tousseInstanceManager.save(tousseInstance); - if(tousseInstance.getUrgentLevel() != null && !containTousseInstance && Constants.STR_YES.equals(invoice.getUrgent())){ - containTousseInstance = true; - invoice.setUrgent(Constants.STR_YES); - } - //包实例价格及折扣价 - Double tousseInstancePrice = tousseInstance.getPrice(); - Double tousseInstanceDiscountPrice = tousseInstance.getDiscountPrice(); - totalPrice = MathTools.add(totalPrice, tousseInstance.getPrice()).doubleValue(); - InvoiceItem item = map.get(tousseInstance.getTousseName()); - if (item == null) { - item = new InvoiceItem(); - item.setTousseName(tousseInstance.getTousseName()); - item.setTousseDefinitionId(td.getId()); - item.setMaterialAmount(td.getMaterialAmount()); - item.setDiposable("否"); - item.setTousseType(td.getTousseType()); - item.setAmount(1); - item.setSettlementPrice(tousseInstancePrice); - item.setSettlementDiscountPrice(tousseInstanceDiscountPrice); - map.put(item.getTousseName(), item); - } else { - item.setAmount(item.getAmount() + 1); - item.setSettlementPrice(MathTools.add(item.getSettlementPrice(), tousseInstancePrice).doubleValue()); - item.setSettlementDiscountPrice(MathTools.add(item.getSettlementDiscountPrice(), tousseInstanceDiscountPrice).doubleValue()); - } - // 普通器械包 - if (TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseInstance - .getTousseDefinition().getTousseType())){ - List tis = tousseNameTousseInstances.get(tousseInstance.getTousseName()); - if(tis == null){ - tis = new LinkedList(); - tousseNameTousseInstances.put(tousseInstance.getTousseName(), tis); - } - tis.add(tousseInstance); - } - } - - //往临床科室仓库添加库存 - WareHouse defaultWareHouse = wareHouseManager.getDefaultWareHouseByUnitCode(deptCode); - List goodsStockList = new ArrayList(); - for (TousseInstance tousseInstance : tousseInstances) { - if(tousseInstance.getComboTousseInstanceId() == null){ - goodsStockManager.addToList(goodsStockList, tousseInstance, defaultWareHouse); - tousseInstanceManager.setToWarehouse(tousseInstance, defaultWareHouse); - } - } - try { - if(CollectionUtils.isNotEmpty(goodsStockList)){ - goodsStockManager.saveOrUpdateGoodsStock(goodsStockList, GoodsStockManager.MODE_INSTOCK); - } - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e.getMessage()); - } - - /**更新手术室二级库存**/ - //废弃原因:二级库存已改为基数管理 - /* List list = supplyRoomConfigManager - .getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM); - String departmentCoding = ""; - String departmentName = ""; - if (list != null && list.size() > 0) { - departmentCoding = list.get(0).getOrgUnitCoding(); - departmentName = list.get(0).getOrgUnitName(); - } - departmentStockManager.addInsideTousseDepartmentStock(tousseNameTousseInstances, departmentCoding, departmentName);*/ - - Set items = new HashSet(); - items.addAll(map.values()); - invoice.setInvoiceItem(items); - invoice.setTotalPrice(totalPrice); - invoice.setTousseAmount(tousseInstances.size()); - objectDao.saveOrUpdate(invoice); - //重新计算代理灭菌单的发货状态 - reCalProxyDisinfecttionDeliverStatus(tousseInstances); - //基数管理添加科室库存 - if(MapUtils.isNotEmpty(tousseNameAndIdMap)){ - departmentStockManager.instrumentSetToBeAdded(deptName, deptCode, tousseNameAndIdMap); - } - } - } - - /** - * 根据器械包实例集合重新计算代理灭菌单的发货状态(用于二级供应室灭菌后自动发货时调用) - * @param tousseInstances 器械包实例集合 - */ - private void reCalProxyDisinfecttionDeliverStatus(List tousseInstances){ - if(CollectionUtils.isNotEmpty(tousseInstances)){ - List proxyDisinfecttionIdList = null; - for (TousseInstance tousseInstance : tousseInstances) { - if(DatabaseUtil.isPoIdValid(tousseInstance.getProxyDisinfection_id())){ - if(proxyDisinfecttionIdList == null){ - proxyDisinfecttionIdList = new ArrayList(); - } - if(!proxyDisinfecttionIdList.contains(tousseInstance.getProxyDisinfection_id())){ - proxyDisinfecttionIdList.add(tousseInstance.getProxyDisinfection_id()); - } - } - } - if(CollectionUtils.isNotEmpty(proxyDisinfecttionIdList)){ - String updateSql = String.format("update %s set deliverStatus=%s where %s" , - InvoicePlan.class.getSimpleName(), - "(case " - + "when (select count(0) from TousseInstance ti where ti.proxyDisinfection_id=invoicePlan.id and ti.invoice_id is not null and ti.status <> '"+ TousseInstance.STATUS_DISCARD +"') > 0 and (select count(0) from TousseInstance ti where ti.proxyDisinfection_id=invoicePlan.id and ti.invoice_id is null and ti.status <> '"+ TousseInstance.STATUS_DISCARD +"') > 0 then '"+ InvoicePlan.DELIVER_PARTDELIVERED +"' " - + "when (select count(0) from TousseInstance ti where ti.proxyDisinfection_id=invoicePlan.id and ti.invoice_id is not null and ti.status <> '"+ TousseInstance.STATUS_DISCARD +"') > 0 and (select count(0) from TousseInstance ti where ti.proxyDisinfection_id=invoicePlan.id and ti.invoice_id is null and ti.status <> '"+ TousseInstance.STATUS_DISCARD +"') = 0 then '"+ InvoicePlan.DELIVERSTATUS_DELIVERED +"' " - + "when (select count(0) from TousseInstance ti where ti.proxyDisinfection_id=invoicePlan.id and ti.invoice_id is not null and ti.status <> '"+ TousseInstance.STATUS_DISCARD +"') = 0 and (select count(0) from TousseInstance ti where ti.proxyDisinfection_id=invoicePlan.id and ti.invoice_id is null and ti.status <> '"+ TousseInstance.STATUS_DISCARD +"') > 0 then '"+ InvoicePlan.DELIVERSTATUS_AWAITDELIVER +"' " - + "when (select count(0) from TousseInstance ti where ti.proxyDisinfection_id=invoicePlan.id and ti.invoice_id is not null and ti.status <> '"+ TousseInstance.STATUS_DISCARD +"') = 0 and (select count(0) from TousseInstance ti where ti.proxyDisinfection_id=invoicePlan.id and ti.invoice_id is null and ti.status <> '"+ TousseInstance.STATUS_DISCARD +"') = 0 then '' " - + " else '' " - + "end)", - SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", proxyDisinfecttionIdList)); - objectDao.excuteSQL(updateSql); - } - } - } - @Override public void saveRecordPicture(Long sterilizationRecordId, Collection pictures, String deletePicIds) { @@ -8124,7 +7781,6 @@ JSONArray timeArr = new JSONArray(); JSONArray endPressureArr = new JSONArray(); JSONArray endTemperatureArr = new JSONArray(); - SimpleDateFormat dateCharSdf = new SimpleDateFormat("HH:mm"); for (CaspStageDetails record : caspStageDetailsListList) { endPressureArr.add(record.getEndPressure()); endTemperatureArr.add(record.getEndTemperature());