diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
index 8ec57200..56a53aab 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
@@ -1299,8 +1299,8 @@ public class CasesServiceImpl implements ICasesService {
             pageSize = 10;
         }
 
-        LocalDateTime startTime = month.withDayOfMonth(1);
-        LocalDateTime endTime = month.plusMonths(1).withDayOfMonth(1).withMinute(0);
+        LocalDateTime startTime = month.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0);
+        LocalDateTime endTime = YearMonth.from(month).atEndOfMonth().atTime(23, 59, 59);
 
         List<HashMap<String, Object>> popularityOfMajor = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime, majorId);
         List<String> caseIdList = popularityOfMajor.stream().map(map -> map.get("caseId").toString()).collect(Collectors.toList());
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
index fc6a2fb7..555f8b70 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
@@ -312,8 +312,8 @@ public class ExamQuestionApi extends ApiBaseController {
                     if(row1.getCell(1).getStringCellValue().equals("多选题")){
                         examQuestion.setType(2);
                     }
-
-                    if (row1.getCell(2).getStringCellValue() == null  || row1.getCell(2).getStringCellValue().equals("")){
+                    log.debug("row1.getCell(2) = " + row1.getCell(2));
+                    if (row1.getCell(2)==null ||row1.getCell(2).getStringCellValue() == null  || row1.getCell(2).getStringCellValue().equals("")){
                         examQuestion.setDifficulty(null);
                     }else{
                         if( row1.getCell(2).getStringCellValue().equals("中")){