大屏bug修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabCheckOptionServiceImpl.java

@@ -460,7 +460,16 @@ public class LabCheckOptionServiceImpl implements ILabCheckOptionService {
     public Map<String, Object> queryCheckOptionStatistics(LabCheckOptionStatisticsVo labCheckOptionStatisticsVo) {
         List<LabCheckOptionStatisticsVo> list = new ArrayList<>();
         LabCheckOptionStatisticsVo statisticsVo;
-
+        if(StringUtils.isNull(labCheckOptionStatisticsVo.getStartTime()) || StringUtils.isNull(labCheckOptionStatisticsVo.getEndTime())){
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(new Date());
+            //当月第一天
+            cal.set(Calendar.DAY_OF_MONTH, 1);
+            labCheckOptionStatisticsVo.setStartTime(cal.getTime());
+            //当月最后一天
+            cal.roll(Calendar.DAY_OF_MONTH, -1);
+            labCheckOptionStatisticsVo.setEndTime(cal.getTime());
+        }
         List<LabCheckOption> optionList = selectLabCheckOptionList(new LabCheckOption());
         // 最多四级， 暂循环处理
         int count = 0;

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabCheckOptionMapper.xml

@@ -111,6 +111,9 @@
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
+        <if test="optionId != null and optionId != ''">
+            and co.id = #{optionId}
+        </if>
         <if test="subId != null">
             and r.laboratory_id = #{subId}
         </if>