Browse Source

病案质按数据修改单一月份为范围月份

lighter 3 years ago
parent
commit
c8ccfbf1e9

+ 2 - 0
src/main/java/thyyxxk/webserver/entity/casefrontsheet/SheetAnalyzeParams.java

@@ -6,6 +6,8 @@ import lombok.Data;
 public class SheetAnalyzeParams {
     private String month;
     private String year;
+    private String beginMonth;
+    private String endMonth;
     private Integer type;
     private String dept;
 }

+ 7 - 2
src/main/java/thyyxxk/webserver/service/casefrontsheet/CaseFrontSheetAnalyzeService.java

@@ -80,8 +80,13 @@ public class CaseFrontSheetAnalyzeService {
     }
 
     public ResultVo<List<SheetQuality>> analyzeQualityControl(SheetAnalyzeParams params) {
-        String[] dateRange = StringUtil.isBlank(params.getMonth()) ? getDatetimeRangeByYear(params.getYear()) :
-                getDatetimeRangeByMonth(params.getMonth());
+        String[] dateRange = new String[2];
+        if (StringUtil.isBlank(params.getYear())) {
+            dateRange[0] = params.getBeginMonth() + "-01 00:00:00";
+            dateRange[1] = DateUtil.getMonthEndtime(params.getEndMonth());
+        } else {
+            dateRange = getDatetimeRangeByYear(params.getYear());
+        }
         String deptIdentity = params.getType() == 1 ? "admiss_dept" : "dismiss_dept";
         List<SheetQualitySources> qualitySources = dao.selectSheetQualitySource(dateRange[0], dateRange[1], deptIdentity);
         Map<String, List<SheetQualitySources>> deptQualitySources = new HashMap<>();