|
@@ -50,7 +50,7 @@ public class SiSettleApplyService {
|
|
|
|
|
|
public ResultVo<SiSettleApply> selectSettleApply(Patient p) {
|
|
|
String mdtrtId = dao.selectMdtrtId(p.getInpatientNo(), p.getAdmissTimes(), p.getLedgerSn());
|
|
|
- if (StringUtil.isBlank(mdtrtId)) {
|
|
|
+ if (StringUtil.isBlank(mdtrtId) || p.getInpatientNo().startsWith("JT")) {
|
|
|
SiSettleApply apply = new SiSettleApply();
|
|
|
apply.setStatus(APPROVED);
|
|
|
return ResultVoUtil.success(apply);
|
|
@@ -73,7 +73,7 @@ public class SiSettleApplyService {
|
|
|
if (null == apply) {
|
|
|
apply = new SiSettleApply();
|
|
|
apply.setSortNo(0);
|
|
|
- if (type == 1) {
|
|
|
+ if (type == REAL_SETTLE) {
|
|
|
apply.setSettleDatetime(disdate);
|
|
|
}
|
|
|
}
|