Prechádzať zdrojové kódy

09 02 01 全院损益计算关于全院损益计算的问题

hr 4 rokov pred
rodič
commit
f219452d25

+ 2 - 1
src/main/java/com/imed/costaccount/service/impl/HospProfitAndLossServiceImpl.java

@@ -389,7 +389,7 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
                 byMonth.forEach(j -> {
                     if (j.getPaymentsType().equals(1)) {
                         total.set(total.get().add(j.getTotalAmount()));
-                    }else {
+                    } else {
                         total.set(total.get().subtract(j.getTotalAmount()));
                     }
                 });
@@ -559,6 +559,7 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
                         .eq(FileRecord::getFileType, "全院损益")
                         .eq(FileRecord::getDateYear, year)
                         .eq(FileRecord::getDateMonth, month)
+                        .orderByDesc(FileRecord::getCreateTime)
         );
         return new PageUtils(pageUtils);
     }