Index: forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java =================================================================== diff -u -r15912 -r15932 --- forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java (.../JSONUtil.java) (revision 15912) +++ forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java (.../JSONUtil.java) (revision 15932) @@ -6,6 +6,7 @@ import java.util.List; import java.util.Set; +import net.sf.json.JSONArray; import net.sf.json.JSONNull; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; @@ -307,6 +308,14 @@ } return json; } + public static JSONObject buildJsonObject(boolean success,JSONArray data){ + JSONObject json = new JSONObject(); + addSuccess(json,success); + if(data != null){ + addProperty(json, "data", data); + } + return json; + } /** * 在json对象中添加是否成功的标志 * @param json json对象,如果为null,不做处理 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java =================================================================== diff -u -r14698 -r15932 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java (.../HttpOptionManagerSSTSImpl.java) (revision 14698) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java (.../HttpOptionManagerSSTSImpl.java) (revision 15932) @@ -15,19 +15,18 @@ import com.forgon.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; import com.forgon.tools.db.DatabaseUtil; +import com.forgon.tools.hibernate.BasePoManagerImpl; import com.forgon.tools.hibernate.ObjectDao; /** * @author Angus * * 2008-6-16 下午05:07:11 */ -public class HttpOptionManagerSSTSImpl implements HttpOptionManager { - - private ObjectDao objectDao; - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; +public class HttpOptionManagerSSTSImpl extends BasePoManagerImpl implements HttpOptionManager { + + public HttpOptionManagerSSTSImpl() { + super(HttpOption.class); } @SuppressWarnings("unchecked") @@ -316,4 +315,10 @@ } return false; } + + @Override + public HttpOption get(String listId, String optionText) { + String condition = "po.optionListId='" + listId + "' and po.optionText='" + optionText + "'"; + return getFirst(condition); + } } Index: ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js =================================================================== diff -u -r15916 -r15932 --- ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js (.../config.js) (revision 15916) +++ ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js (.../config.js) (revision 15932) @@ -45,5 +45,7 @@ //批量打印发货单,打印消毒物品和器械包是否分开为两个按钮,如果为true,表示分开为两个按钮,如果为false或者没有配置,都是合并为一个按钮 splitTousseAndDisinfectInvoiceBtn:true, // 清洗记录列表默认显示当天的 - washAndDisinfectRecordListDefaultToday : true + washAndDisinfectRecordListDefaultToday : true, +//在pda中是否选择灭菌炉分组进入对应分组的灭菌列表 + selectSterilizerGroupInPDA : true } \ No newline at end of file Index: forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java =================================================================== diff -u -r15538 -r15932 --- forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java (.../HttpOption.java) (revision 15538) +++ forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java (.../HttpOption.java) (revision 15932) @@ -128,6 +128,10 @@ */ public final static String SYSTENSETTING_TASKGROUP ="taskGroup"; /** + * 灭菌炉分组 + */ + public final static String SYSTEMSETTING_STERILIZER_GROUP = "sterilerGroup"; + /** * 手术名称 */ public final static String SYSTENSETTING_OPERATION_NAME = "operationName"; Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r15897 -r15932 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 15897) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 15932) @@ -1925,6 +1925,11 @@ public String getSterilizationRecordList(JSONObject params) { String departCode = params.optString("departCode"); String daysAgo = params.optString("daysAgo"); + String groupName = params.optString("sterilizerGroupName"); + String groupNamePredicate = " 1=1 "; + if(StringTools.isNotEmpty(groupName) && !StringTools.equals("全部", groupName)){ + groupNamePredicate = " po.sterilizer.ownGroup='"+groupName+"' "; + } int days = 0; if(StringTools.isNumeric(daysAgo)){ days = Integer.parseInt(daysAgo); @@ -1941,10 +1946,10 @@ out_beginTime.setTime(time); String sqlWhere = String.format( "where ((po.startDate between %s and %s) or po.status = '%s')" - + " and po.orgUnitCoding = '%s'", + + " and po.orgUnitCoding = '%s' and %s", dateQueryAdapter.dateAdapter(out_beginTime), dateQueryAdapter.dateAdapter(out_endTime), - SterilizationRecord.STERILIZATION_STATUS_BEGIN, departCode); + SterilizationRecord.STERILIZATION_STATUS_BEGIN, departCode,groupNamePredicate); Collection sterilizationRecords = objectDao .findBySql(SterilizationRecord.class.getSimpleName(), sqlWhere, @@ -1971,6 +1976,11 @@ sterileMethodJsonArray.add(methodJson); } result.put("sterileMethods", sterileMethodJsonArray); + result.put("ownGroup", sterilizer.getOwnGroup()); + HttpOption group = httpOptionManager.get(HttpOption.SYSTEMSETTING_STERILIZER_GROUP,sterilizer.getOwnGroup()); + if(group != null){ + result.put("sterilizerGroupId", group.getId()); + } return result; } @@ -3377,4 +3387,26 @@ } return JSONUtil.buildJsonObject(false, "未找到对应的清洗交接记录").toString(); } + /** + * 获取灭菌炉分组 + * @param params + * @return + */ + public String getSterilizerGroup(JSONObject params){ + List sterilerGroupList = httpOptionManager.getHttpOptionListById(HttpOption.SYSTEMSETTING_STERILIZER_GROUP); + JSONArray array = new JSONArray(); + if(CollectionUtils.isNotEmpty(sterilerGroupList)){ + for(HttpOption option : sterilerGroupList){ + JSONObject json = new JSONObject(); + json.put("id", option.getId()); + json.put("optionText", option.getOptionText()); + array.add(json); + } + } + JSONObject ret = JSONUtil.buildJsonObject(true, array); + boolean b = Boolean.valueOf(StringTools.defaultIfBlank(CssdUtils.getSystemSetConfigByName("selectSterilizerGroupInPDA"),"false")); + ret.put("selectSterilizerGroup", b); + return ret.toString(); + } + } Index: forgon-core/src/main/java/com/forgon/systemsetting/service/HttpOptionManager.java =================================================================== diff -u -r14698 -r15932 --- forgon-core/src/main/java/com/forgon/systemsetting/service/HttpOptionManager.java (.../HttpOptionManager.java) (revision 14698) +++ forgon-core/src/main/java/com/forgon/systemsetting/service/HttpOptionManager.java (.../HttpOptionManager.java) (revision 15932) @@ -4,13 +4,14 @@ import java.util.Map; import com.forgon.systemsetting.model.HttpOption; +import com.forgon.tools.hibernate.BasePoManager; /** * @author Angus * * 2008-6-16 下午05:06:51 */ -public interface HttpOptionManager { +public interface HttpOptionManager extends BasePoManager { public List getHttpOptionListById(String listId); @@ -50,4 +51,11 @@ * @return */ public boolean isListChange(List optionList, String listId); + /** + * 根据optionListId及optionText获取对象。只返回第一个对象或者null + * @param listId + * @param optionText + * @return + */ + public HttpOption get(String listId,String optionText); }