|
@@ -130,13 +130,12 @@ public class SiMzService {
|
|
|
public ResultVo<List<MzReceipt>> getHistoryReceiptDetail(MzDepositFile mzDepositFile) {
|
|
|
List<MzReceipt> mzReceipts = dao.selectMzCharge(mzDepositFile.getPatNo(),
|
|
|
mzDepositFile.getTimes(), mzDepositFile.getReceiptNo());
|
|
|
- mzReceipts.forEach(itm -> itm.setChecked(true));
|
|
|
+ mzReceipts.forEach(itm -> itm.setChecked(StringUtil.notBlank(itm.getNationalCode())));
|
|
|
return ResultVoUtil.success(mzReceipts);
|
|
|
}
|
|
|
|
|
|
private MzReceipt fillMzReceipt(Map<String, Object> detail) {
|
|
|
MzReceipt receipt = new MzReceipt();
|
|
|
- receipt.setChecked(true);
|
|
|
receipt.setReceiptNo((int) detail.get("receiptNo"));
|
|
|
receipt.setOrderNo((int) detail.get("orderNo"));
|
|
|
receipt.setItemNo((int) detail.get("itemNo"));
|
|
@@ -151,6 +150,9 @@ public class SiMzService {
|
|
|
receipt.setGroupNo(detail.get("groupNo").toString());
|
|
|
receipt.setBillItemCode(detail.get("billItemCode").toString());
|
|
|
receipt.setChargeBillCode(detail.get("chargeBillCode").toString());
|
|
|
+ String table = receipt.getGroupNo().trim().equals("00") ? "zd_charge_item" : "yp_zd_dict";
|
|
|
+ receipt.setNationalCode(dao.selectNationalCode(receipt.getChargeItemCode(), table));
|
|
|
+ receipt.setChecked(StringUtil.notBlank(receipt.getNationalCode()));
|
|
|
if (null != detail.get("instructionText")) {
|
|
|
receipt.setInstructionText(detail.get("instructionText").toString());
|
|
|
}
|