|
@@ -265,12 +265,15 @@ public class DismissService {
|
|
|
indata.getLedgerSn()) < 1) {
|
|
|
return -1;
|
|
|
}
|
|
|
- final Date admissDate = getBegntime(indata.getInpatientNo(), indata.getAdmissTimes(), indata.getTable());
|
|
|
- final Date dismissDate = getEndtime(indata.getMidSetl(), indata.getInpatientNo(), indata.getAdmissTimes(),
|
|
|
+ Date admissDate = getBegntime(indata.getInpatientNo(), indata.getAdmissTimes(), indata.getTable());
|
|
|
+ Date dismissDate = getEndtime(indata.getMidSetl(), indata.getInpatientNo(), indata.getAdmissTimes(),
|
|
|
indata.getZjdzDatetime());
|
|
|
Date tempendtime = indata.getMidSetl() ? dismissDate : DateUtil.parse("2999-12-31 23:59:59");
|
|
|
ReceiptEntity receiptEntity = dismissFeeAnalyse(indata.getInpatientNo(), indata.getAdmissTimes(),
|
|
|
indata.getLedgerSn(), admissDate, tempendtime);
|
|
|
+ if (indata.getLedgerSn() > 1) {
|
|
|
+ admissDate = DateUtil.addOneSecond(admissDate);
|
|
|
+ }
|
|
|
if (dao.writeReceiptTable(indata.getInpatientNo(), indata.getAdmissTimes(), indata.getLedgerSn(), 1,
|
|
|
admissDate, dismissDate, indata.getWardCode(), indata.getDeptCode(), dismissDate, "01",
|
|
|
indata.getStaffId(), receiptEntity.getAdult()) < 1) {
|