Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java =================================================================== diff -u -r21833 -r21834 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java (.../TousseSimpleVO.java) (revision 21833) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java (.../TousseSimpleVO.java) (revision 21834) @@ -26,7 +26,7 @@ private String barcode; private String isUrgentTousse; private String definitionName; - private String IsTraceable; + private String isTraceable; /** * 新增加审核时间的属性,用于省医需求待灭菌及待灭菌装配的显示 * @since 2016-06-29 by shuyongfu @@ -55,11 +55,11 @@ } public String getIsTraceable() { - return IsTraceable; + return isTraceable; } public void setIsTraceable(String isTraceable) { - IsTraceable = isTraceable; + isTraceable = isTraceable; } public String getIsUrgentTousse() { Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r21833 -r21834 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 21833) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 21834) @@ -3560,33 +3560,27 @@ if (sterilingTypeMap == null || Constants.HAS_TYPE_NO.equals(vo.getSterilingType()) || sterilingTypeMap.get(vo.getSterilingType()) != null) { flag = true; } - long start44=System.currentTimeMillis(); String key =vo.getDefinitionName(); boolean isCountBarcode="是".equals(vo.getIsTraceable())?true:false; String objName=vo.getDefinitionName(); - long end44=System.currentTimeMillis(); if(bMap.containsKey(key) && isCountBarcode){//只有支持扫固定条码的包,才去统计 //已存在 则取出该对象,对象中 objAmount 累加。 JSONObject obj = bMap.get(key); int amt=(int) obj.get("objAmount"); amt++; obj.put("objAmount", amt); - long start33=System.currentTimeMillis(); obj.put("objBarcode", getTousseInsFixedBarcode(objName)); - long end33=System.currentTimeMillis(); //覆盖 bMap.put(key, obj); }else{ JSONObject tousseInBasket = new JSONObject(); String isUrgentTousse = vo.getIsUrgentTousse(); boolean isTimeout =false; - long start444=System.currentTimeMillis(); // 判断是否超时的java代码 处理缓慢 isTimeout =timeoutManager.isTimeouted(vo.getReviewTime(),timeoutSetting); //isTimeout=timeoutManager.isTimeouted(vo.getReviewTime(), hour, minute); //自测速度跟上一段代码一样 - long end444=System.currentTimeMillis(); tousseInBasket.put("depart", vo.getDepart()); tousseInBasket.put("objName",objName ); @@ -3635,9 +3629,7 @@ } } } - long end=System.currentTimeMillis(); - long start2=System.currentTimeMillis(); // 去重,key为名称, value为具体的数据。 如果名称重复,则取出该分组数据,累加。否则新增.。 什么结果? Map resultMap=Maps.newTreeMap(); String sortRule="aaaaa";//根据treeMap 特性,将已超时的排在前面