Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r21832 -r21833 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 21832) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 21833) @@ -3474,7 +3474,6 @@ } long end=System.currentTimeMillis(); - System.out.println("111111111111111111:"+(end-start)); return false; } @@ -3506,7 +3505,6 @@ } } JSONArray jsonArray = new JSONArray(); - System.out.println(dateQueryAdapter); TimeoutSetting timeoutSetting = timeoutManager.getTimeoutSetting(TimeoutManager.PROCEDURE_REVIEW_TO_STERILE); int hour=timeoutSetting.getHour(); int minute=timeoutSetting.getMinute(); @@ -3523,17 +3521,14 @@ // 所有待灭菌的审核篮筐 List reviewedBaskets = reviewedBasketManager .getDepartAllReviewedBasket(orgUnitCoding); - System.out.println("==待灭菌的审核篮筐="+reviewedBaskets); // 当天审核的，未入筐的器械包 List toussesOutsideBasketOfToday = getTodayReviewedTousseInstanceWithOutBasket(orgUnitCoding); - System.out.println("==未入筐的器械包="+toussesOutsideBasketOfToday); long start=System.currentTimeMillis(); // 遍历加载放入灭菌篮筐的器械包 for (ReviewedBasket basket : reviewedBaskets) { - System.out.println("开始循环"); Container container = basket.getContainer(); List vos = getTousseInstanceVOsInReviewedBasket(basket, taskGroup, null); //对包实例的集合进行排序(排序处理逻辑参见TousseSimpleVO类的compareTo方法) @@ -3560,14 +3555,7 @@ boolean flag = false; Map bMap=Maps.newHashMap(); long start11=System.currentTimeMillis(); - System.out.println("2ceng each start,size="+vos.size()); - long extime=0; - long extime1=0; - long extime55=0; - long extime444=0; - int successcut=0; - int successcutnihsangsi=0; for (TousseSimpleVO vo : vos) { if (sterilingTypeMap == null || Constants.HAS_TYPE_NO.equals(vo.getSterilingType()) || sterilingTypeMap.get(vo.getSterilingType()) != null) { flag = true; @@ -3577,7 +3565,6 @@ boolean isCountBarcode="是".equals(vo.getIsTraceable())?true:false; String objName=vo.getDefinitionName(); long end44=System.currentTimeMillis(); - extime1=extime1+(end44-start44); if(bMap.containsKey(key) && isCountBarcode){//只有支持扫固定条码的包，才去统计 //已存在 则取出该对象，对象中 objAmount 累加。 JSONObject obj = bMap.get(key); @@ -3588,7 +3575,6 @@ obj.put("objBarcode", getTousseInsFixedBarcode(objName)); long end33=System.currentTimeMillis(); - extime=extime+(end33-start33); //覆盖 bMap.put(key, obj); }else{ @@ -3602,7 +3588,6 @@ //isTimeout=timeoutManager.isTimeouted(vo.getReviewTime(), hour, minute); //自测速度跟上一段代码一样 long end444=System.currentTimeMillis(); - extime444=extime444+(end444-start444); tousseInBasket.put("depart", vo.getDepart()); tousseInBasket.put("objName",objName ); tousseInBasket.put("objBarcode", vo.getBarcode()); @@ -3630,9 +3615,6 @@ } } - System.out.println("2ceng each end,"+(System.currentTimeMillis()-start11)+ - ",===tousseInstanceManager.getTousseInsFixedBarcode(vo.getItemDefinition().getName())总用时，"+extime - +"==-=-=-"+extime1+"---=--=判断超时代码："+extime444); for (String key : bMap.keySet()) { JSONObject tousseInBasket=bMap.get(key); tousseInBasketArray.add(tousseInBasket); @@ -3654,8 +3636,6 @@ } } long end=System.currentTimeMillis(); - System.out.println("第一部分耗时："+(end-start)); - System.out.println("遍历加载放入灭菌篮筐的器械包结束循环"); long start2=System.currentTimeMillis(); // 去重，key为名称， value为具体的数据。 如果名称重复，则取出该分组数据，累加。否则新增.。 什么结果？ @@ -3673,7 +3653,6 @@ String key=tousseOutsideBasket.getShowTousseName(); if(isTimeout){ key=sortRule+tousseOutsideBasket.getShowTousseName(); - //System.out.println(tousseOutsideBasket.getShowTousseName()+"已超时"); } if(resultMap.containsKey(key) && isCountBarcode(tousseOutsideBasket.getBarcode())){//只有支持扫固定条码的包，才去统计 //已存在 则取出该对象，对象中 objAmount 累加。 启动name就 @@ -3710,11 +3689,6 @@ } } } - long end2=System.currentTimeMillis(); - System.out.println("第二段耗时:"+(end2-start2)); - System.out.println("第二段循环完成"); - - long start3=System.currentTimeMillis(); List resultList=Lists.newArrayList(); for (String key : resultMap.keySet()) { JSONObject obj = resultMap.get(key); @@ -3733,16 +3707,12 @@ } } } - long end3=System.currentTimeMillis(); - System.out.println("第三段耗时:"+(end3-start3)); - System.out.println("第3段循环完成"); //StrutsResponseUtils.output(jsonArray); return jsonArray; } catch (Exception e) { e.printStackTrace(); } return null; - } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java =================================================================== diff -u -r21137 -r21833 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java (.../TousseSimpleVO.java) (revision 21137) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java (.../TousseSimpleVO.java) (revision 21833) @@ -25,6 +25,8 @@ private ItemDefinitionVO itemDefinition; private String barcode; private String isUrgentTousse; + private String definitionName; + private String IsTraceable; /** * 新增加审核时间的属性,用于省医需求待灭菌及待灭菌装配的显示 * @since 2016-06-29 by shuyongfu @@ -44,7 +46,23 @@ */ private String departCoding; - public String getIsUrgentTousse() { + public String getDefinitionName() { + return definitionName; + } + + public void setDefinitionName(String definitionName) { + this.definitionName = definitionName; + } + + public String getIsTraceable() { + return IsTraceable; + } + + public void setIsTraceable(String isTraceable) { + IsTraceable = isTraceable; + } + + public String getIsUrgentTousse() { return isUrgentTousse; }