|
@@ -921,11 +921,11 @@ public class BswServerImpl implements BswServer {
|
|
|
AssertUtil.isNotBlank(zyActpatient, "没有查到住院信息");
|
|
|
ZdUnitCode zdUnitCode = zdUnitCodeService.queryByCode(zyActpatient.getDept());
|
|
|
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();
|
|
|
Map<String, BillItem> billItemMap = billItems.stream().collect(Collectors.toMap(BillItem::getName, billItem -> billItem));
|
|
|
SetlInfo setlInfo = mzDzfpUploadMapper.selectSetlInfo(uploadParam.getPatientId(), uploadParam.getTimes(), uploadParam.getReceiptNo());
|
|
@@ -976,8 +976,8 @@ public class BswServerImpl implements BswServer {
|
|
|
.certSetlType("2")
|
|
|
.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()
|
|
|
.begntime(DateUtil.formatDateTime(zyActpatient.getAdmissDate()))
|
|
|
.endtime(DateUtil.formatDateTime(DateUtil.offsetMinute(zyActpatient.getAdmissDate(), 2)))
|