Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r13416 -r13590 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 13416) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 13590) @@ -30,9 +30,19 @@ public void deleteSterilizationRecordPicById(String picId); public void deleteSterilizationRecordById(Long id); - + /** + * 删除灭菌记录实体对象，并做日志记录 + * @param sterilizationRecord 要删除的灭菌记录实体对象 + */ public void deleteSterilizationRecord( SterilizationRecord sterilizationRecord); + + /** + * 删除灭菌记录,修改灭菌记录中包实例的状态为已审核,修改ReviewedBasket关联的灭菌筐的状态为灭菌装载,修改ReviewedBasket关联的器械包的状态为已审核 + * @param sterilizationRecordIdStr 灭菌记录的id,多个id以;分隔 + * @return 删除是否成功的描述信息,json格式 + */ + public String delete(String sterilizationRecordIdStr); public List getAllSterilizationRecord(); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r13416 -r13590 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 13416) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 13590) @@ -34,16 +34,17 @@ var result = Ext.decode(response.responseText); var success = result.success; if (true != success) { - showResult(result.cause); + showResult('删除失败'); + grid.dwrReload(); return; } else { showResult('删除成功'); grid.dwrReload(); } }, failure : function(response, options) { - var result = Ext.decode(response.responseText); - showResult(result.cause); + //var result = Ext.decode(response.responseText); + showResult('删除失败'); } }); } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r13118 -r13590 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 13118) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 13590) @@ -225,46 +225,7 @@ */ public void deleteSterilizationRecord() { String idStr = StrutsParamUtils.getPraramValue("ids", ""); - String message = ""; - try { - if (StringUtils.isNotBlank(idStr)) { - String[] str = idStr.split(";"); - for (String id : str) { - // 修改包实例的状态，以审核；删除灭菌记录 - SterilizationRecord sterilizationRecord = sterilizationRecordManager - .getSterilizationRecordById(Long.valueOf(id)); - List tousseInstanceList = sterilizationRecord - .getTousseInstanceList(); - for (TousseInstance tousseInstance : tousseInstanceList) { - tousseInstance - .setStatus(TousseInstance.STATUS_REVIEWED); - tousseInstanceManager.saveOrUpdate(tousseInstance); - } - List reviewedBasketList = sterilizationRecord - .getReviewedBaskets(); - for (ReviewedBasket reviewedBasket : reviewedBasketList) { - // tousseInstanceManager.deleteReviewedBasket(reviewedBasket); - reviewedBasket.getContainer().setStatus( - Container.CONTAINER_STATUS_STERILIZELOADING); - //设置篮筐中的器械包状态为已审核 - Set set = reviewedBasket.getTousseInstances(objectDao); - if(CollectionUtils.isNotEmpty(set)){ - for (TousseInstance tousseInstance : set) { - tousseInstance - .setStatus(TousseInstance.STATUS_REVIEWED); - tousseInstanceManager.saveOrUpdate(tousseInstance); - } - } - } - sterilizationRecordManager - .deleteSterilizationRecord(sterilizationRecord); - } - message = "{success:true}"; - } - } catch (Exception e) { - message = "{success:false}"; - e.printStackTrace(); - } + String message = sterilizationRecordManager.delete(idStr); HttpServletResponse httpServletResponse = StrutsParamUtils .getResponse(); httpServletResponse.setCharacterEncoding("UTF-8"); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r13499 -r13590 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 13499) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 13590) @@ -728,6 +728,49 @@ } + @Override + public String delete(String sterilizationRecordIdStr) { + JSONObject message = new JSONObject(); + try { + if (StringUtils.isNotBlank(sterilizationRecordIdStr)) { + String[] str = sterilizationRecordIdStr.split(";"); + for (String id : str) { + // 修改包实例的状态，以审核；删除灭菌记录 + SterilizationRecord sterilizationRecord = getSterilizationRecordById(Long.valueOf(id)); + List tousseInstanceList = sterilizationRecord + .getTousseInstanceList(); + for (TousseInstance tousseInstance : tousseInstanceList) { + tousseInstance + .setStatus(TousseInstance.STATUS_REVIEWED); + tousseInstanceManager.saveOrUpdate(tousseInstance); + } + List reviewedBasketList = sterilizationRecord + .getReviewedBaskets(); + for (ReviewedBasket reviewedBasket : reviewedBasketList) { + // tousseInstanceManager.deleteReviewedBasket(reviewedBasket); + reviewedBasket.getContainer().setStatus( + Container.CONTAINER_STATUS_STERILIZELOADING); + //设置篮筐中的器械包状态为已审核 + Set set = reviewedBasket.getTousseInstances(objectDao); + if(CollectionUtils.isNotEmpty(set)){ + for (TousseInstance tousseInstance : set) { + tousseInstance + .setStatus(TousseInstance.STATUS_REVIEWED); + tousseInstanceManager.saveOrUpdate(tousseInstance); + } + } + } + deleteSterilizationRecord(sterilizationRecord); + } + message.put("success", true); + } + } catch (Exception e) { + message.put("success", false); + e.printStackTrace(); + } + return message.toString(); + } + /** * 保存或更新灭菌记录 * 检查发现一旦有某一个器械包在其它灭菌单已完成灭菌,则给予提示,返回相应的提示消息至客户端 Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r13568 -r13590 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 13568) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 13590) @@ -128,7 +128,6 @@ import com.forgon.tools.Path; import com.forgon.tools.SpringBeanManger; import com.forgon.tools.SqlBuilder; -import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.date.DateTools; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.DateJsonValueProcessor; @@ -3067,4 +3066,13 @@ JSONArray array = JSONArray.fromObject(list); return new JSONStringer().object().key("success").value(true).key("data").value(array).endObject().toString(); } + /** + * 删除灭菌记录 + * @param params + * @return + */ + public String deleteSterilizationRecord(JSONObject params){ + String idStr =params.getString("ids"); + return sterilizationRecordManager.delete(idStr); + } }