异常数据监控

src/main/java/com/diagbot/facade/QcAbnormalFacade.java

@@ -8,8 +8,10 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.QcAbnormalServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.QcAbnormalDelVO;
 import com.diagbot.vo.QcAbnormalSaveVO;
 import com.diagbot.vo.QcAbnormalVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -20,6 +22,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class QcAbnormalFacade extends QcAbnormalServiceImpl {
 
+    @Autowired
+    private FilterFacade filterFacade;
     /**
      * 查询异常数据监控信息
      *
@@ -27,6 +31,10 @@ public class QcAbnormalFacade extends QcAbnormalServiceImpl {
      * @return 异常数据监控信息
      */
     public IPage<QcAbnormalDTO> getQcAnnormalFac(QcAbnormalVO qcAbnormalVO) {
+        String startDate = filterFacade.getStartDateStr(qcAbnormalVO.getStatisticsType(), null);
+        String endDate = filterFacade.getEndDateStr(qcAbnormalVO.getStatisticsType(), null);
+        qcAbnormalVO.setStartDate(startDate);
+        qcAbnormalVO.setEndDate(endDate);
         qcAbnormalVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
         return this.getQcAnnormal(qcAbnormalVO);
     }
@@ -48,4 +56,21 @@ public class QcAbnormalFacade extends QcAbnormalServiceImpl {
                 .set("modifier", SysUserUtils.getCurrentPrincipleID())
         );
     }
+
+    /**
+     * 删除异常数据监控信息
+     *
+     * @param qcAbnormalDelVO 异常数据监控信息更新参数
+     * @return 是否成功
+     */
+    public Boolean delQcAnnormal(QcAbnormalDelVO qcAbnormalDelVO) {
+        return this.update(new UpdateWrapper<QcAbnormal>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
+                .eq("id", qcAbnormalDelVO.getId())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("gmt_modified", DateUtil.now())
+                .set("modifier", SysUserUtils.getCurrentPrincipleID())
+        );
+    }
 }

src/main/java/com/diagbot/vo/QcAbnormalDelVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/5/15 10:16
+ */
+@Getter
+@Setter
+public class QcAbnormalDelVO {
+    /**
+     * 主键
+     */
+    @NotNull(message = "请输入异常数据监控ID")
+    private Long id;
+}

src/main/java/com/diagbot/vo/QcAbnormalVO.java

@@ -28,6 +28,21 @@ public class QcAbnormalVO extends Page {
      */
     private Integer status;
 
+    /**
+     * 统计维度 1-本月，2-本年
+     */
+    private Integer statisticsType;
+    /**
+     * 起始时间
+     */
+    @ApiModelProperty(hidden = true)
+    private String startDate;
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(hidden = true)
+    private String endDate;
+
     //医院ID
     @ApiModelProperty(hidden = true)
     private Long hospitalId;

src/main/java/com/diagbot/web/QcAbnormalController.java

@@ -6,6 +6,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.QcAbnormalDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.QcAbnormalFacade;
+import com.diagbot.vo.QcAbnormalDelVO;
 import com.diagbot.vo.QcAbnormalSaveVO;
 import com.diagbot.vo.QcAbnormalVO;
 import io.swagger.annotations.Api;
@@ -36,7 +37,10 @@ public class QcAbnormalController {
     private QcAbnormalFacade qcAbnormalFacade;
 
     @ApiOperation(value = "查询异常数据监控信息[by:gaodm]",
-            notes = "")
+            notes = "behospitalCode: 病人住院ID<br>" +
+                    "type: 异常类型(1:数据模块 2：质控类型 3：XML结构)<br>" +
+                    "status: 状态(0:未处理，1：已处理)<br>" +
+                    "statisticsType: 统计维度 1-本月，2-本年<br>")
     @PostMapping("/getQcAnnormal")
     @SysLogger("getQcAnnormal")
     public RespDTO<IPage<QcAbnormalDTO>> getQcAnnormal(@RequestBody QcAbnormalVO qcAbnormalVO) {
@@ -44,11 +48,22 @@ public class QcAbnormalController {
     }
 
     @ApiOperation(value = "更新异常数据监控信息[by:gaodm]",
-            notes = "")
+            notes = "id: 异常数据监控ID<br>" +
+                    "status: 状态(0:未处理，1：已处理)<br>" +
+                    "remark: 备注<br>")
     @PostMapping("/saveQcAnnormal")
     @SysLogger("saveQcAnnormal")
     @Transactional
     public RespDTO<Boolean> saveQcAnnormal(@RequestBody @Valid QcAbnormalSaveVO qcAbnormalSaveVO) {
         return RespDTO.onSuc(qcAbnormalFacade.saveQcAnnormal(qcAbnormalSaveVO));
     }
+
+    @ApiOperation(value = "删除异常数据监控信息[by:gaodm]",
+            notes = "id: 异常数据监控ID<br>")
+    @PostMapping("/delQcAnnormal")
+    @SysLogger("delQcAnnormal")
+    @Transactional
+    public RespDTO<Boolean> delQcAnnormal(@RequestBody @Valid QcAbnormalDelVO qcAbnormalDelVO) {
+        return RespDTO.onSuc(qcAbnormalFacade.delQcAnnormal(qcAbnormalDelVO));
+    }
 }

src/main/resources/mapper/QcAbnormalMapper.xml

@@ -37,5 +37,11 @@
         <if test="behospitalCode != null and behospitalCode != ''">
             and t1.behospital_code like CONCAT('%',#{behospitalCode},'%')
         </if>
+        <if test="startDate != null and startDate != ''">
+            <![CDATA[ and t1.gmt_create >= DATE(#{startDate})]]>
+        </if>
+        <if test="endDate != null and endDate != ''">
+            <![CDATA[AND t1.gmt_create < DATE(#{endDate})]]>
+        </if>
     </select>
 </mapper>