Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r17816 -r17836
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 17816)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 17836)
@@ -896,7 +896,8 @@
tousseType: td.tousseType,
isThereIdentificationCard: isThereIdentificationCard,
isApplyEntireTousse: td.isApplyEntireTousse,
- urgentAmount : 0
+ urgentAmount : 0,
+ tousseRemark:''
};
addToussItem(toussItem);
//清除已删除的包
@@ -961,7 +962,8 @@
tousseType: td.type,
isThereIdentificationCard: '是',
isApplyEntireTousse: td.isApplyEntireTousse,
- urgentAmount : 0
+ urgentAmount : 0,
+ tousseRemark:''
};
addToussItem(toussItem);
//清除已删除的包
@@ -1614,6 +1616,7 @@
var isThereIdentificationCard = toussItem.isThereIdentificationCard;
var tousseDefinitionID = toussItem.tousseDefinitionID;
var urgentAmount = toussItem.urgentAmount;
+ var tousseRemark = toussItem.tousseRemark;
var b = true;
$('#tousseItemTable').children().first().children().each(function(i,element){
if($('#tousseName'+i).val() == tousseName){
@@ -1674,11 +1677,12 @@
''+
''+
''+
+ ''+
urgentAmountElement +
''+
- ' | '+
+ ' | '+
addButton +
' | '+
reduceButton +
@@ -1704,7 +1708,60 @@
var originalValue = $('#originalValue'+row).val();
}
+function setRemarkToRecycleItem(row,remark){
+ $('#tousseRemark'+row).val(remark);
+ $("#dialogConfirm").dialog("close");
+}
+function setTousseRemark(row){
+ $.ajax({
+ type:'get',
+ url:WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do?time='+new Date(),
+ data:'optionId=recycleItem_remark',
+ dataType:'json',
+ success:function(result){
+ if(result.success){
+ var htmlCode = "";
+ var oldRemark = $('#tousseRemark'+row).val();
+ for(var i = 0 ; i < result.data.length ; i++){
+ var tmpRemark = result.data[i].value;
+ var redColor = "";
+ if(oldRemark == tmpRemark){
+ redColor = "color:red;";
+ }
+ htmlCode += "" + result.data[i].value + "
"
+ }
+ if(htmlCode == ""){
+ alertDiv("未设置回收物品备注信息！");
+ }else{
+ $("#dialogConfirm").dialog({
+ resizable: false,
+ height:530,
+ width:800,
+ title:'选择器械包备注信息',
+ modal: true,
+ open: function() {
+ $("#confirmMsg").html(htmlCode);
+ },
+ close: function() {
+ $("#confirmMsg").html("");
+ },
+ buttons: {
+ "取消": function() {
+ $( this ).dialog( "close" );
+ }
+ }
+ });
+ }
+ }
+ },
+ error:function(XMLHttpRequest, textStatus, errorThrown){
+ alertDiv("未知错误，请联系管理员！");
+ }
+ });
+}
+
+
//打开编辑数量页面
var openElement;
function openUpdateAmount(obj,row){
@@ -1800,6 +1857,23 @@
});
return urgentItemJsonArray;
}
+//备注信息
+function getRecyclingItemInfo(){
+ var recyclingItemJsonArray = new Array();
+ $('#tousseItemTable').children().first().children().each(function(index,element){
+ if($('#deleted'+index).val() == '0'){
+ var tousseName = $('#tousseName'+index).val();
+ var tousseDefinitionID = $('#tousseDefinitionID'+index).val();
+ var tousseRemark = $('#tousseRemark'+index).val();
+ recyclingItemJsonArray.push({
+ tousseName:tousseName,
+ tousseDefinitionID:tousseDefinitionID,
+ tousseRemark:tousseRemark
+ });
+ }
+ });
+ return recyclingItemJsonArray;
+}
function submitCheck(){
var isThereTousseItems = false;
@@ -1891,6 +1965,7 @@
paramJson.errorDamageDetail = getMaterialErrorDamageDetail();
paramJson.urgentTousseItems = getUrgentTousseItems();
paramJson.confirmation = confirmation;
+ paramJson.recyclingItemArray = getRecyclingItemInfo();
return JSON.stringify(paramJson);
}
@@ -2306,7 +2381,8 @@
tousseType: dataArray[i].tousseType,
isThereIdentificationCard: dataArray[i].isThereIdentificationCard,
isApplyEntireTousse: dataArray[i].isApplyEntireTousse,
- urgentAmount : 0
+ urgentAmount : 0,
+ tousseRemark : ''
};
addToussItem(toussItem);
}
@@ -2379,7 +2455,8 @@
tousseType: item.tousseType,
isThereIdentificationCard: item.isThereIdentificationCard,
isApplyEntireTousse: item.isApplyEntireTousse,
- urgentAmount : item.urgentAmount
+ urgentAmount : item.urgentAmount,
+ tousseRemark:''
};
addToussItem(toussItem);
originalTousseItemIds.push(item.id);
@@ -2557,7 +2634,8 @@
tousseType: tousseItem.tousseType,
isThereIdentificationCard: tousseItem.isThereIdentificationCard,
isApplyEntireTousse: tousseItem.isApplyEntireTousse,
- urgentAmount : tousseItem.urgentAmount
+ urgentAmount : tousseItem.urgentAmount,
+ tousseRemark : tousseItem.remark
};
var successAdd = addToussItem(toussItem);
if(!successAdd){
@@ -2652,7 +2730,8 @@
tousseType: applicationitems[i].tousseType,
isThereIdentificationCard: applicationitems[i].isThereIdentificationCard,
isApplyEntireTousse: applicationitems[i].isApplyEntireTousse,
- urgentAmount : applicationitems[i].urgentAmount
+ urgentAmount : applicationitems[i].urgentAmount,
+ tousseRemark : ''
};
addToussItem(toussItem);
originalTousseItemIds.push(applicationitems[i].id);
Index: forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
===================================================================
diff -u -r17791 -r17836
--- forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java (.../HttpOption.java) (revision 17791)
+++ forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java (.../HttpOption.java) (revision 17836)
@@ -143,7 +143,14 @@
* 申请单终止原因
*/
public final static String SYSTEMSETTING_APPLICATION_END_CAUSE = "application_end_cause";
+
/**
+ * 回收项备注信息
+ */
+ public final static String SYSTEMSETTING_RECYCLEITEM_REMARK = "recycleItem_remark";
+
+
+ /**
* 器械包废弃原因
*/
public final static String SYSTEMSETTING_TOUSSE_DISCARD_CAUSE = "tousse_discard_cause";
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
===================================================================
diff -u -r17512 -r17836
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java (.../RecyclingItem.java) (revision 17512)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java (.../RecyclingItem.java) (revision 17836)
@@ -60,6 +60,8 @@
private String basketName; // 用于回收记录记录的篮筐
private RecyclingRecord recyclingRecord;
+
+ private String remark;//备注
/**
* 丢失报损明细
*/
@@ -293,5 +295,13 @@
}
return damages;
}
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
}
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r17802 -r17836
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 17802)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 17836)
@@ -202,15 +202,14 @@
*/
private void setRecylingItems(RecyclingRecord recyclingRecord,
List itemJsonList, Map tdMap,
- JSONArray urgentTousseItems) {
+ JSONArray urgentTousseItems,JSONArray recyclingItemArray) {
List items = recyclingRecord.getItems();
if(items == null){
items = new ArrayList();
}
if (itemJsonList != null) {
Map tousseMap = getRecycleTousseItemMap(itemJsonList);
-
for (Long tousseDefinitionID : tousseMap.keySet()) {
Integer amount = tousseMap.get(tousseDefinitionID);
RecyclingItem recyclingItem = null;
@@ -251,6 +250,11 @@
}
//器械包加急处理
setRecyclingItemUrgentAmount(urgentTousseItems, items,true);
+ //备注信息
+ Map recyclingItemMap = getTousseRemarkMap(recyclingItemArray);
+ for (RecyclingItem recyclingItem : items) {
+ recyclingItem.setRemark(recyclingItemMap.get(recyclingItem.getTousseName()));
+ }
recyclingRecord.setItems(items);
}
@@ -273,6 +277,17 @@
return tousseMap;
}
+ private Map getTousseRemarkMap(JSONArray recyclingItemArray) {
+ Map tousseMap = new HashMap();
+ if(recyclingItemArray != null){
+ for (int i = 0; i < recyclingItemArray.size(); i++) {
+ JSONObject json = recyclingItemArray.optJSONObject(i);
+ tousseMap.put(json.optString("tousseName"), json.optString("tousseRemark"));
+ }
+ }
+ return tousseMap;
+ }
+
/**
*
* @param record
@@ -841,6 +856,8 @@
JSONArray errorDamageDetail = params.optJSONArray("errorDamageDetail");
//是否确认
boolean confirmation = params.optBoolean("confirmation");
+ //回收项
+ JSONArray recyclingItemArray = params.optJSONArray("recyclingItemArray");
if(confirmation && RecyclingRecord.STATUS_SAVED.equals(record.getStatus())){
throw new RuntimeException("该回收记录已被修改，请刷新后再操作！");
@@ -868,7 +885,7 @@
//设置篮筐及篮筐内物品
setClassifyBaskets(basketItemJson,idToTDMap,record,containerMap,isSecondRecycleForForeignTousse,toReSetWorkloadMap);
//设置回收物品
- setRecylingItems(record, tousseItemJson,idToTDMap,urgentTousseItems);
+ setRecylingItems(record, tousseItemJson,idToTDMap,urgentTousseItems,recyclingItemArray);
//设置回收误差、器械报损
setMaterialErrorDamageDetail(record, errorDamageDetail,confirmation);
//设置装配任务
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r17536 -r17836
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 17536)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 17836)
@@ -554,6 +554,7 @@
{hidden :SSTS_SupplyRoomType_manager,text:"标签模板管理",href:WWWROOT+'/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_RecyclePrint_Menu,text:"回收科室分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_RecyclePrint_Menu,text:"物品科室共用配置",href:WWWROOT+'/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_RecyclePrint_Menu,text:"器械包回收备注设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=recycleItem_remark',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_SpecialInfection_manager,text:"特殊感染类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=specialInfection',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_application_end_cause_manager,text:"申请单终止原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=application_end_cause',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true},