|
|
@@ -113,6 +113,7 @@ public class SiMzService {
|
|
|
}
|
|
|
mzVisit.setReceiptNo(Integer.parseInt(hisOrdNumParts[2]));
|
|
|
mzVisit.setTableClinicReceiptNo(0);
|
|
|
+ mzVisit.setSettledFlag(calSettleFlag(mzVisit));
|
|
|
Map<String, Object> childResult = new HashMap<>(Capacity.FIVE);
|
|
|
childResult.put("times", tempTimes);
|
|
|
childResult.put("mzVisit", mzVisit);
|
|
|
@@ -175,7 +176,7 @@ public class SiMzService {
|
|
|
if (null == mzVisit) {
|
|
|
throw new BizException(ExceptionEnum.NULL_POINTER, "没有找到患者的就诊信息。");
|
|
|
}
|
|
|
- mzVisit.setSettledFlag(calSettleFlag(mzDepositFile));
|
|
|
+ mzVisit.setSettledFlag(calSettleFlag(mzVisit));
|
|
|
List<MzReceipt> mzReceipts = dao.selectMzCharge(mzDepositFile.getPatNo(),
|
|
|
mzDepositFile.getTimes(), mzDepositFile.getReceiptNo());
|
|
|
mzReceipts.forEach(itm -> itm.setChecked(StringUtil.notBlank(itm.getNationalCode())));
|
|
|
@@ -185,12 +186,12 @@ public class SiMzService {
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
- private int calSettleFlag(MzDepositFile f) {
|
|
|
- int siCount = dao.selectSiCount(f.getPatNo(), f.getTimes());
|
|
|
+ private int calSettleFlag(MzVisit f) {
|
|
|
+ int siCount = dao.selectSiCount(f.getPatientId(), f.getTimes());
|
|
|
if (siCount > 0) {
|
|
|
return 1;
|
|
|
}
|
|
|
- String hisOrdNum = f.getPatNo() + "_" + f.getTimes() + "_" + f.getReceiptNo();
|
|
|
+ String hisOrdNum = f.getPatientId() + "_" + f.getTimes() + "_" + f.getReceiptNo();
|
|
|
int mipay = dao.selectMipayCount(hisOrdNum);
|
|
|
return mipay == 0 ? 0 : 2;
|
|
|
}
|
XU