Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r41384 -r41440 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 41384) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 41440) @@ -12521,7 +12521,7 @@ application.setDepart(thirdPartyChargeRecord.getDepart()); application.setDepartCoding(thirdPartyChargeRecord.getDepartCoding()); application.setSubmitTime(thirdPartyChargeRecord.getSyncDateTime()); - application.setApplicationTime(thirdPartyChargeRecord.getSyncDateTime()); + application.setApplicationTime(thirdPartyChargeRecord.getChargeRecordTime()); application.setHandleDepart(thirdPartyChargeRecord.getHandleDepart()); application.setHandleDepartCoding(thirdPartyChargeRecord.getHandleDepartCoding()); application.setSettleAccountsDepart(thirdPartyChargeRecord.getSettleAccountsDepart()); @@ -12593,6 +12593,13 @@ this.saveRecyclingApplication(application, newTousseItemVoList, true); //收费记录关联转换的申请单 thirdPartyChargeRecord.setInvoicePlanId(application.getId()); + //如果是HIS转过来的申请单则增加备注,备注内容:收费系统转单; + String remark = application.getRemark(); + if(StringUtils.isBlank(remark)){ + remark = ""; + } + remark += "收费系统转单"; + application.setRemark(remark); } /**