Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r19677 -r20810 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 19677) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 20810) @@ -301,12 +301,6 @@ public List getWaitSterileGoods(String sterilizerName); /** - * 判别器械包的类型（此方法只适用于灭菌那里对器械包类型的分类统计） - * @param tousseInstance 器械包实例 - * @return - */ - public String getTypeForSterilizationStatistics(TousseInstance tousseInstance); - /** * 设置灭菌记录的循环次数。如果还没有循环次数的话。循环次数为null或者小于0就重新设置 * @param sterilizationRecord */ Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r20139 -r20810 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 20139) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 20810) @@ -2651,39 +2651,6 @@ } @Override - public String getTypeForSterilizationStatistics(TousseInstance tousseInstance) { - String typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_INSIDE; - TousseDefinition td = tousseInstance.getTousseDefinition(); - if (td != null) { - //敷料包 - if (td.isDressing()) { - if (tousseInstance.getProxyDisinfection_id() != null) { - typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_PROXY; - } else { - typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_DRESSING; - } - // 器械包(包括但不限于"器械包"、"自定义器械包") - } else if (td.isInsideTousse() || td.isCustomTousse()) { - if (tousseInstance.getProxyDisinfection_id() != null) { - typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_PROXY; - } else if (TousseDefinition.STR_YES.equals(td.getIsForeignTousse())) { - typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_FOREIGN; - } else { - typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_INSIDE; - } - // 外来器械包(包括但不限于"外来器械包"、"外来器械拆分小包"、"外来器械包当普通器械包") - } else if (td.isSplit() || td.isForeignTousse()) { - typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_FOREIGN; - } else if (td.isForeignProxyTousse()) { - typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_PROXY; - } - } else { - throw new RuntimeException("找不到包定义！"); - } - return typeForSterilizationStatistics; - } - - @Override public void setCycleCountIfNeed(SterilizationRecord sterilizationRecord) { if(sterilizationRecord == null){ return; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r20326 -r20810 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 20326) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 20810) @@ -425,7 +425,7 @@ jsonObj.put("isParentNode", true); jsonObj.put("barcode", tousse.getBarcode()); jsonObj.put("name", tousseName); - jsonObj.put("typeForSterilizationStatistics", sterilizationRecordManager.getTypeForSterilizationStatistics(tousse)); + jsonObj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousse)); jsonObj.put("depart", StringUtils.defaultString(tousse.getDepart(), "")); jsonObj.put("type", "器械包"); jsonObj.put("position", tousse.getSterilizerPosition()); @@ -463,7 +463,7 @@ tousseObj.put("isParentNode", false); tousseObj.put("barcode", tousseInstance.getBarcode()); tousseObj.put("name", tousseName); - tousseObj.put("typeForSterilizationStatistics", sterilizationRecordManager.getTypeForSterilizationStatistics(tousseInstance)); + tousseObj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance)); tousseObj.put("depart", StringUtils.defaultString(tousseInstance.getDepart(), "")); tousseObj.put("type", "器械包"); tousseObj.put("amount", 1); @@ -766,7 +766,7 @@ JSONObject temp = new JSONObject(); temp.put("tousseBarcode", tousseInstance1.getBarcode()); temp.put("tousseName", tousseInstance1.getTousseName()); - temp.put("typeForSterilizationStatistics", sterilizationRecordManager.getTypeForSterilizationStatistics(tousseInstance1)); + temp.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance1)); temp.put("SterilingType", tousseInstance1.getSterilingType()); temp.put("department", StringUtils.defaultString(tousseInstance1.getDepart(), "")); temp.put("reviewTime", ForgonDateUtils.safelyFormatDate(tousseInstance1.getReviewTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); @@ -790,7 +790,7 @@ jsonObj.put("success", 0); jsonObj.put("tousseBarcode", tousseInstance.getBarcode()); jsonObj.put("tousseName", tousseInstance.getTousseName()); - jsonObj.put("typeForSterilizationStatistics", sterilizationRecordManager.getTypeForSterilizationStatistics(tousseInstance)); + jsonObj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance)); jsonObj.put("SterilingType", tousseInstance.getSterilingType()); jsonObj.put("department", StringUtils.defaultString(tousseInstance.getDepart(), "")); jsonObj.put("includeImplant", includeImplant); @@ -847,7 +847,7 @@ JSONObject temp = new JSONObject(); temp.put("tousseBarcode", tousseInstance.getBarcode()); temp.put("tousseName", tousseInstance.getTousseName()); - temp.put("typeForSterilizationStatistics", sterilizationRecordManager.getTypeForSterilizationStatistics(tousseInstance)); + temp.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance)); temp.put("SterilingType", tousseInstance.getSterilingType()); temp.put("department", StringUtils.defaultString(tousseInstance.getDepart(), "")); temp.put("reviewTime", ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); @@ -879,7 +879,7 @@ JSONObject temp = new JSONObject(); temp.put("tousseBarcode", tousseInstance.getBarcode()); temp.put("tousseName", tousseInstance.getTousseName()); - temp.put("typeForSterilizationStatistics", sterilizationRecordManager.getTypeForSterilizationStatistics(tousseInstance)); + temp.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance)); temp.put("SterilingType", tousseInstance.getSterilingType()); temp.put("department", StringUtils.defaultString(tousseInstance.getDepart(), "")); temp.put("reviewTime", ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); @@ -898,7 +898,7 @@ temp.put("virtualBasketSeqNum", tousseInstance.getVirtualBasketSeqNum()); temp.put("tousseBarcode", tousseInstance.getBarcode()); temp.put("tousseName", tousseInstance.getTousseName()); - temp.put("typeForSterilizationStatistics", sterilizationRecordManager.getTypeForSterilizationStatistics(tousseInstance)); + temp.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance)); temp.put("SterilingType", tousseInstance.getSterilingType()); temp.put("department", StringUtils.defaultString(tousseInstance.getDepart(), "")); temp.put("reviewTime", ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); @@ -1003,7 +1003,7 @@ returnDataJsonObject.put("type", TousseDefinition.PACKAGE_TYPE_INSIDE); returnDataJsonObject.put("barcode", tousseInstance.getBarcode()); returnDataJsonObject.put("name", tousseInstance.getTousseName()); - returnDataJsonObject.put("typeForSterilizationStatistics", sterilizationRecordManager.getTypeForSterilizationStatistics(tousseInstance)); + returnDataJsonObject.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance)); returnDataJsonObject.put("sterilingType", tousseInstance.getSterilingType()); returnDataJsonObject.put("depart", StringUtils.defaultString(tousseInstance.getDepart()," ")); returnDataJsonObject.put("reviewTime", ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); @@ -1061,7 +1061,7 @@ JSONObject jsonObject = new JSONObject(); jsonObject.put("barcode", tousseInstance.getBarcode()); jsonObject.put("name", tousseInstance.getTousseName()); - jsonObject.put("typeForSterilizationStatistics", sterilizationRecordManager.getTypeForSterilizationStatistics(tousseInstance)); + jsonObject.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance)); jsonObject.put("sterilingType", tousseInstance.getSterilingType()); jsonObject.put("depart", StringUtils.defaultString(tousseInstance.getDepart()," ")); jsonObject.put("reviewTime", ForgonDateUtils.safelyFormatDate(tousseInstance.getReviewTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); @@ -1092,6 +1092,43 @@ } return validateResultJsonObject; } + + /** + * 判别器械包的类型（此方法只适用于灭菌那里对器械包类型的分类统计） + * @param tousseInstance 器械包实例 + * @return + */ + public String getTypeForSterilizationStatistics(TousseInstance tousseInstance) { + String typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_INSIDE; + TousseDefinition td = tousseInstance.getTousseDefinition(); + if (td != null) { + //敷料包 + if (td.isDressing()) { + if (tousseInstance.getProxyDisinfection_id() != null) { + typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_PROXY; + } else { + typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_DRESSING; + } + // 器械包(包括但不限于"器械包"、"自定义器械包") + } else if (td.isInsideTousse() || td.isCustomTousse()) { + if (tousseInstance.getProxyDisinfection_id() != null) { + typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_PROXY; + } else if (TousseDefinition.STR_YES.equals(td.getIsForeignTousse())) { + typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_FOREIGN; + } else { + typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_INSIDE; + } + // 外来器械包(包括但不限于"外来器械包"、"外来器械拆分小包"、"外来器械包当普通器械包") + } else if (td.isSplit() || td.isForeignTousse()) { + typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_FOREIGN; + } else if (td.isForeignProxyTousse()) { + typeForSterilizationStatistics = TousseDefinition.PACKAGE_TYPE_PROXY; + } + } else { + throw new RuntimeException("找不到包定义！"); + } + return typeForSterilizationStatistics; + } // 加载灭菌程序 public void getSterilizationType() {