| 
														
															@@ -920,11 +920,11 @@ public class BswServerImpl implements BswServer { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         AssertUtil.isNotBlank(zyActpatient, "没有查到住院信息"); 
														 | 
														
														 | 
														
															         AssertUtil.isNotBlank(zyActpatient, "没有查到住院信息"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         ZdUnitCode zdUnitCode = zdUnitCodeService.queryByCode(zyActpatient.getDept()); 
														 | 
														
														 | 
														
															         ZdUnitCode zdUnitCode = zdUnitCodeService.queryByCode(zyActpatient.getDept()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         AssertUtil.isNotBlank(zdUnitCode, "没有查到住院科室信息"); 
														 | 
														
														 | 
														
															         AssertUtil.isNotBlank(zdUnitCode, "没有查到住院科室信息"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        Map<String, Object> diagMap = mzDzfpUploadMapper.selectYbDiag(uploadParam); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        if (CollUtil.isEmpty(diagMap)) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            diagMap = mzDzfpUploadMapper.selectCaseDisdiag(uploadParam); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        } 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        AssertUtil.isNotBlank(diagMap, "没有查到主诊断信息"); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//        Map<String, Object> diagMap = mzDzfpUploadMapper.selectYbDiag(uploadParam); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//        if (CollUtil.isEmpty(diagMap)) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//            diagMap = mzDzfpUploadMapper.selectCaseDisdiag(uploadParam); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//        } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//        AssertUtil.isNotBlank(diagMap, "没有查到主诊断信息"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         List<BillItem> billItems = mzBillItemMapper.selectZyBillItemOri(); 
														 | 
														
														 | 
														
															         List<BillItem> billItems = mzBillItemMapper.selectZyBillItemOri(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         Map<String, BillItem> billItemMap = billItems.stream().collect(Collectors.toMap(BillItem::getName, billItem -> billItem)); 
														 | 
														
														 | 
														
															         Map<String, BillItem> billItemMap = billItems.stream().collect(Collectors.toMap(BillItem::getName, billItem -> billItem)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         SetlInfo setlInfo = mzDzfpUploadMapper.selectSetlInfo(uploadParam.getPatientId(), uploadParam.getTimes(), uploadParam.getReceiptNo()); 
														 | 
														
														 | 
														
															         SetlInfo setlInfo = mzDzfpUploadMapper.selectSetlInfo(uploadParam.getPatientId(), uploadParam.getTimes(), uploadParam.getReceiptNo()); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -975,8 +975,8 @@ public class BswServerImpl implements BswServer { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     .certSetlType("2") 
														 | 
														
														 | 
														
															                     .certSetlType("2") 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     .build()); 
														 | 
														
														 | 
														
															                     .build()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        mzInvoiceInfo.getSetlInfo().setMainDiagCode(Convert.toStr(diagMap.get("mainDiagCode"))); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        mzInvoiceInfo.getSetlInfo().setMainDiagName(Convert.toStr(diagMap.get("mainDiagName"))); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//        mzInvoiceInfo.getSetlInfo().setMainDiagCode(Convert.toStr(diagMap.get("mainDiagCode"))); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+//        mzInvoiceInfo.getSetlInfo().setMainDiagName(Convert.toStr(diagMap.get("mainDiagName"))); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         mzInvoiceInfo.setMdtrtInfo(MdtrtInfo.builder() 
														 | 
														
														 | 
														
															         mzInvoiceInfo.setMdtrtInfo(MdtrtInfo.builder() 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 .begntime(DateUtil.formatDateTime(zyActpatient.getAdmissDate())) 
														 | 
														
														 | 
														
															                 .begntime(DateUtil.formatDateTime(zyActpatient.getAdmissDate())) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 .endtime(DateUtil.formatDateTime(DateUtil.offsetMinute(zyActpatient.getAdmissDate(), 2))) 
														 | 
														
														 | 
														
															                 .endtime(DateUtil.formatDateTime(DateUtil.offsetMinute(zyActpatient.getAdmissDate(), 2))) 
														 |