Sfoglia il codice sorgente

导出顺序按时间逆序

gaodm 4 anni fa
parent
commit
622384bd2d

+ 2 - 1
src/main/java/com/diagbot/facade/DeptConfigFacade.java

@@ -388,7 +388,8 @@ public class DeptConfigFacade {
     public void exportExcel(HttpServletResponse response) {
         QueryWrapper<DeptConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID());
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                .orderByDesc("gmt_modified");
         List<DeptConfig> records = deptConfigService.list(queryWrapper);
         String fileName = "科室映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", DeptConfig.class, fileName, response, 12.8f);

+ 4 - 3
src/main/java/com/diagbot/facade/DiseaseConfigFacade.java

@@ -229,7 +229,7 @@ public class DiseaseConfigFacade {
         List<DiseaseConfig> diseaseConfigList = ExcelUtils.importExcel(file, 0, 1, DiseaseConfig.class);
         if (ListUtil.isNotEmpty(diseaseConfigList)) {
             importExcelRecords(diseaseConfigList);
-        }else {
+        } else {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败,导入数据不能为空");
         }
     }
@@ -355,7 +355,7 @@ public class DiseaseConfigFacade {
      * @param uniqueNames
      * @return
      */
-    public Map<String,Map<String,Long>> getUniqueNameConfigMap(Long hospitalId, List<String> hisNames, List<String> uniqueNames) {
+    public Map<String, Map<String, Long>> getUniqueNameConfigMap(Long hospitalId, List<String> hisNames, List<String> uniqueNames) {
         Map<String, Map<String, Long>> retMap = new HashMap<>();
         QueryWrapper<DiseaseConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -388,7 +388,8 @@ public class DiseaseConfigFacade {
     public void exportExcel(HttpServletResponse response) {
         QueryWrapper<DiseaseConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID());
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                .orderByDesc("gmt_modified");
         List<DiseaseConfig> records = diseaseConfigService.list(queryWrapper);
         String fileName = "疾病映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", DiseaseConfig.class, fileName, response, 12.8f);

+ 2 - 1
src/main/java/com/diagbot/facade/DrugConfigFacade.java

@@ -523,7 +523,8 @@ public class DrugConfigFacade {
     public void exportExcel(HttpServletResponse response) {
         QueryWrapper<DrugConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID());
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                .orderByDesc("gmt_modified");
         List<DrugConfig> records = drugConfigService.list(queryWrapper);
         String fileName = "药品映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", DrugConfig.class, fileName, response, 12.8f);

+ 2 - 1
src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -467,7 +467,8 @@ public class LisConfigFacade{
     public void exportExcel(HttpServletResponse response) {
         QueryWrapper<LisConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID());
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                .orderByDesc("gmt_modified");
         List<LisConfig> records = lisConfigService.list(queryWrapper);
         String fileName = "检验映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", LisConfig.class, fileName, response, 12.8f);

+ 2 - 1
src/main/java/com/diagbot/facade/OperationConfigFacade.java

@@ -388,7 +388,8 @@ public class OperationConfigFacade {
     public void exportExcel(HttpServletResponse response) {
         QueryWrapper<OperationConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID());
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                .orderByDesc("gmt_modified");
         List<OperationConfig> records = operationConfigService.list(queryWrapper);
         String fileName = "手术映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", OperationConfig.class, fileName, response, 12.8f);

+ 2 - 1
src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -388,7 +388,8 @@ public class PacsConfigFacade {
     public void exportExcel(HttpServletResponse response) {
         QueryWrapper<PacsConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID());
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                .orderByDesc("gmt_modified");
         List<PacsConfig> records = pacsConfigService.list(queryWrapper);
         String fileName = "检查映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", PacsConfig.class, fileName, response, 12.8f);

+ 2 - 1
src/main/java/com/diagbot/facade/TransfusionConfigFacade.java

@@ -388,7 +388,8 @@ public class TransfusionConfigFacade {
     public void exportExcel(HttpServletResponse response) {
         QueryWrapper<TransfusionConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID());
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                .orderByDesc("gmt_modified");
         List<TransfusionConfig> records = transfusionConfigService.list(queryWrapper);
         String fileName = "输血映射.xls";
         ExcelUtils.exportExcel(records, null, "sheet1", TransfusionConfig.class, fileName, response, 12.8f);