Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r14177 -r14189 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14177) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14189) @@ -44,6 +44,8 @@ import com.forgon.disinfectsystem.tousse.materialinstance.service.MaterialInstanceManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.security.service.AclTools; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; @@ -86,6 +88,12 @@ private InvoicePlanManager invoicePlanManager; + private LogManager appLogManager; + + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } + public void setInvoicePlanManager(InvoicePlanManager invoicePlanManager) { this.invoicePlanManager = invoicePlanManager; } @@ -314,6 +322,19 @@ }else if(ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN.equals(actionType)){ foreignTousseReturn(application); + //干预管理 + }else if("interfere".equals(actionType)){ + JSONObject obj = new JSONObject(); + obj.put("申请科室", application.getDepart()); + obj.put("住院号", application.getHospitalNumber()); + obj.put("诊疗号", application.getClinicNumber()); + obj.put("病人", application.getPatient()); + obj.put("手术名称", application.getSurgery()); + obj.put("手术时间", application.getOperationTimeString()); + obj.put("医生", application.getDoctor()); + obj.put("病人所属科室", application.getAscriptionDepartment()); + obj.put("外来器械包信息", foreignTousseTreeData); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_INTERFERE, "U", obj.toString()); } } Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r14177 -r14189 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 14177) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 14189) @@ -765,7 +765,7 @@ } var success = getForeignTousseInfo(); if(success){ - submintForeignTousseForm(""); + submintForeignTousseForm("interfere"); } } },{ Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r14066 -r14189 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14066) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14189) @@ -3,7 +3,6 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; -import java.lang.reflect.InvocationTargetException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +24,6 @@ import net.sf.json.util.CycleDetectionStrategy; import net.sf.json.util.PropertyFilter; -import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.collections4.Transformer; @@ -48,20 +46,17 @@ import com.forgon.disinfectsystem.entity.basedatamanager.departmentapplicationtemplate.DepartmentAppTemplate; import com.forgon.disinfectsystem.entity.basedatamanager.departmentapplicationtemplate.DiposableGoodsTemplateItem; import com.forgon.disinfectsystem.entity.basedatamanager.departmentapplicationtemplate.TousseDefinitionTemplateItem; -import com.forgon.disinfectsystem.entity.basedatamanager.foreigntoussedefinition.ForeignTousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; -import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.exception.RecyclingRecordException; -import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager; import com.forgon.disinfectsystem.project.model.ProjectDict; import com.forgon.disinfectsystem.project.service.ProjectManager; import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager; @@ -73,7 +68,6 @@ import com.forgon.disinfectsystem.vo.TousseItemVo; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; -import com.forgon.tools.FileSystemHelper; import com.forgon.tools.ImageUtils; import com.forgon.tools.MathTools; import com.forgon.tools.StrutsParamUtils; @@ -120,8 +114,6 @@ private SupplyRoomConfigManager supplyRoomConfigManager; - private ForeignTousseApplicationManager foreignTousseApplicationManager; - private ObjectDao objectDao; private InvoicePlanManager invoicePlanManager; @@ -136,11 +128,6 @@ this.objectDao = objectDao; } - public void setForeignTousseApplicationManager( - ForeignTousseApplicationManager foreignTousseApplicationManager) { - this.foreignTousseApplicationManager = foreignTousseApplicationManager; - } - public void setImageFileManager(ImageFileManager imageFileManager) { this.imageFileManager = imageFileManager; }