Browse Source

代码优化

hurugang 6 years ago
parent
commit
c7506f8dbf

+ 1 - 1
src/main/java/cn/hnthyy/thmz/mapper/his/MzChargeDetailMapper.java

@@ -120,7 +120,7 @@ public interface MzChargeDetailMapper {
      * @return
      */
     @Select({"<script>",
-            "select top ${pageSize} * FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_charge_detail_page.serial_no desc) AS RowNumber,* from  (" +
+            "select top ${pageSize} * FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_charge_detail_page.times desc) AS RowNumber,* from  (" +
                     "select  rtrim(patient_id) patient_id,times,receipt_no,rtrim(name) name,",
             "<when test='mzChargeDetail.payMark eq 0'>",
             " charge_date,",

+ 1 - 1
src/main/java/cn/hnthyy/thmz/service/impl/his/MzChargeDetailServiceImpl.java

@@ -728,7 +728,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         MzPatientMi mzPatientMi = new MzPatientMi();
         mzPatientMi.setName(mzChargeDetails.get(0).getName());
         mzPatientMi.setResponseType(mzChargeDetails.get(0).getResponceType());
-        formatPriceRoundDetail(new MzChargeDetail(mzDepositFileVo.getPatientId(),times), supplyFeeMzChargeDetails, mzPatientMi, newMzChargeDetailList, 1000, itemNo,receiptNo);
+        formatPriceRoundDetail(new MzChargeDetail(mzDepositFileVo.getPatientId(),times), supplyFeeMzChargeDetails, mzPatientMi, newMzChargeDetailList, 127, itemNo,receiptNo);
         List<String> supplyList = supplyFeeMzChargeDetails.stream().filter(u -> StringUtils.isNotBlank(u.getChargeItemCode())).map(u -> u.getChargeItemCode()).collect(Collectors.toList());
         List<MzChargeDetail> removeList = new ArrayList<>();
         for (MzChargeDetail md:newMzChargeDetailList){