Browse Source

系统管理-规则管理、规则修改(导出功能未完成)

wanghn 3 months ago
parent
commit
f4910790b9

+ 1 - 0
src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -72,6 +72,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/cases/getQcCases").permitAll()
                 .antMatchers("/qc/behospitalInfo/page").permitAll()
                 .antMatchers("/qc/casesEntryHospital/getQcCasesEntryAll").permitAll()
+                .antMatchers("/qc/casesEntryHospital/exportAllRules").permitAll()
                 .antMatchers("/qc/casesEntryHospital/getQcCasesAll").permitAll()
                 .antMatchers("/qc/behospitalInfo/getByBehospitalCode").permitAll()
                 .antMatchers("/bas/dept/getList").permitAll()

+ 1 - 0
src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -155,6 +155,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/behospitalInfo/page_person", request)
                 || matchers("/qc/behospitalInfo/page_group", request)
                 || matchers("/qc/casesEntryHospital/findQcCasesEntry", request)
+                || matchers("/qc/casesEntryHospital/exportAllRules", request)
                 || matchers("/qc/behospitalInfo/exportExcel", request)
                 || matchers("/qc/dataimport/import", request)
                 || matchers("/qc/dataimport/test", request)

+ 4 - 0
src/main/java/com/diagbot/dto/QcCasesEntryHospitalDTO.java

@@ -20,4 +20,8 @@ public class QcCasesEntryHospitalDTO {
     private Integer isReject;
     private Integer isUsed;
     private Integer ruleType;
+    private String remark;
+    private Short syRuleType;
+    private Short remindType;
+    private Integer remindLevel;
 }

+ 13 - 0
src/main/java/com/diagbot/entity/QcCasesEntry.java

@@ -106,4 +106,17 @@ public class QcCasesEntry implements Serializable {
      * 修改人,如果为0则表示纪录未修改
      */
     private String modifier;
+    /**
+     * 沙雅规则类型
+     */
+    private Short syRuleType;
+    /**
+     * 提醒类型
+     */
+    private Short remindType;
+    /**
+     * 提醒等级
+     */
+    private Integer remindLevel;
+
 }

+ 21 - 0
src/main/java/com/diagbot/facade/QcCasesEntryHospitalFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.QcCasesAllDTO;
 import com.diagbot.dto.QcCasesEntryFindDTO;
 import com.diagbot.dto.QcCasesEntryHospitalDTO;
