|
@@ -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);
|