|
@@ -323,6 +323,7 @@ public class SiZyService {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "医保中心报错:" + result.getString("message"));
|
|
|
}
|
|
|
if (infcode == 0) {
|
|
|
+ p.setDismissDate(dscginfo.getEndtime());
|
|
|
return inpatientSettlement(p);
|
|
|
}
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, result.getString(ERROR_MESSAGE));
|
|
@@ -361,8 +362,8 @@ public class SiZyService {
|
|
|
|
|
|
private ResultVo<String> inpatientSettlement(ZyPatientInfo p) {
|
|
|
PreSetlmt preSetlmt;
|
|
|
+ Date begntime = dismissService.getBegntime(p.getInpatientNo(), p.getAdmissTimes(), "zy_actpatient");
|
|
|
if (p.getMidSetl()) {
|
|
|
- Date begntime = dismissService.getBegntime(p.getInpatientNo(), p.getAdmissTimes(), "zy_actpatient");
|
|
|
preSetlmt = dao.selectPreSetlmtForMidSetl(p.getInpatientNo(), p.getAdmissTimes(),
|
|
|
p.getLedgerSn(), begntime, p.getZjdzDatetime());
|
|
|
} else {
|
|
@@ -403,6 +404,8 @@ public class SiZyService {
|
|
|
setlEntity.setRevoked(YesOrNo.NO.getCode());
|
|
|
setlEntity.setSetlType(ClrType.INPATIENT.getCode());
|
|
|
setlEntity.setInsuplcAdmdvs(preSetlmt.getInsuplcAdmdvs());
|
|
|
+ setlEntity.setBegntime(begntime);
|
|
|
+ setlEntity.setEndtime(p.getDismissDate());
|
|
|
setlinfodao.insert(setlEntity);
|
|
|
setlinfodao.updateSiZyInfoSetlId(p.getInpatientNo(), p.getAdmissTimes(), p.getLedgerSn(),
|
|
|
setlEntity.getSetlId(), setlEntity.getMedinsSetlId(), input.getString("msgid"));
|