Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r16066 -r16079 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 16066) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 16079) @@ -575,6 +575,17 @@ * 4. success,2, [条码]:[名称]:[灭菌程序]:[科室]:true * 5. success,3, [条码]:[名称]:[灭菌程序]:[科室]:true ,[条码]:[名称]:[灭菌程序]:[科室]:true * 6. success,4, ,[篮筐]:[条码]:[名称]:[灭菌程序]:true ,[篮筐]:[条码]:[名称]:[灭菌程序]:true + * + * + * 上面解释的六种响应消息格式和下面代码不一致，对下面代码的响应格式补充说明 + * 响应消息格式(success分别对应-1:失败、0:单个器械包、1:单个容器(单个灭菌框或虚拟篮筐)、2:不追溯器械包、3:首尾器械包、4:首尾虚拟篮筐) + * 1. failure,-1,失败原因 + * 2. success,0,[器械包名称],[灭菌程序],[科室名称][,true,在科室供应室那里配置的超大、重外来器械灭菌方式/,true,false,/,false,][,是/,否] + * 3. success,1,审核篮筐名称 【,[器械包条码]:[器械包名称]:[灭菌程序]:[科室名称][:true:在科室供应室那里配置的超大、重外来器械灭菌方式/:true:/:false:]】 ....... + * 4. success,2 【,[器械包条码]:[器械包名称]:[灭菌程序]:[科室名称][:true:在科室供应室那里配置的超大、重外来器械灭菌方式/:true:/:false:]】 ....... + * 5. success,3, 【,[器械包条码]:[器械包名称]:[灭菌程序]:[科室名称][:true:在科室供应室那里配置的超大、重外来器械灭菌方式/:true:/:false:]】 ....... + * 6. success,4, 【,[虚拟篮筐编号]:[器械包条码]:[器械包名称]:[灭菌程序]:[科室名称][:true:在科室供应室那里配置的超大、重外来器械灭菌方式/:true:/:false:]】 ....... + * */ public void loadTousseInstanceInfo() { String barcodeStr = StrutsParamUtils.getPraramValue("barcode", ""); @@ -607,81 +618,56 @@ break; }else if (tousseInstance != null && StringUtils.isNotBlank(tousseInstance.getTousseName())) { - String tousseName = tousseInstance - .getTousseName(); - if (tousseInstance.getTousseDefinition().isForeignTousse() - || tousseInstance.getTousseDefinition().isSterilizationTousse() - || tousseInstance.getTousseDefinition().isCustomTousse()) { - - } + String tousseName = tousseInstance.getTousseName(); + result += "," + tousseInstance.getBarcode() - + ":" + tousseName + ":" + tousseInstance - .getSterilingType() + ":" + StringUtils.defaultString(tousseInstance.getDepart(), ""); + + ":" + tousseName + + ":" + tousseInstance.getSterilingType() + + ":" + StringUtils.defaultString(tousseInstance.getDepart(), ""); // 超重、超大外来器械用配置的灭菌方式 - if (TousseDefinition.BIG_PACKAGE_TRUE - .equals(tousseInstance - .getTousseDefinition() - .getIsBigPackage())) { - String bigPackage = supplyRoomConfigManager - .getSystemParamsObj() - .getBigPackageSterilizerType(); - if (StringUtils - .isNotBlank(bigPackage)) { - result += ":true:" - + bigPackage; + if (TousseDefinition.BIG_PACKAGE_TRUE.equals( + tousseInstance.getTousseDefinition().getIsBigPackage())) { + String bigPackage = supplyRoomConfigManager.getSystemParamsObj().getBigPackageSterilizerType(); + if (StringUtils.isNotBlank(bigPackage)) { + result += ":true:" + bigPackage; } else { result += ":true:"; } } else { result += ":false:"; } - } } }else if(barcodeDevice instanceof Container){ result = "success,4,"; for(int i = 0;i < tousseInstanceList.size();i++){ tousseInstance = (TousseInstance)tousseInstanceList.get(i); if (tousseInstance != null - && StringUtils - .isNotBlank(tousseInstance - .getTousseName())) { - String tousseName = tousseInstance - .getTousseName(); - if (tousseInstance.getTousseDefinition().isForeignTousse() - || tousseInstance.getTousseDefinition().isSterilizationTousse() - || tousseInstance.getTousseDefinition().isCustomTousse()) { - - } + && StringUtils.isNotBlank(tousseInstance.getTousseName())) { + String tousseName = tousseInstance.getTousseName(); + result += "," + tousseInstance.getVirtualBasketSeqNum() + ":"+ tousseInstance.getBarcode() - + ":" + tousseName + ":" + tousseInstance - .getSterilingType() + ":" + StringUtils.defaultString(tousseInstance.getDepart(), ""); + + ":" + tousseName + + ":" + tousseInstance.getSterilingType() + + ":" + StringUtils.defaultString(tousseInstance.getDepart(), ""); // 超重、超大外来器械用配置的灭菌方式 - if (TousseDefinition.BIG_PACKAGE_TRUE - .equals(tousseInstance - .getTousseDefinition() - .getIsBigPackage())) { - String bigPackage = supplyRoomConfigManager - .getSystemParamsObj() - .getBigPackageSterilizerType(); - if (StringUtils - .isNotBlank(bigPackage)) { - result += ":true:" - + bigPackage; + if (TousseDefinition.BIG_PACKAGE_TRUE.equals( + tousseInstance.getTousseDefinition().getIsBigPackage())) { + String bigPackage = supplyRoomConfigManager.getSystemParamsObj().getBigPackageSterilizerType(); + if (StringUtils.isNotBlank(bigPackage)) { + result += ":true:" + bigPackage; } else { result += ":true:"; } } else { result += ":false:"; } - } } } - result += ""; }else{ result = "success,-1,未找到符合条件的器械包"; @@ -726,13 +712,11 @@ if (tousseInstance.getUnTraceableTousse()) { // 不追溯的器械包（含普通器械包、敷料包、外部代理灭菌包） String name = tousseDefinition.getName(); String orgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); - Integer scanAmount = tousseDefinition.getScanAmount(); List toussesOfToday = tousseInstanceManager.getTodayReviewedTousseInstanceByNameAndOrgUnitCode(orgUnitCode, name); Map todayToussesMap = new HashMap(); - for (TousseInstance tousse : toussesOfToday) { todayToussesMap.put(tousse.getBarcode(), tousse); } @@ -773,9 +757,10 @@ result += ("," + tousseInstance1.getBarcode() + ":" + tousseName - + ":" + tousseInstance1.getSterilingType()) + ":" - + StringUtils.defaultString(tousseInstance.getDepart(), ""); + + ":" + tousseInstance1.getSterilingType()) + + ":" + StringUtils.defaultString(tousseInstance.getDepart(), ""); + if (TousseDefinition.BIG_PACKAGE_TRUE.equals( tousseInstance1.getTousseDefinition().getIsBigPackage())) { // 超重、超大外来器械用配置的灭菌方式 @@ -851,11 +836,10 @@ if (StringUtils.isNotBlank(loadTousseNamesInBasket)) { Set toussesInBasket = null; - //如果为灭菌筐,按原有方式查询 - if(Container.CONTAINER_PURPOSE_DISINFECTION.equals(container.getPurpose())){ + + if(Container.CONTAINER_PURPOSE_DISINFECTION.equals(container.getPurpose())){ //如果为灭菌筐,按原有方式查询 toussesInBasket = tousseInstanceManager.getReviewedTousseInstanceByBasket(barcode); - }else if(Container.CONTAINER_PURPOSE_VIRTUAL.equals(container.getPurpose())){ - //如果为虚拟篮筐,则按范围区间方式查询,begin和end都为条码的参数 + }else if(Container.CONTAINER_PURPOSE_VIRTUAL.equals(container.getPurpose())){ //如果为虚拟篮筐,则按范围区间方式查询,begin和end都为条码的参数 Map map = barcodeManager.getTousseInstanceListByRange(barcode, barcode, TousseInstance.STATUS_REVIEWED); if(map != null && map.get("result") != null){ toussesInBasket = new HashSet(); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16069 -r16079 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16069) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16079) @@ -667,7 +667,9 @@ } /** - * 获得篮筐的所有器械包 + * 根据审核篮筐获取审核篮筐的所有器械包（前提是该篮筐没有登记过灭菌记录或者灭菌失败） + * @param barcode 审核篮筐条码 + * @return */ @Override public Set getReviewedTousseInstanceByBasket(String barcode) { @@ -689,8 +691,6 @@ if (basket != null && basket.size() > 0) { Set newTousseInstances = new HashSet(); for(ReviewedBasket reviewedBasket : basket){ - /*ReviewedBasket reviewedBasket = basket - .get(0);*/ Set tousseInstances = reviewedBasket.getTousseInstances(objectDao); if (tousseInstances == null) { logger.debug("篮筐Id:" + reviewedBasket.getId() @@ -1464,7 +1464,7 @@ } /** - * 获取指定科室今天审核的指定器械包 + * 根据科室编码和器械包名称，获取今天审核未入灭菌篮筐的器械包 * @param orgUnitCode 科室编码 * @param name 器械包名称 * @return Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java =================================================================== diff -u -r16059 -r16079 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16059) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16079) @@ -67,6 +67,11 @@ public List getReviewedTousseInstanceVOs( String sterileBasketBarcode); + /** + * 根据审核篮筐获取审核篮筐的所有器械包（前提是该篮筐没有登记过灭菌记录或者灭菌失败） + * @param barcode 审核篮筐条码 + * @return + */ public Set getReviewedTousseInstanceByBasket(String barcode); public List getTodayReviewedTousseInstanceWithOutBasket( @@ -83,7 +88,7 @@ String orgUnitCode , String beginDate , String endDate); /** - * 获取指定科室今天审核的指定器械包 + * 根据科室编码和器械包名称，获取今天审核未入灭菌篮筐的器械包 * @param orgUnitCode 科室编码 * @param name 器械包名称 * @return Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r16041 -r16079 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16041) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16079) @@ -471,10 +471,10 @@ url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!loadTousseInstanceInfo.do', params : { barcode : barcodeStr, - loadTousseNamesInBasket : true, - sterilizationRecordId : sterilizationRecordId, - checkProxyDisinfection : 'yes', - saveBarcode : saveBarcode + loadTousseNamesInBasket : true, //是否要加载篮筐里的器械包名称 + sterilizationRecordId : sterilizationRecordId, //灭菌记录id + checkProxyDisinfection : 'yes', //是否需要检查代理灭菌是否已录入代理灭菌单 + saveBarcode : saveBarcode //此次扫描之前已经扫描的条码集合 }, success : function(response, options) {//debugger; if(checkRepeat(barcodeStr)){