Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r22180 -r22181 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22180) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22181) @@ -1,8 +1,6 @@ package com.forgon.disinfectsystem.tousse.toussedefinition.service; -import java.io.IOException; import java.io.OutputStream; -import java.io.PrintWriter; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; @@ -18,11 +16,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; -import javax.servlet.http.HttpServletResponse; - import jxl.Workbook; import jxl.write.Label; import jxl.write.WritableCellFormat; @@ -96,6 +92,8 @@ import com.forgon.disinfectsystem.tousse.toussedefinition.vo.TousseOperationVo; import com.forgon.disinfectsystem.vo.ItemDefinitionVO; import com.forgon.disinfectsystem.vo.TousseSimpleVO; +import com.forgon.exception.SystemException; +import com.forgon.exception.TousseInstanceNotExist; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.serialnumber.model.SerialNum; @@ -105,8 +103,6 @@ import com.forgon.tools.MathTools; import com.forgon.tools.SpringBeanManger; import com.forgon.tools.SqlBuilder; -import com.forgon.tools.StrutsParamUtils; -import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; @@ -672,6 +668,7 @@ * @param orgUnitCode 当前登陆科室 * @return 条数 */ + @Override public int countReviewedTousseInstanceWithOutBasketAmount(String orgUnitCode,String searchKeyWord){ boolean isDepart=false; //搜索内容中是否包括科室名,格式为:'搜索内容|科室code' @@ -818,6 +815,7 @@ /** * 加载待灭菌器械包信息 */ + @Override @SuppressWarnings("unchecked") public List getAllReviewedTousseInstanceWithOutBasketDate(String orgUnitCode,int start ,int limit,String searchKeyWord){ String findSql = ""; @@ -1509,6 +1507,7 @@ * @param barcode 输入的条码 * @return */ + @Override public boolean equalsBarcode(String barcode){ int i =0; String isFixedBarcodeSql = "select count(0) from TousseDefinition td join TousseInstance ti on ti.tousseDefinition_id=td.id " @@ -1756,7 +1755,8 @@ * 根据固定条码获取所有已审核的包数量（也可以说是库存） * @return */ - public int getTousseInstanceStockAmount(String barcode){ + @Override + public int getTousseInstanceStockAmount(String barcode){ if(StringUtils.isNotBlank(barcode)){ return getTousseInsDataByFixedBarcode(barcode,""," and status = '"+TousseInstance.STATUS_REVIEWED+"'","barcode",0).size(); } @@ -3354,10 +3354,10 @@ String barcode, Long sterilizationTransitionId) { TousseInstance tousseInstance = getFirst("barcode", barcode); if (tousseInstance == null){ - throw new RuntimeException("请扫描器械包条码!"); + throw new TousseInstanceNotExist("请扫描器械包条码!"); } if (!tousseInstance.isReviewed()) { - throw new RuntimeException("器械包状态必须为已审核才能做灭菌交接!"); + throw new SystemException("器械包状态必须为已审核才能做灭菌交接!"); } //如果是修改此灭菌交接记录（并且把此包实例删除后又添加也要能让再次扫描） @@ -3371,7 +3371,7 @@ if (sterilizationTransitionItem == null && tousseInstance.getSterilizationTransition()) { - throw new RuntimeException("此器械包已经做过灭菌交接!"); + throw new SystemException("此器械包已经做过灭菌交接!"); } return buildTousseInstanceJSONObject(tousseInstance); } @@ -3386,8 +3386,8 @@ JSONObject instanceJSONObject = new JSONObject(); if (tousseInstance != null) { instanceJSONObject.put("tousseDefinitionId", tousseInstance.getTousseDefinitionAncestorID()); - instanceJSONObject.put("id", tousseInstance.getId()); - instanceJSONObject.put("barcode", tousseInstance.getBarcode()); + instanceJSONObject.put("tousseInstanceId", tousseInstance.getId()); + instanceJSONObject.put("tousseInstanceBarcode", tousseInstance.getBarcode()); instanceJSONObject.put("tousseName", tousseInstance.getTousseName()); instanceJSONObject.put("packer", tousseInstance.getOperator()); //配包人 instanceJSONObject.put("packerCode", tousseInstance.getOperatorCode()); //配包人编码 @@ -3632,7 +3632,8 @@ * @param signRecordId * @return */ - public String batchSetSignRecordId(String departCode, String departName, + @Override + public String batchSetSignRecordId(String departCode, String departName, Long signRecordId) { if (null == signRecordId) { throw new RuntimeException("签收记录ID为空,生成签收记录失败"); @@ -3704,7 +3705,8 @@ * @param subtractionAmount 减少的数量 * @return 返回删除后的条码集合 */ - @SuppressWarnings("unused") + @Override + @SuppressWarnings("unused") public String fixedBarcodeBarcodeSubtraction(String fixedBarcode , String barcodes, int subtractionAmount){ if(!StringUtils.isNotBlank(barcodes) && !StringUtils.isNotBlank(fixedBarcode)){ throw new RuntimeException("tousseName 或 barcodes为空"); @@ -3778,7 +3780,8 @@ * 根据包条码，判断是否追溯 * @return true = 追溯 ,false = 不追溯 */ - public boolean checkTousseInsBarcodeIsTraceable(String barcode){ + @Override + public boolean checkTousseInsBarcodeIsTraceable(String barcode){ ResultSet rs = objectDao.executeSql(getCheckIsFixedBarcodeSql(barcode)); String isTraceable=""; String tousseFixedBarcode=""; @@ -3819,7 +3822,8 @@ * 根据条码判断是否需要统计汇总包信息 * @return */ - public boolean isCountBarcode(String barcode){ + @Override + public boolean isCountBarcode(String barcode){ String sql="select td.isTraceable,b.barcode from barcodeDevice b " + "left join TousseInstance ti on ti.id=b.id left join TousseDefinition td on td.id=ti.tousseDefinition_id where b.barcode='"+barcode+"'"; ResultSet rs = objectDao.executeSql(sql); @@ -3842,7 +3846,8 @@ } //根据barcode 判断是否追溯 true“是”或者“false否” - public boolean isCountBarcodeFor(String barcode){ + @Override + public boolean isCountBarcodeFor(String barcode){ String sql="select td.isTraceable,b.barcode from barcodeDevice b " + " join TousseInstance ti on ti.id=b.id join TousseDefinition td on td.id=ti.tousseDefinition_id where b.barcode='"+barcode+"'"; ResultSet rs = objectDao.executeSql(sql); @@ -3866,7 +3871,8 @@ } - public JSONArray getTodayPendingSterilizationTousseAndBasket(String status,String sterilizerNameTemp,String ownGroupTemp,String taskGroup){ + @Override + public JSONArray getTodayPendingSterilizationTousseAndBasket(String status,String sterilizerNameTemp,String ownGroupTemp,String taskGroup){ try { //String status = StrutsParamUtils.getPraramValue("status", ""); Map sterilingTypeMap = null; @@ -4104,7 +4110,8 @@ * @param type 1：累积扫描 * @return List */ - @SuppressWarnings("unused") + @Override + @SuppressWarnings("unused") public List getTousseInsDataByFixedBarcode(String fixedBarcode,String barcodes ,String sqlStatus,String paramsName,int type){ String idStr = checkIsFixedBarcode(fixedBarcode); TousseDefinition td = null; @@ -4178,7 +4185,8 @@ * @param sqlStatus 查询条件的状态 举例格式：and status="已审核" * @return */ - public List getTousseInsListByIdForBarcode(String fixedBarcode,String barcodes ,String sqlStatus){ + @Override + public List getTousseInsListByIdForBarcode(String fixedBarcode,String barcodes ,String sqlStatus){ List tousseInsIds = getTousseInsDataByFixedBarcode(fixedBarcode,barcodes ,sqlStatus, "id",1); List resultList = new ArrayList(); for (String ids : tousseInsIds) {