Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java =================================================================== diff -u -r39489 -r41468 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java (.../RinserManagerImpl.java) (revision 39489) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java (.../RinserManagerImpl.java) (revision 41468) @@ -115,6 +115,53 @@ } @Override + public String getAllRinserListData(String departCoding, String useStatus, + Long rinserGroupId) { + if(StringUtils.isBlank(departCoding)){ + departCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); + } + StringBuffer buff = new StringBuffer("["); + try { + SqlUtils.checkInputParam(departCoding); + SqlUtils.checkInputParam(useStatus); + List list = getRinserByDepartCoding(departCoding, useStatus, rinserGroupId); + if (list != null && list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + Rinser rinser = list.get(i); + if(buff.length()>1){ + buff.append(","); + } + buff.append("['").append(rinser.getName()).append("','") + .append(rinser.getConCurrent()).append("','") + .append(rinser.getBarcode()).append("','") + .append(getCleanMethodsJsonData(rinser)).append("','") + .append(rinser.getDefaultWashMethod()).append("'").append("]") + ; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + buff.append("]"); + return buff.toString(); + } + + private String getCleanMethodsJsonData(Rinser rinser){ + StringBuffer sb = new StringBuffer("["); + if(rinser!=null){ + Set cleanMethods = rinser.getCleanMethods(); + for(CleanMethod c:cleanMethods){ + if(sb.length()>1){ + sb.append(","); + } + sb.append("[").append(c.getId()).append(",\"").append(c.getCleanMethod()).append("\",\"").append(c.getBarcode()).append("\",").append(c.getCleanMinutes()).append("]"); + } + + } + return sb.append("]").toString(); + } + + @Override public Rinser getRinserByName(String rinserName) { Rinser rinser = null; if (rinserName == null) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java =================================================================== diff -u -r41443 -r41468 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 41443) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 41468) @@ -236,52 +236,11 @@ * return 返回格式：[[灭菌程序id1,灭菌程序名称1],[灭菌程序id2,灭菌程序名称2],[灭菌程序id3,灭菌程序名称3]...] */ public void getSterilizerType() { - List list = barcodeManager.getSterilizationType(); String sterilizerName = StrutsParamUtils.getPraramValue( "sterilizerName", ""); - StringBuffer buffer = new StringBuffer(); - boolean isSterilizationRecordModel = "sterilizationRecord" - .equals(StrutsParamUtils.getPraramValue("type", "")); - if (!isSterilizationRecordModel) { - buffer.append("['0','无'],"); - } - if (StringUtils.isNotBlank(sterilizerName)) { - Sterilizer sterilizer = sterilizerManager - .getSterilizerByName(sterilizerName); - if (sterilizer != null) { - Set set = sterilizer.getSterilisations(); - for (Sterilisation sterilisation : set) { - buffer.append("['").append(sterilisation.getId()) - .append("','") - .append(sterilisation.getSterilisation()) - .append("'],"); - } - } - } else { - if (list != null && list.size() > 0) { - for (int i = 0; i < list.size(); i++) { - if (list.get(i) instanceof Sterilisation) { - Sterilisation sterilisation = list - .get(i); - buffer.append("['").append(sterilisation.getId()) - .append("','") - .append(sterilisation.getSterilisation()) - .append("'],"); - } - } - } - } - String result = ""; - if (buffer.length() > 0) { - result = buffer.substring(0, buffer.length() - 1); - } - HttpServletResponse response = StrutsParamUtils.getResponse(); - try { - response.setCharacterEncoding("utf-8"); - response.getWriter().print("[" + result + "]"); - } catch (IOException e) { - e.printStackTrace(); - } + String type = StrutsParamUtils.getPraramValue("type", ""); + String result = sterilizerManager.getSterilizerType(sterilizerName, type); + StrutsResponseUtils.output(result); } /** * 获取所有灭菌炉的灭菌程序,供多选框使用 @@ -323,63 +282,12 @@ public void getAllSterilizer() { String useStatus = StrutsParamUtils.getPraramValue("useStatus", ""); String needFilter = StrutsParamUtils.getPraramValue("needFilter", "true"); //是否需要过滤(在器械包信息页面中的灭菌炉获取中，不需要进行过滤，需要显示全部的灭菌炉) - Query query = null; - if(needFilter.equals("true")){ - String ownGroup = StrutsParamUtils.getPraramValue( - "ownGroup", ""); - String departCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); - - String queryString = "from " + Sterilizer.class.getSimpleName() + " where orgUnitCoding = :orgUnitCoding"; - if (StringUtils.isNotBlank(ownGroup)){ - queryString += " and ownGroup = :ownGroup"; - } - if(StringUtils.isNotBlank(useStatus)){ - queryString += " and useStatus = :useStatus"; - } - queryString += " order by sequence"; - query = objectDao.getHibernateSession().createQuery(queryString); - query.setParameter("orgUnitCoding", departCoding); - - if (StringUtils.isNotBlank(ownGroup)){ - query.setParameter("ownGroup", ownGroup); - } - if(StringUtils.isNotBlank(useStatus)){ - query.setParameter("useStatus", useStatus); - } - }else{ //不需要根据科室和组进行过滤 - String queryString = "from " + Sterilizer.class.getSimpleName(); - if(StringUtils.isNotBlank(useStatus)){ - queryString += " and useStatus = '" + useStatus + "'"; - } - queryString += " order by sequence"; - query = objectDao.getHibernateSession().createQuery(queryString); - } - List sterilizerList = query.list(); - - String str = ""; - if (CollectionUtils.isNotEmpty(sterilizerList)){ - for(Sterilizer s : sterilizerList){ - str = str + "[ '" + s.getName() + "'],"; - } - - } - - str = str.length() > 0 ? str.substring(0, str.length() - 1) : str; - if (StringUtils.equals("yes", - StrutsParamUtils.getPraramValue("includeNone", null))) { - str = "['']," + str; - } - if (StringUtils.equals(Constants.STR_YES, - StrutsParamUtils.getPraramValue("needAll", null))) { //前台combo是否需要一个“全部”的标志， - str = "['全部']," + str; - } - HttpServletResponse response = StrutsParamUtils.getResponse(); - try { - response.setCharacterEncoding("utf-8"); - response.getWriter().print("[" + str + "]"); - } catch (IOException e) { - e.printStackTrace(); - } + String orgUnitCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); + String ownGroup = StrutsParamUtils.getPraramValue("ownGroup", ""); + String includeNone = StrutsParamUtils.getPraramValue("includeNone", null); + String needAll = StrutsParamUtils.getPraramValue("needAll", null); + String result = sterilizerManager.getSterilizersJsonString(needFilter, orgUnitCoding, ownGroup, useStatus, includeNone, needAll); + StrutsResponseUtils.output(result); } /** Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java =================================================================== diff -u -r39095 -r41468 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java (.../RinserManager.java) (revision 39095) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java (.../RinserManager.java) (revision 41468) @@ -17,6 +17,15 @@ public List getRinserByDepartCoding(String departCoding); public boolean verifyRinser(String id,String name); + + /** + * 查询清洗机-将原action方法里面业务搬迁至manager层(GDSKQYY-14) + * @param departCoding 科室编码 + * @param useStatus 在用状态 + * @param rinserGroupId 清洗机分组id + * @return + */ + public String getAllRinserListData(String departCoding,String useStatus,Long rinserGroupId); public Rinser getRinserByName(String rinserName); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java =================================================================== diff -u -r40426 -r41468 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java (.../RinserAction.java) (revision 40426) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java (.../RinserAction.java) (revision 41468) @@ -361,38 +361,8 @@ String useStatus = StrutsParamUtils.getPraramValue("useStatus", null); //清洗机分组IDZJYY-135 Long rinserGroupId = StrutsParamUtils.getPraramLongValue("rinserGroupId", null); - if(StringUtils.isBlank(departCoding)){ - departCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); - } - StringBuffer buff = new StringBuffer("["); - try { - SqlUtils.checkInputParam(departCoding); - SqlUtils.checkInputParam(useStatus); - List list = rinserManager.getRinserByDepartCoding(departCoding, useStatus, rinserGroupId); - if (list != null && list.size() > 0) { - for (int i = 0; i < list.size(); i++) { - Rinser rinser = list.get(i); - if(buff.length()>1){ - buff.append(","); - } - buff.append("['").append(rinser.getName()).append("','") - .append(rinser.getConCurrent()).append("','") - .append(rinser.getBarcode()).append("','") - .append(getCleanMethodsJsonData(rinser)).append("']"); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - buff.append("]"); - - HttpServletResponse response = StrutsParamUtils.getResponse(); - try { - response.setCharacterEncoding("utf-8"); - response.getWriter().print(buff.toString()); - } catch (IOException e) { - e.printStackTrace(); - } + String result = rinserManager.getAllRinserListData(departCoding, useStatus, rinserGroupId); + StrutsResponseUtils.output(result); } /** @@ -418,21 +388,6 @@ StrutsResponseUtils.output(true, message); } - private String getCleanMethodsJsonData(Rinser rinser){ - StringBuffer sb = new StringBuffer("["); - if(rinser!=null){ - Set cleanMethods = rinser.getCleanMethods(); - for(CleanMethod c:cleanMethods){ - if(sb.length()>1){ - sb.append(","); - } - sb.append("[").append(c.getId()).append(",\"").append(c.getCleanMethod()).append("\",\"").append(c.getBarcode()).append("\",").append(c.getCleanMinutes()).append("]"); - } - - } - return sb.append("]").toString(); - } - public void iniInfo() { try { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManager.java =================================================================== diff -u -r34250 -r41468 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManager.java (.../CleanMethodManager.java) (revision 34250) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManager.java (.../CleanMethodManager.java) (revision 41468) @@ -19,7 +19,13 @@ public boolean verifyCleanMethod(String id,String name); public List getAllCleanMethod(); - + + /** + * 查出所有清洗程序--将原action方法里面业务搬迁至manager层(GDSKQYY-14) + * @return + */ + public String findCleanMethodArr(); + public CleanMethod getCleanMethodByName(String name); /** Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/action/CleanMethodAction.java =================================================================== diff -u -r34442 -r41468 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/action/CleanMethodAction.java (.../CleanMethodAction.java) (revision 34442) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/action/CleanMethodAction.java (.../CleanMethodAction.java) (revision 41468) @@ -174,29 +174,8 @@ * added by wang 2012-03-30 10:50 */ public void findCleanMethodArr() { - List list = cleanMethodManager.getAllCleanMethod(); - StringBuffer buff = new StringBuffer("["); - if (list != null && list.size() > 0) { - for (int i = 0; i < list.size(); i++) { - CleanMethod cleanMethod = list.get(i); - if (buff.length() > 1) { - buff.append(","); - } - buff.append("['").append(cleanMethod.getId()).append("','") - .append(cleanMethod.getCleanMethod()).append("','") - .append(cleanMethod.getBarcode()).append("',") - .append(cleanMethod.getCleanMinutes()) - .append("]"); - } - } - buff.append("]"); - HttpServletResponse response = StrutsParamUtils.getResponse(); - try { - response.setCharacterEncoding("utf-8"); - response.getWriter().print(buff.toString()); - } catch (IOException e) { - e.printStackTrace(); - } + String result = cleanMethodManager.findCleanMethodArr(); + StrutsResponseUtils.output(result); } public void findCleanMethodArrClone() { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java =================================================================== diff -u -r41361 -r41468 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java (.../SterilizerManagerImpl.java) (revision 41361) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java (.../SterilizerManagerImpl.java) (revision 41468) @@ -1,8 +1,10 @@ package com.forgon.disinfectsystem.basedatamanager.sterilizer.service; import com.fasterxml.jackson.core.type.TypeReference; +import com.forgon.Constants; import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.model.BarcodeDevice; +import com.forgon.disinfectsystem.barcode.service.BarcodeManager; import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; import com.forgon.disinfectsystem.basedatamanager.sterilizer.param.SterilizationFrequencyRemindParam; import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager; @@ -23,11 +25,13 @@ import com.forgon.tools.json.JacksonUtil; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.SqlUtils; + import org.apache.commons.collections.MapUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.hibernate.Query; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -46,6 +50,9 @@ private SupplierManager supplierManager; private SterilisationManager sterilisationManager; + + @Autowired + private BarcodeManager barcodeManager; private DateQueryAdapter dateQueryAdapter; @@ -112,6 +119,56 @@ } @Override + public String getSterilizersJsonString(String needFilter, String orgUnitCoding, + String ownGroup, String useStatus,String includeNone,String needAll) { + Query query = null; + if(needFilter.equals("true")){ + String queryString = "from " + Sterilizer.class.getSimpleName() + " where orgUnitCoding = :orgUnitCoding"; + if (StringUtils.isNotBlank(ownGroup)){ + queryString += " and ownGroup = :ownGroup"; + } + if(StringUtils.isNotBlank(useStatus)){ + queryString += " and useStatus = :useStatus"; + } + queryString += " order by sequence"; + query = objectDao.getHibernateSession().createQuery(queryString); + query.setParameter("orgUnitCoding", orgUnitCoding); + + if (StringUtils.isNotBlank(ownGroup)){ + query.setParameter("ownGroup", ownGroup); + } + if(StringUtils.isNotBlank(useStatus)){ + query.setParameter("useStatus", useStatus); + } + }else{ //不需要根据科室和组进行过滤 + String queryString = "from " + Sterilizer.class.getSimpleName(); + if(StringUtils.isNotBlank(useStatus)){ + queryString += " and useStatus = '" + useStatus + "'"; + } + queryString += " order by sequence"; + query = objectDao.getHibernateSession().createQuery(queryString); + } + List sterilizerList = query.list(); + + String str = ""; + if (CollectionUtils.isNotEmpty(sterilizerList)){ + for(Sterilizer s : sterilizerList){ + str = str + "[ '" + s.getName() + "'],"; + } + + } + + str = str.length() > 0 ? str.substring(0, str.length() - 1) : str; + if (StringUtils.equals("yes",includeNone)) { + str = "['']," + str; + } + if (StringUtils.equals(Constants.STR_YES, needAll)) { //前台combo是否需要一个“全部”的标志， + str = "['全部']," + str; + } + return "[" + str + "]"; + } + + @Override public List getSterilizerNameListByDepartCodings( String departCodings) { String queryString = "select name from " + Sterilizer.class.getSimpleName(); @@ -357,4 +414,46 @@ int count = objectDao.countBySql("select count(*) from SterilizationRecord where sterilizer_id="+ sr.getId() +" and startDate between "+ dateQueryAdapter.dateAdapter(sdf.format(startDate)) +" and "+ dateQueryAdapter.dateAdapter(sdf.format(newDate))); return count>0?false:true; } + + @Override + public String getSterilizerType(String sterilizerName, String type) { + List list = barcodeManager.getSterilizationType(); + StringBuffer buffer = new StringBuffer(); + boolean isSterilizationRecordModel = "sterilizationRecord" + .equals(type); + if (!isSterilizationRecordModel) { + buffer.append("['0','无'],"); + } + if (StringUtils.isNotBlank(sterilizerName)) { + Sterilizer sterilizer = getSterilizerByName(sterilizerName); + if (sterilizer != null) { + Set set = sterilizer.getSterilisations(); + for (Sterilisation sterilisation : set) { + buffer.append("['").append(sterilisation.getId()) + .append("','") + .append(sterilisation.getSterilisation()) + .append("'],"); + } + } + } else { + if (list != null && list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + if (list.get(i) instanceof Sterilisation) { + Sterilisation sterilisation = list + .get(i); + buffer.append("['").append(sterilisation.getId()) + .append("','") + .append(sterilisation.getSterilisation()) + .append("'],"); + } + } + } + } + String result = ""; + if (buffer.length() > 0) { + result = buffer.substring(0, buffer.length() - 1); + } + return "[" + result + "]"; + } + } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManagerImpl.java =================================================================== diff -u -r34250 -r41468 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManagerImpl.java (.../CleanMethodManagerImpl.java) (revision 34250) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManagerImpl.java (.../CleanMethodManagerImpl.java) (revision 41468) @@ -59,6 +59,27 @@ } @Override + public String findCleanMethodArr() { + List list = getAllCleanMethod(); + StringBuffer buff = new StringBuffer("["); + if (list != null && list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + CleanMethod cleanMethod = list.get(i); + if (buff.length() > 1) { + buff.append(","); + } + buff.append("['").append(cleanMethod.getId()).append("','") + .append(cleanMethod.getCleanMethod()).append("','") + .append(cleanMethod.getBarcode()).append("',") + .append(cleanMethod.getCleanMinutes()) + .append("]"); + } + } + buff.append("]"); + return buff.toString(); + } + + @Override public CleanMethod getCleanMethodByName(String name) { return (CleanMethod) objectDao.getByProperty(CleanMethod.class .getSimpleName(), "cleanMethod", name); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java =================================================================== diff -u -r41361 -r41468 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java (.../SterilizerManager.java) (revision 41361) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManager.java (.../SterilizerManager.java) (revision 41468) @@ -26,6 +26,18 @@ public List getAllSterilizer(); /** + * 获取灭菌炉（前台调用）-将原action方法里面业务搬迁至manager层(GDSKQYY-14) + * @param needFilter 是否需要过滤 + * @param orgUnitCoding 供应室编码 + * @param ownGroup 灭菌炉分组 + * @param useStatus 使用状态 + * @param includeNone + * @param needAll + * @return + */ + public String getSterilizersJsonString(String needFilter,String orgUnitCoding,String ownGroup,String useStatus,String includeNone,String needAll); + + /** * 获取所有灭菌炉的名称 * @return */ @@ -79,4 +91,13 @@ * @return */ public boolean isFirstFrequency(SupplyRoomConfig systemParamsObj, Sterilizer sr); + + /** + * 获取指定的灭菌炉的灭菌程序，如果不指定将返回所有灭菌程序-将原action方法里面业务搬迁至manager层(GDSKQYY-14) + * @param sterilizerName 灭菌炉名称 + * @param type 类型(添加灭菌记录的灭菌程序下拉框传值为”sterilizationRecord“) + * @return + */ + public String getSterilizerType(String sterilizerName,String type); + } Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r41367 -r41468 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 41367) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 41468) @@ -28,6 +28,7 @@ import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.model.SterilisationNotice; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilisationNoticeChecker; import com.forgon.tools.json.*; + import net.sf.json.JSONArray; import net.sf.json.JSONException; import net.sf.json.JSONNull; @@ -67,14 +68,17 @@ import com.forgon.directory.service.SysUserManager; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; +import com.forgon.disinfectsystem.basedatamanager.cleanmethod.service.CleanMethodManager; import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.basedatamanager.container.service.ReviewedBasketManager; import com.forgon.disinfectsystem.basedatamanager.departmentgroup.service.DepartmentGroupManager; import com.forgon.disinfectsystem.basedatamanager.invoice.service.InvoiceUtils; import com.forgon.disinfectsystem.basedatamanager.operationroom.service.OperationRoomManager; import com.forgon.disinfectsystem.basedatamanager.position.service.PositionManager; +import com.forgon.disinfectsystem.basedatamanager.rinser.service.RinserManager; import com.forgon.disinfectsystem.basedatamanager.specialInfection.service.SpecialInfectionManager; import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; +import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager; import com.forgon.disinfectsystem.basedatamanager.storagelocation.goodsaccess.service.StorageLocationGoodsAccessManager; import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; @@ -474,6 +478,13 @@ private ReceiveRecordManager receiveRecordManager; @Autowired private GodownEntryManager godownEntryManager; + @Autowired + private SterilizerManager sterilizerManager; + @Autowired + private RinserManager rinserManager; + @Autowired + private CleanMethodManager cleanMethodManager; + /** * 新的独立事务manager */ @@ -3114,6 +3125,7 @@ } json.put("data", sterileMethodToJson(sterilisation)); json.put("barcode", barcode); + json.put("name", sterilisation.getSterilisation()); json.put("type", "sterileMethod"); return json.toString(); // 篮筐 @@ -9669,4 +9681,72 @@ return result.toString(); } + /** + * 获取灭菌炉（前台调用） + * + */ + public String getAllSterilizer(JSONObject params) { + String useStatus = params.optString("useStatus", ""); + String needFilter = params.optString("needFilter", "true"); //是否需要过滤(在器械包信息页面中的灭菌炉获取中，不需要进行过滤，需要显示全部的灭菌炉) + String orgUnitCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); + String ownGroup = params.optString("ownGroup", ""); + String includeNone = params.optString("includeNone", null); + String needAll = params.optString("needAll", null); + String result = sterilizerManager.getSterilizersJsonString(needFilter, orgUnitCoding, ownGroup, useStatus,includeNone,needAll); + return JSONUtil.buildJsonObject(true, JSONArray.fromObject(result)).toString(); + } + + /** + * 获取指定的灭菌炉的灭菌程序，如果不指定将返回所有灭菌程序 + * return 返回格式：[[灭菌程序id1,灭菌程序名称1],[灭菌程序id2,灭菌程序名称2],[灭菌程序id3,灭菌程序名称3]...] + */ + public String getSterilizerType(JSONObject params) { + String sterilizerName = params.optString( + "sterilizerName", ""); + String type = params.optString("type", ""); + String result = sterilizerManager.getSterilizerType(sterilizerName, type); + return JSONUtil.buildJsonObject(true, JSONArray.fromObject(result)).toString(); + } + + public String getAllRinserListData(JSONObject params){ + String departCoding = params.optString("departCoding", null); + String useStatus = params.optString("useStatus", null); + //清洗机分组IDZJYY-135 + Long rinserGroupId = params.optLong("rinserGroupId", 0L); + String result = rinserManager.getAllRinserListData(departCoding, useStatus, rinserGroupId); + return JSONUtil.buildJsonObject(true, JSONArray.fromObject(result)).toString(); + } + + /** + * 清洗机的循环次数 + * @param params + * @return + */ + public String getNextCycleCounter(JSONObject params){ + int nextCycleCounter = washAndDisinfectRecordManager.getNextCycleCounter(params.optString("rinserName")); + JSONObject result = JSONUtil.buildJsonObject(true); + JSONUtil.addProperty(result , "nextCycleCounter", nextCycleCounter); + return result.toString(); + } + + /** + * 灭菌炉的的炉次 + * @param params + * @return + */ + public String getMaxFrequency(JSONObject params){ + String sterilizerName = params.optString("sterilizerName"); + Sterilizer sterilizer = sterilizerManager.getSterilizerByName(sterilizerName); + Long sterilizationRecordId = params.optLong("sterilizationRecordId",0L); + int maxFrequency = sterilizationRecordManager.getMaxFrequency(sterilizer, sterilizationRecordId); + JSONObject result = JSONUtil.buildJsonObject(true); + JSONUtil.addProperty(result , "maxFrequency", maxFrequency); + return result.toString(); + } + + public String findCleanMethodArr(JSONObject params) { + String result = cleanMethodManager.findCleanMethodArr(); + return JSONUtil.buildJsonObject(true, JSONArray.fromObject(result)).toString(); + } + }