Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r20428 -r20840 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 20428) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 20840) @@ -110,6 +110,11 @@ * 回收申请单不发货科室 */ public static final int SUPPLYROOM_TYPE_RECYCLING_APPLICATION_NOT_INVOICE = 7; + + /** + * 高值耗材的处理科室 + */ + public static final int SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY = 8; public static final String INVOICE_ORIGIN_APPLICATION = "申请单"; public static final String INVOICE_ORIGIN_RECYCLING = "回收单"; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r20106 -r20840 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 20106) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 20840) @@ -994,6 +994,24 @@ //结算科室不能分页,因为结算科室是根据申领科室改变而改变的,页面上的申领科室改变了不会请求后台,只会从js的store里查找数据,所以这里要一次加载所有的数据出来 PageUtil.outPutResult(pageEntity, list); } + + /** + * 搜索获取高值耗材的处理科室（目前高值耗材的处理科室只有一个）. + */ + public void searchExpensiveGoodsHandleDepartment() { + SupplyRoomConfig src = supplyRoomConfigManager.getExpensiveGoodsHandleDepartment(); + if (src != null) { + JSONObject obj = new JSONObject(); + obj.put("departmentName", src.getOrgUnitName()); + obj.put("departmentCode", src.getOrgUnitCoding()); + List list = new ArrayList(); + list.add(obj); + + PageEntity pageEntity = new PageEntity(); + pageEntity.setNeedToEscape(true); + PageUtil.outPutResult(pageEntity, list); + } + } /** * 根据关键字检索科室的信息（“科室编码”和“科室名称”）..用作各个页面的科室下拉单选框的数据源 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r20804 -r20840 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 20804) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 20840) @@ -41,14 +41,34 @@ public SupplyRoomConfig getSupplyRoomConfigByOrgUnitCoding(String orgUnitCoding); + /** + * 获取科室供应室设置对象（即：SupplyRoomConfig表，supplyRoomType为0的那一行记录）. + * @return + */ public SupplyRoomConfig getSystemParamsObj(); public SupplyRoomConfig getSystemParamsObjDirectlyFromDB(); + /** + * 根据科室编码获取供应室类型. + * @param orgUnitCoding 科室编码 + * @return + */ public int getSupplyRoomTypeByOrgUnitCoding(String orgUnitCoding); - public List getSupplyRoomList(Integer type); + /** + * 根据supplyRoomType获取SupplyRoomConfig对象. + * @param supplyRoomType 类型 + * @return + */ + public List getSupplyRoomList(Integer supplyRoomType); + /** + * 获取高值耗材的处理科室（目前高值耗材的处理科室只有一个）. + * @return + */ + public SupplyRoomConfig getExpensiveGoodsHandleDepartment(); + public SupplyRoomConfig getSupplyRoomConfig(String orgUnitCode,Integer type); public boolean isSettleAccountsDepart(String departCoding); Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js =================================================================== diff -u -r20702 -r20840 --- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 20702) +++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 20840) @@ -955,7 +955,7 @@ } /** - * 修改借物单弹窗 + * “修改借物单的数量”弹窗 * @param id 借物单的id */ function modifyAppCount(id) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r20804 -r20840 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 20804) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 20840) @@ -252,6 +252,17 @@ return objectDao.findBySql(SupplyRoomConfig.class.getSimpleName(), "where po.supplyRoomType = " + type + " order by po.sequence"); } + + @Override + public SupplyRoomConfig getExpensiveGoodsHandleDepartment() { + List supplyRoomList = getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY); + if (CollectionUtils.isNotEmpty(supplyRoomList)) { + return supplyRoomList.get(0); + } else { + return null; + } + } + @Override public List getApplyDepartment(String simpleSpell, int pages,int countOfLI){ Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java =================================================================== diff -u -r20780 -r20840 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java (.../ExpensiveGoodsAction.java) (revision 20780) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java (.../ExpensiveGoodsAction.java) (revision 20840) @@ -817,8 +817,10 @@ * { * totalCount:器械包总数 * data:[{ - * id:一次性物品的id, - * name:一次性物品名称+[规格] + * id:高值耗材的id, + * showName:高值耗材名称[规格], + * name:高值耗材名称, + * specification:高值耗材规格 * },{}......] * } * @@ -832,7 +834,10 @@ for (ExpensiveGoods expensiveGoods : expensiveGoodsList) { JSONObject jSONObject = new JSONObject(); jSONObject.put("id", expensiveGoods.getId()); - jSONObject.put("name", expensiveGoods.getShowName()); + jSONObject.put("showName", expensiveGoods.getShowName()); + jSONObject.put("name", expensiveGoods.getName()); + jSONObject.put("specification", expensiveGoods.getSpecification()); + jSONObject.put("certification", expensiveGoods.getCertification()); jSONArray.add(jSONObject); } JSONObject jSONObject = new JSONObject(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java =================================================================== diff -u -r19885 -r20840 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java (.../ForeignTousseApplication.java) (revision 19885) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java (.../ForeignTousseApplication.java) (revision 20840) @@ -45,8 +45,6 @@ private String ascriptionDepartment;//病人所属科室 - private String patient;// 病人姓名 - private String patientAge;//病人年龄 private String patientSex;//病人性别 @@ -130,14 +128,6 @@ this.clinicNumber = clinicNumber; } - public String getPatient() { - return patient; - } - - public void setPatient(String patient) { - this.patient = patient; - } - public String getPatientAge() { return patientAge; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r20802 -r20840 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 20802) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 20840) @@ -232,6 +232,11 @@ private String hospitalNumber; //住院号 /** + * 病人姓名 + */ + private String patient; + + /** * 使用记录转申请单时，记住器械包条码 ，触摸屏回收扫条码跳转到该申请单 */ private String tousseBarcodes; @@ -1025,5 +1030,13 @@ public void setStoreCode(String storeCode) { this.storeCode = storeCode; } + + public String getPatient() { + return patient; + } + + public void setPatient(String patient) { + this.patient = patient; + } }