Ver Fonte

修复作废发票查询的是老发票号问题

hurugang há 4 anos atrás
pai
commit
d765cae7ad

+ 2 - 0
src/main/java/cn/hnthyy/thmz/controller/mz/MzReceiptSerialController.java

@@ -470,6 +470,8 @@ public class MzReceiptSerialController {
             if (YesNoEnum.YES.code.toString().equals(obsolete)) {
                 User tokenUser = TokenUtil.getUser(httpServletRequest);
                 receipt = mzReceiptSerialService.obsoleteAndRepPrint(mzReceiptSerial, tokenUser);
+                mzReceiptSerials = mzReceiptSerialService.queryPrintedSerialForThisTime(patientId, times, receipt);
+                mzReceiptSerial = mzReceiptSerials.get(0);
                 resultMap.put("message", "作废重新打印发票成功");
             }
             List<Integer> timesList = new ArrayList<>();

+ 2 - 1
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzReceiptSerialServiceImpl.java

@@ -247,6 +247,7 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
             //mzDepositFile.setDcountDate(null);
             mzDepositFileMapper.insertMzDepositFile(mzDepositFile);
         }
+        String receiptCurrent =receipt.getReceiptCurrent();
         if (receipt.getReceiptCurrent() == receipt.getReceiptEnd()) {
             //此时发票号已经用完,当前发票号是最后一个
             receipt.setReceiptCurrent(null);
@@ -261,7 +262,7 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
         updateMzVisitTable.setTimes(mzReceiptSerial.getTimes());
         updateMzVisitTable.setReceiptNo(receiptNo);
         mzVisitTableMapper.updateMzVisitTable(updateMzVisitTable);
-        return mzReceiptSerial.getReceiptBill();
+        return receiptCurrent;
     }
 
     @Override