|  | @@ -1083,12 +1083,11 @@ public class BswServerImpl implements BswServer {
 | 
	
		
			
				|  |  |                  .socialNo(aPatientMi.getSocialNo())
 | 
	
		
			
				|  |  |                  .begntime(DateUtil.formatDateTime(zyActpatient.getAdmissDate()))
 | 
	
		
			
				|  |  |                  .endtime(DateUtil.formatDateTime(DateUtil.offsetMinute(zyActpatient.getDisDate(), 2)))
 | 
	
		
			
				|  |  | -                .medType(StrUtil.isNotBlank(mzInvoiceInfo.getSetlInfo().getMedType()) ? mzInvoiceInfo.getSetlInfo().getMedType() : "11")
 | 
	
		
			
				|  |  |                  .build());
 | 
	
		
			
				|  |  | -        if (StrUtil.isNotBlank(mzInvoiceInfo.getSetlInfo().getBegntime())) {
 | 
	
		
			
				|  |  | +        if (StrUtil.isNotBlank(mzInvoiceInfo.getSpecialAttrDTO().getAdmissionDate())) {
 | 
	
		
			
				|  |  |              mzInvoiceInfo.getMdtrtInfo().setBegntime(mzInvoiceInfo.getSetlInfo().getBegntime());
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        if (StrUtil.isNotBlank(mzInvoiceInfo.getSetlInfo().getEndtime())) {
 | 
	
		
			
				|  |  | +        if (StrUtil.isNotBlank(mzInvoiceInfo.getSpecialAttrDTO().getDischargeDate())) {
 | 
	
		
			
				|  |  |              mzInvoiceInfo.getMdtrtInfo().setBegntime(mzInvoiceInfo.getSetlInfo().getEndtime());
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          List<FeeDetl> feeDetlInfo = new ArrayList<>();
 |