lighter 2 rokov pred
rodič
commit
64d7af7aa3

+ 1 - 1
src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiMzController.java

@@ -56,7 +56,7 @@ public class SiMzController {
     }
 
     @PostMapping("/getHistoryReceiptDetail")
-    public ResultVo<List<MzReceipt>> getHistoryReceiptDetail(@RequestBody MzDepositFile depositFile) {
+    public ResultVo<Map<String, Object>> getHistoryReceiptDetail(@RequestBody MzDepositFile depositFile) {
         return service.getHistoryReceiptDetail(depositFile);
     }
 

+ 6 - 2
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiMzService.java

@@ -144,11 +144,15 @@ public class SiMzService {
         return ResultVoUtil.success(mzChargeList);
     }
 
-    public ResultVo<List<MzReceipt>> getHistoryReceiptDetail(MzDepositFile mzDepositFile) {
+    public ResultVo<Map<String, Object>> getHistoryReceiptDetail(MzDepositFile mzDepositFile) {
+        MzVisit mzVisit = dao.selectMzVisit(mzDepositFile.getPatNo(), mzDepositFile.getTimes());
         List<MzReceipt> mzReceipts = dao.selectMzCharge(mzDepositFile.getPatNo(),
                 mzDepositFile.getTimes(), mzDepositFile.getReceiptNo());
         mzReceipts.forEach(itm -> itm.setChecked(StringUtil.notBlank(itm.getNationalCode())));
-        return ResultVoUtil.success(mzReceipts);
+        Map<String, Object> map = new HashMap<>();
+        map.put("mzVisit", mzVisit);
+        map.put("mzReceipts", mzReceipts);
+        return ResultVoUtil.success(map);
     }
 
     private MzReceipt fillMzReceipt(Map<String, Object> detail) {