Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r15035 -r15154 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 15035) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 15154) @@ -927,8 +927,11 @@ String hospitalNumber = null; List useRecordList = (List) useRecordsMap .get("useRecordList"); + + Long useRecordId = null; if(CollectionUtils.isNotEmpty(useRecordList) && useRecordList.size() == 1){ hospitalNumber = useRecordList.get(0).getHospitalNum(); + useRecordId = useRecordList.get(0).getId(); } //器械包map,不区分处理科室为一级或二级供应室 Map applyTousseMap = (Map) useRecordsMap @@ -1004,28 +1007,28 @@ recyclingApplicationManager.createRecyclingApplicationByTousse( applyTousseMap,new HashMap(), applicant, depart, departCoding, hospitalNumber, remark, tousseInstanceCodes,applicationCreateDate,operationRoom,dpf,InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, - applyUrgentTousseMap); + applyUrgentTousseMap,useRecordId); } if(isDgConvertApplication && applyDiposableGoodsMap.size() > 0){ //创建一次性物品申请单 recyclingApplicationManager.createRecyclingApplicationByTousse( new HashMap(),applyDiposableGoodsMap, applicant, depart, departCoding, hospitalNumber, remark, tousseInstanceCodes,applicationCreateDate,operationRoom,dpf,InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - applyUrgentTousseMap); + applyUrgentTousseMap,useRecordId); } //如果一次性物品是否转换申请单为是,并且器械包一次性物品转换成申请单是否合并成一张单为否时 }else if(isDgConvertApplication && !isTousseDgMergeConvert){ if(applyTousseMap.size() > 0){ recyclingApplicationManager.createRecyclingApplicationByTousse( applyTousseMap,new HashMap(), applicant, depart, departCoding, hospitalNumber, remark, tousseInstanceCodes,applicationCreateDate,operationRoom,dpf,InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, - applyUrgentTousseMap); + applyUrgentTousseMap,useRecordId); } if(applyDiposableGoodsMap.size() > 0){ recyclingApplicationManager.createRecyclingApplicationByTousse( new HashMap(),applyDiposableGoodsMap, applicant, depart, departCoding, hospitalNumber, remark, tousseInstanceCodes,applicationCreateDate,operationRoom,dpf,InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, - applyUrgentTousseMap); + applyUrgentTousseMap,useRecordId); } }else{ //否则一次性物品是否转换申请单为否 @@ -1036,7 +1039,7 @@ recyclingApplicationManager.createRecyclingApplicationByTousse( applyTousseMap,applyDiposableGoodsMap, applicant, depart, departCoding, hospitalNumber, remark, tousseInstanceCodes,applicationCreateDate,operationRoom,dpf,InvoicePlan.TYPE_COMBO_FORM, - applyUrgentTousseMap); + applyUrgentTousseMap,useRecordId); } //二级供应室是否需要回收（处理所属手术室的包） @@ -1084,7 +1087,7 @@ //自定义器械包生成申请单 recyclingApplicationManager.createRecyclingApplicationByCustomTousse( applyCustomTousseMap, applicant, depart, departCoding, - remark,applicationCreateDate,applyUrgentCustomTousseMap); + remark,applicationCreateDate,applyUrgentCustomTousseMap,useRecordId); } /** Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r14913 -r15154 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 14913) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 15154) @@ -71,11 +71,11 @@ String depart, String departCoding, String hospitalNumber, String remark, List tousseInstanceIds, Date applicationDate, String operationRoom,double dpf,String invoicePlanType, - Map applyUrgentTousseMap); + Map applyUrgentTousseMap,Long useRecordId); public void createRecyclingApplicationByCustomTousse( Map tousseNameAndAmount, String applicant, - String depart, String departCoding, String remark,Date applicationCreateDate,Map urgentNameAmount); + String depart, String departCoding, String remark,Date applicationCreateDate,Map urgentNameAmount,Long useRecordId); public void getPrintObjectOfDept(JSONObject printScope, String departCode, String printUser, List summaryList); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r15091 -r15154 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15091) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15154) @@ -73,6 +73,7 @@ import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.disinfectsystem.exception.RecyclingRecordException; import com.forgon.disinfectsystem.packing.service.PackingManager; import com.forgon.disinfectsystem.print.vo.PrintPageVo; @@ -1020,7 +1021,7 @@ @Override public void createRecyclingApplicationByCustomTousse( Map tousseNameAndAmount, String applicant, - String depart, String departCoding, String remark,Date applicationCreateDate,Map urgentIdAndAmount) { + String depart, String departCoding, String remark,Date applicationCreateDate,Map urgentIdAndAmount,Long useRecordId) { for (Entry entry : tousseNameAndAmount.entrySet()) { RecyclingApplication recyclingApplication = new RecyclingApplication(); recyclingApplication @@ -1104,6 +1105,8 @@ applicationItems.add(tousseItem); recyclingApplication.setApplicationItems(applicationItems); + //设置申请单的使用记录 + recyclingApplication.setUseRecord((UseRecord)objectDao.getByProperty(UseRecord.class.getSimpleName(), "id", useRecordId)); saveOrUpdateRecyclingApplication(recyclingApplication,true); } @@ -3173,7 +3176,7 @@ Map tousseNameAndAmountMap,Map diposableGoodMap, String applicant, String depart, String departCoding, String hospitalNumber, String remark, List tousseInstanceCodes,Date applicationCreateDate,String operationRoom,double dpf,String invoicePlanType, - Map applyUrgentTousseMap) { + Map applyUrgentTousseMap,Long useRecordId) { if (tousseNameAndAmountMap.size() > 0 || diposableGoodMap.size() > 0) { //根据申请科室、器械包与一次性物品及其处理的供应室确定一共涉及需要多少个处理的供应室然后按处理科室进行拆分 //如果需要转换的处理科室为多少个,则需要对应生成多少个申请单,一个申请单对应一个处理科室 @@ -3253,7 +3256,8 @@ items.add(tousseItem); } } - + //设置申请单的使用记录 + recyclingApplication.setUseRecord((UseRecord)objectDao.getByProperty(UseRecord.class.getSimpleName(), "id", useRecordId)); saveOrUpdateRecyclingApplication(recyclingApplication,true); } }