Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r18462 -r18834 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 18462) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 18834) @@ -2405,7 +2405,7 @@ newUseRecord.setPatientIDCard(useRecord.getPatientIDCard()); newUseRecord.setPatientName(useRecord.getPatientName()); newUseRecord.setPatientSex(useRecord.getPatientSex()); - newUseRecord.setRemark(useRecord.getRemark()); + newUseRecord.setRemark("【快速回收】" + useRecord.getRemark()); newUseRecord.setReviewTime(new Date()); newUseRecord.setSpecialInfection(useRecord.getSpecialInfection()); // newUseRecord.setStatus(UseRecord.STATUS_APPLIED); Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java =================================================================== diff -u -r18116 -r18834 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java (.../UseRecordActionBase.java) (revision 18116) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java (.../UseRecordActionBase.java) (revision 18834) @@ -394,9 +394,11 @@ } diposableGoodsList.add(di); }else{ - TousseInstance tousseInstance = new TousseInstance(); Long itemId = JSONUtil.optLong(obj,"id",null); + TousseInstance orginalTousseInstance = tousseInstanceManager.get(itemId); + TousseInstance tousseInstance = new TousseInstance(); tousseInstance.setId(itemId); + tousseInstance.setTousseDefinition(orginalTousseInstance.getTousseDefinition()); tousseInstance.setBarcode(barcode); tousseInstance.setIsUrgentForUseRecord(JSONUtil.optString(obj, "isUrgentForUseRecord", Constants.STR_NO)); tousseInstance.setActualUsed(JSONUtil.optString(obj, "actualUsed", Constants.STR_YES)); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java =================================================================== diff -u -r18411 -r18834 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 18411) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 18834) @@ -14,13 +14,17 @@ import javax.persistence.Table; import javax.persistence.Transient; +import net.sf.json.JSONObject; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; +import com.alibaba.fastjson.JSONArray; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.forgon.Constants; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; @@ -139,8 +143,9 @@ */ private Date operationTime; + @JsonIgnore private List tousseInstanceList;// 用于页面传参 - + @JsonIgnore private List diposableGoodsItems; /** @@ -545,5 +550,72 @@ List diposableGoodsItems) { this.diposableGoodsItems = diposableGoodsItems; } + + @Override + public String toString() { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("id", getId()); + jsonObject.put("applicationTime", getApplicationTime()); + jsonObject.put("bedNumber", getBedNumber()); + jsonObject.put("circuitNurse", getCircuitNurse()); + jsonObject.put("depart", getDepart()); + jsonObject.put("departCoding", getDepartCoding()); + jsonObject.put("doctorName", getDoctorName()); + jsonObject.put("editTime", getEditTime()); + jsonObject.put("enteringDate", getEnteringDate()); + jsonObject.put("kospitalNum", getHospitalNum()); + jsonObject.put("operation", getOperation()); + jsonObject.put("operationRoom", getOperationRoom()); + jsonObject.put("operationScheduleId", getOperationScheduleId()); + jsonObject.put("operationTime", getOperationTime()); + jsonObject.put("operator", getOperator()); + jsonObject.put("patientAge", getPatientAge()); + jsonObject.put("patientArea", getPatientArea()); + jsonObject.put("patientIDCard", getPatientIDCard()); + jsonObject.put("patientName", getPatientName()); + jsonObject.put("patientSex", getPatientSex()); + jsonObject.put("remark", getRemark()); + jsonObject.put("reviewer", getReviewer()); + jsonObject.put("reviewerCode", getReviewerCode()); + jsonObject.put("reviewTime", getReviewTime()); + jsonObject.put("roomNumber", getRoomNumber()); + jsonObject.put("specialInfection", getSpecialInfection()); + jsonObject.put("status", getStatus()); + jsonObject.put("statusSequence", getStatusSequence()); + jsonObject.put("treatmentNum", getTreatmentNum()); + jsonObject.put("visitId", getVisitId()); + jsonObject.put("washHandNurse", getWashHandNurse()); + + if(CollectionUtils.isNotEmpty(tousseInstanceList)){ + JSONArray array = new JSONArray(); + for (TousseInstance tousseInstance : tousseInstanceList) { + JSONObject json = new JSONObject(); + TousseDefinition td = tousseInstance.getTousseDefinition(); + json.put("barcode", tousseInstance.getBarcode()); + json.put("tousseName", tousseInstance.getTousseName()); + json.put("tousseType", td != null ? td.getTousseType() : null); + array.add(json); + jsonObject.put("tousseInstanceList", array); + } + }else{ + jsonObject.put("tousseInstanceList", new JSONArray()); + } + + if(CollectionUtils.isNotEmpty(diposableGoodsItems)){ + JSONArray array = new JSONArray(); + for (UseDiposableGoodsItem useDiposableGoodsItem : diposableGoodsItems) { + JSONObject json = new JSONObject(); + json.put("barcode", useDiposableGoodsItem.getBarcode()); + json.put("name", useDiposableGoodsItem.getName()); + json.put("batchNo", useDiposableGoodsItem.getBatchNo()); + json.put("amount", useDiposableGoodsItem.getAmount()); + array.add(json); + jsonObject.put("diposableGoodsItems", array); + } + }else{ + jsonObject.put("diposableGoodsItems", new JSONArray()); + } + return jsonObject.toString(); + } } Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java =================================================================== diff -u -r18116 -r18834 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java (.../UseRecordAction.java) (revision 18116) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java (.../UseRecordAction.java) (revision 18834) @@ -29,6 +29,8 @@ import com.forgon.disinfectsystem.entity.useRecord.UseDiposableGoodsItem; import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.disinfectsystem.vo.UseMaterialGoodsItem; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; import com.forgon.tools.StrutsParamUtils; @@ -58,6 +60,8 @@ private HttpOptionManager httpOptionManager; + private LogManager appLogManager; + public void setHttpOptionManager(HttpOptionManager httpOptionManager) { this.httpOptionManager = httpOptionManager; } @@ -70,6 +74,10 @@ this.useRecord = useRecord; } + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } + public void getOperationName() { List list = httpOptionManager .getHttpOptionTextById(HttpOption.SYSTENSETTING_OPERATION_NAME); @@ -207,6 +215,9 @@ buildUseRecordParamsForSave(modified); useRecordManager.saveUseRecord_TRANS_REQUIRED(modified); } + //记录操作日志 + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_USERECORD, "新增或修改使用记录", + "id=" + id + ",useRecord=" + useRecord.toString()); JSONUtil.addSuccess(json, true); } catch (Exception e) { e.printStackTrace(); @@ -237,7 +248,9 @@ } else { //审核记录 useRecordManager.auditUseRecords_TRANS_REQUIRED(ids); } - + //记录操作日志 + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_USERECORD, "修改使用记录状态", + "audited=" + audited + ",type=" + type); success = true; } catch (Exception e) { e.printStackTrace(); @@ -394,6 +407,9 @@ .createRecyclingApplicationByUseRecords(ids, operator, depart, departCoding, applicationCreateDate,applicationFormType); + //记录操作日志 + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_USERECORD, "根据使用记录生成申请单", + "ids=" + ids); } catch (Exception e) { logger.warn(e.getMessage()); e.printStackTrace(); @@ -430,6 +446,9 @@ .saveAndReviewAndConvertUseRecordForm_TRANS_REQUIRED( modified, operator, depart, departCoding, applicationCreateDate,applicationFormType); + //记录操作日志 + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_USERECORD, "保存并审核生成申请单", + "modified=" + modified.toString()); } catch (Exception e) { logger.warn(e.getMessage()); e.printStackTrace(); @@ -463,6 +482,9 @@ for (String id : idStrs) { useRecordManager.deleteUseRecordById(id); } + //记录操作日志 + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_USERECORD, "删除使用记录", + "ids=" + idsStr); success = true; } catch (Exception e) { success = false; @@ -477,6 +499,10 @@ String barcodes = StrutsParamUtils.getPraramValue("barcodes", ""); try { useRecordManager.quickRecycing(useRecordID,barcodes); + UseRecord userecord = useRecordManager.getUseRecordById(useRecordID); + //记录快速回收的保存日志 + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_USERECORD, "添加快速回收", + "useRecordID=" + useRecordID + ",barcodes=" + barcodes+",userecord=" + (userecord == null ? "null" : userecord.toString())); jsonObj.put("success", true); } catch (Exception e) { e.printStackTrace();