+import com.diagbot.entity.QcCasesEntry;
 import com.diagbot.entity.QcCasesEntryHospital;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -31,6 +32,8 @@ import java.util.List;
 public class QcCasesEntryHospitalFacade extends QcCasesEntryHospitalServiceImpl {
     @Autowired
     private QcCasesFacade qcCasesFacade;
+    @Autowired
+    private QcCasesEntryFacade qcCasesEntryFacade;
 
     /**
      *
@@ -57,6 +60,24 @@ public class QcCasesEntryHospitalFacade extends QcCasesEntryHospitalServiceImpl
         if (sum == 0) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该条目不存在");
         }
+        QcCasesEntryHospital entryHospital = this.lambdaQuery()
+                .eq(QcCasesEntryHospital::getId, qcCasesEntryUpdataVO.getId())
+                .one();
+        if (entryHospital != null) {
+            QcCasesEntry one = qcCasesEntryFacade.lambdaQuery()
+                    .eq(QcCasesEntry::getId, entryHospital.getCasesEntryId())
+                    .one();
+            if (one != null) {
+                one.setName(qcCasesEntryUpdataVO.getName());
+                one.setSyRuleType(qcCasesEntryUpdataVO.getSyRuleType());
+                one.setRemark(qcCasesEntryUpdataVO.getRemark());
+                one.setCasesId(qcCasesEntryUpdataVO.getCasesId());
+                one.setRemindType(qcCasesEntryUpdataVO.getRemindType());
+                one.setRemindLevel(qcCasesEntryUpdataVO.getRemindLevel());
+                qcCasesEntryFacade.saveOrUpdate(one);
+            }
+        }
+
         UpdateWrapper<QcCasesEntryHospital> qcCasesEntry = new UpdateWrapper<>();
         qcCasesEntry.eq("id", qcCasesEntryUpdataVO.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())

+ 1 - 0
src/main/java/com/diagbot/mapper/QcCasesEntryHospitalMapper.java

@@ -1,6 +1,7 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.ExportExcelDTO;
 import com.diagbot.dto.QcCasesEntryFindDTO;
 import com.diagbot.dto.QcCasesEntryHospitalDTO;
 import com.diagbot.entity.QcCasesEntryHospital;

+ 2 - 0
src/main/java/com/diagbot/service/impl/QcCasesEntryHospitalServiceImpl.java

@@ -1,12 +1,14 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.ExportExcelDTO;
 import com.diagbot.dto.QcCasesEntryFindDTO;
 import com.diagbot.dto.QcCasesEntryHospitalDTO;
 import com.diagbot.entity.QcCasesEntryHospital;
 import com.diagbot.mapper.QcCasesEntryHospitalMapper;
 import com.diagbot.service.QcCasesEntryHospitalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.ExportQcresultVO;
 import com.diagbot.vo.QcCasesEntryFindVO;
 import com.diagbot.vo.QcCasesEntryHospitalVO;
 import org.springframework.stereotype.Service;

+ 4 - 0
src/main/java/com/diagbot/vo/QcCasesEntryHospitalVO.java

@@ -23,4 +23,8 @@ public class QcCasesEntryHospitalVO extends Page {
     private String isPlacefile = "1";
     private Integer isUsed;
     private Integer ruleType;
+    private String remark;
+    private Short syRuleType;
+    private Short remindType;
+    private Integer remindLevel;
 }

+ 6 - 0
src/main/java/com/diagbot/vo/QcCasesEntryUpdataVO.java

@@ -27,4 +27,10 @@ public class QcCasesEntryUpdataVO {
     private Integer isReject;
     @NotNull(message = "请输启用标志")
     private Integer isUsed;
+    private String remark;
+    private Short syRuleType;
+    private Short remindType;
+    private Integer remindLevel;
+    private Long casesId;
+    private String name;
 }

+ 2 - 4
src/main/java/com/diagbot/web/QcCasesEntryHospitalController.java

@@ -8,10 +8,7 @@ import com.diagbot.dto.QcCasesEntryFindDTO;
 import com.diagbot.dto.QcCasesEntryHospitalDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.QcCasesEntryHospitalFacade;
-import com.diagbot.vo.QcCasesEntryFindVO;
-import com.diagbot.vo.QcCasesEntryHospitalVO;
-import com.diagbot.vo.QcCasesEntryUpdataVO;
-import com.diagbot.vo.QcCasesEntryVO;
+import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.List;
 

+ 14 - 3
src/main/resources/mapper/QcCasesEntryHospitalMapper.xml

@@ -19,7 +19,7 @@
         <result column="remark" property="remark"/>
     </resultMap>
 
-    <select id="getQcCasesEntryAlls" resultType="com.diagbot.dto.QcCasesEntryHospitalDTO">
+        <select id="getQcCasesEntryAlls" resultType="com.diagbot.dto.QcCasesEntryHospitalDTO">
         select
         b.id as id,
         a.cases_id as casesId,
@@ -43,7 +43,11 @@
             </otherwise>
         </choose>
         b.is_reject As isReject,
-        a.rule_type
+        a.rule_type,
+        a.remark,
+        a.sy_rule_type,
+        a.remind_type,
+        a.remind_level
         from
         qc_cases_entry a
         join qc_cases_entry_hospital b
@@ -56,8 +60,15 @@
         <if test="casesId != null and casesId != ''">
             AND a.cases_id = #{casesId}
         </if>
-        <if test="name != null and name != ''">
+        <if test="syRuleType != null and casesId != ''">
+            AND a.sy_rule_type = #{syRuleType}
+        </if>
+        <if test="remindType != null and casesId != ''">
+            AND a.remind_type = #{remindType}
+        </if>
+         <if test="name != null and name != ''">
             AND UPPER(a.name) LIKE CONCAT('%', UPPER(trim(#{name})), '%')
+            OR UPPER(a.remark) LIKE CONCAT('%', UPPER(trim(#{name})), '%')
         </if>
         <choose>
             <when test='isUsed != null and isPlacefile == "0"'>