Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java =================================================================== diff -u -r38204 -r38449 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java (.../SterilizationTransitionManager.java) (revision 38204) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java (.../SterilizationTransitionManager.java) (revision 38449) @@ -67,4 +67,11 @@ * @param id 灭菌交接记录id */ public void updatePrintStatus(Long id); + /** + * 构建灭菌交接信息 主要用于灭菌交接模块中打开灭菌交接记录获取信息 + * @param sterilizationTransition + * @return + */ + public JSONObject buildsterilizationTransitionJson( + SterilizationTransition sterilizationTransition); } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java =================================================================== diff -u -r38231 -r38449 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java (.../SterilizationTransitionManagerImpl.java) (revision 38231) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java (.../SterilizationTransitionManagerImpl.java) (revision 38449) @@ -4,8 +4,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -414,4 +416,64 @@ } } } + @Override + public JSONObject buildsterilizationTransitionJson( + SterilizationTransition sterilizationTransition) { + JSONObject data = new JSONObject(); + data.put("id", sterilizationTransition.getId()); + data.put("serialNumber", sterilizationTransition.getSerialNumber()); + data.put("transitionTime", ForgonDateUtils.safelyFormatDate(sterilizationTransition.getTransitionTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + data.put("handoverCode", sterilizationTransition.getHandoverCode()); + data.put("handover", sterilizationTransition.getHandover()); + data.put("takeoverCode", sterilizationTransition.getTakeoverCode()); + data.put("takeover", sterilizationTransition.getTakeover()); + + //如果存在灭菌篮筐,则设置对应的属性 + Container container = (Container) objectDao.getByProperty(Container.class.getSimpleName(), "id", sterilizationTransition.getContainerId()); + if(null!=container){ + data.put("containerName", container.getContainerName()); + data.put("containerBarcode", container.getBarcode()); + } + + Map map = new HashMap(); + JSONArray scannedBarcodeArr = new JSONArray(); + List items = sterilizationTransition.getSterilizationTransitionItems(objectDao); + if (CollectionUtils.isNotEmpty(items)) { + for (SterilizationTransitionItem item : items) { + JSONObject tousseDefinitionNode = map.get(item.getTousseDefinitionId()); + if (tousseDefinitionNode == null) { + tousseDefinitionNode = new JSONObject(); + tousseDefinitionNode.put("nodeId", item.getTousseDefinitionId() + "-"); + tousseDefinitionNode.put("tousseDefinitionId", item.getTousseDefinitionId()); + tousseDefinitionNode.put("tousseName", item.getAncestorTousseName()); + tousseDefinitionNode.put("amount", 0); + tousseDefinitionNode.put("expanded", true); + tousseDefinitionNode.put("children", new JSONArray()); + map.put(item.getTousseDefinitionId(), tousseDefinitionNode); + } + + JSONObject child = new JSONObject(); + child.put("nodeId", item.getTousseDefinitionId() + "-" + item.getTousseInstanceId()); + child.put("id", item.getId()); + child.put("tousseDefinitionId", item.getTousseDefinitionId()); + child.put("tousseName", item.getTousseName()); + child.put("tousseInstanceId", item.getTousseInstanceId()); + child.put("idCardInstanceBarcode", item.getIdCardInstanceBarcode()); + child.put("tousseInstanceBarcode", item.getTousseInstanceBarcode()); + child.put("packerCode", item.getPackerCode()); + child.put("packer", item.getPacker()); + child.put("reviewerCode", item.getReviewerCode()); + child.put("reviewer", item.getReviewer()); + child.put("operationTime", ForgonDateUtils.safelyFormatDate(item.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + child.put("isUrgentTousse", item.getIsUrgentTousse()); + child.put("leaf", true); + tousseDefinitionNode.optJSONArray("children").add(child); + tousseDefinitionNode.put("amount", (tousseDefinitionNode.optInt("amount") + 1)); + scannedBarcodeArr.add(item.getTousseInstanceBarcode()); + } + } + data.put("children", map.values()); + data.put("scannedBarcodeArr", scannedBarcodeArr); + return data; + } } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java =================================================================== diff -u -r38204 -r38449 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (.../SterilizationTransitionAction.java) (revision 38204) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (.../SterilizationTransitionAction.java) (revision 38449) @@ -143,75 +143,10 @@ JSONObject result = JSONUtil.buildJsonObject(false, "找不到对应的灭菌交接!"); if (sterilizationTransition != null && DatabaseUtil.isPoIdValid(sterilizationTransition.getId())) { result = JSONUtil.buildJsonObject(true, "加载成功!"); - result.put("data", buildsterilizationTransitionJson(sterilizationTransition)); + result.put("data", sterilizationTransitionManager.buildsterilizationTransitionJson(sterilizationTransition)); } StrutsResponseUtils.output(result); } - - /** - * 构建灭菌交接记录的json对象. - * @param sterilizationTransition - * @return - */ - private JSONObject buildsterilizationTransitionJson( - SterilizationTransition sterilizationTransition) { - JSONObject data = new JSONObject(); - data.put("id", sterilizationTransition.getId()); - data.put("serialNumber", sterilizationTransition.getSerialNumber()); - data.put("transitionTime", ForgonDateUtils.safelyFormatDate(sterilizationTransition.getTransitionTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - data.put("handoverCode", sterilizationTransition.getHandoverCode()); - data.put("handover", sterilizationTransition.getHandover()); - data.put("takeoverCode", sterilizationTransition.getTakeoverCode()); - data.put("takeover", sterilizationTransition.getTakeover()); - - //如果存在灭菌篮筐,则设置对应的属性 - Container container = (Container) objectDao.getByProperty(Container.class.getSimpleName(), "id", sterilizationTransition.getContainerId()); - if(null!=container){ - data.put("containerName", container.getContainerName()); - data.put("containerBarcode", container.getBarcode()); - } - - Map map = new HashMap(); - JSONArray scannedBarcodeArr = new JSONArray(); - List items = sterilizationTransition.getSterilizationTransitionItems(objectDao); - if (CollectionUtils.isNotEmpty(items)) { - for (SterilizationTransitionItem item : items) { - JSONObject tousseDefinitionNode = map.get(item.getTousseDefinitionId()); - if (tousseDefinitionNode == null) { - tousseDefinitionNode = new JSONObject(); - tousseDefinitionNode.put("nodeId", item.getTousseDefinitionId() + "-"); - tousseDefinitionNode.put("tousseDefinitionId", item.getTousseDefinitionId()); - tousseDefinitionNode.put("tousseName", item.getAncestorTousseName()); - tousseDefinitionNode.put("amount", 0); - tousseDefinitionNode.put("expanded", true); - tousseDefinitionNode.put("children", new JSONArray()); - map.put(item.getTousseDefinitionId(), tousseDefinitionNode); - } - - JSONObject child = new JSONObject(); - child.put("nodeId", item.getTousseDefinitionId() + "-" + item.getTousseInstanceId()); - child.put("id", item.getId()); - child.put("tousseDefinitionId", item.getTousseDefinitionId()); - child.put("tousseName", item.getTousseName()); - child.put("tousseInstanceId", item.getTousseInstanceId()); - child.put("idCardInstanceBarcode", item.getIdCardInstanceBarcode()); - child.put("tousseInstanceBarcode", item.getTousseInstanceBarcode()); - child.put("packerCode", item.getPackerCode()); - child.put("packer", item.getPacker()); - child.put("reviewerCode", item.getReviewerCode()); - child.put("reviewer", item.getReviewer()); - child.put("operationTime", ForgonDateUtils.safelyFormatDate(item.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - child.put("isUrgentTousse", item.getIsUrgentTousse()); - child.put("leaf", true); - tousseDefinitionNode.optJSONArray("children").add(child); - tousseDefinitionNode.put("amount", (tousseDefinitionNode.optInt("amount") + 1)); - scannedBarcodeArr.add(item.getTousseInstanceBarcode()); - } - } - data.put("children", map.values()); - data.put("scannedBarcodeArr", scannedBarcodeArr); - return data; - } /** * 保存或者修改灭菌交接记录.