Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r14327 -r14330 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14327) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14330) @@ -3102,12 +3102,13 @@ * @param applicationCreateDate 申请时间(使用记录的时间) * @param operationRoom 使用记录的病房 * @param dpf 一次性物品价格浮动系数 + * @param invoicePlanType 单类型 */ @Override public void createRecyclingApplicationByTousse( Map tousseNameAndAmountMap,Map diposableGoodMap, String applicant, String depart, String departCoding, String remark, - List tousseInstanceCodes,Date applicationCreateDate,String operationRoom,double dpf) { + List tousseInstanceCodes,Date applicationCreateDate,String operationRoom,double dpf,String invoicePlanType) { if (tousseNameAndAmountMap.size() > 0 || diposableGoodMap.size() > 0) { //根据申请科室、器械包与一次性物品及其处理的供应室确定一共涉及需要多少个处理的供应室然后按处理科室进行拆分 //如果需要转换的处理科室为多少个,则需要对应生成多少个申请单,一个申请单对应一个处理科室 @@ -3131,7 +3132,7 @@ RecyclingApplication recyclingApplication = new RecyclingApplication(); recyclingApplication - .setType(RecyclingApplication.TYPE_COMBO_FORM); + .setType(StringUtils.isNotBlank(invoicePlanType) ? invoicePlanType : RecyclingApplication.TYPE_COMBO_FORM); recyclingApplication.setApplicant(applicant); recyclingApplication.setDepart(depart); recyclingApplication.setSubmitTime(new Date()); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r13784 -r14330 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 13784) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 14330) @@ -70,7 +70,7 @@ Map diposableGoodMap, String applicant, String depart, String departCoding, String remark, List tousseInstanceIds, Date applicationDate, - String operationRoom,double dpf); + String operationRoom,double dpf,String invoicePlanType); public void createRecyclingApplicationByCustomTousse( Map tousseNameAndAmount, String applicant,