zhanghang 3 роки тому
батько
коміт
ec3eb14d2e

+ 29 - 0
src/main/java/com/diagbot/client/MedAppealInfoServiceClientME.java

@@ -0,0 +1,29 @@
+package com.diagbot.client;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.hystrix.MedAppealInfoServiceHystrixME;
+import com.diagbot.dto.ComplaintRecordDTO;
+import com.diagbot.vo.ComplaintRecordPageVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+
+/**
+ * @description: 申诉功能远程调用
+ * @author: zhoutg
+ * @date: 2020/4/13 18:28
+ */
+@FeignClient(name = "gateway-service", url = "${appeal.address}", fallback = MedAppealInfoServiceHystrixME.class)
+public interface MedAppealInfoServiceClientME {
+
+    @PostMapping(value = "/report-service/medAppealInfoManageME/getComplaintRecord")
+    IPage<List<ComplaintRecordDTO>> getComplaintRecord(@RequestBody ComplaintRecordPageVO complaintRecordPageVO);
+
+
+}
+
+
+

+ 28 - 0
src/main/java/com/diagbot/client/hystrix/MedAppealInfoServiceHystrixME.java

@@ -0,0 +1,28 @@
+package com.diagbot.client.hystrix;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.MedAppealInfoServiceClientME;
+import com.diagbot.dto.ComplaintRecordDTO;
+import com.diagbot.vo.ComplaintRecordPageVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @description: 申诉远程调用熔断器
+ * @author: zhoutg
+ * @date: 2020/4/13 18:23
+ */
+@Component
+@Slf4j
+public class MedAppealInfoServiceHystrixME implements MedAppealInfoServiceClientME {
+
+    @Override
+    public IPage<List<ComplaintRecordDTO>> getComplaintRecord(@RequestBody ComplaintRecordPageVO complaintRecordPageVO) {
+        log.error("【hystrix】调用{}异常", "getComplaintRecord");
+        return null;
+    }
+}

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

@@ -290,6 +290,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/analysisDept/getEntryDefectImproveInnerDept").permitAll()
                 .antMatchers("/qc/analysisDept/getDefectImproveInnerByDeptExport").permitAll()
                 .antMatchers("/qc/appealInfo/getWorkById").permitAll()
+                .antMatchers("/qc/appealInfoME/getComplaintRecord").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -342,6 +342,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/analysisDept/getEntryDefectImproveInnerDept", request)
                 || matchers("/qc/analysisDept/getDefectImproveInnerByDeptExport", request)
                 || matchers("/qc/appealInfo/getWorkById", request)
+                || matchers("/qc/appealInfoME/getComplaintRecord", request)
                 || matchers("/", request)) {
             return true;
         }

+ 68 - 0
src/main/java/com/diagbot/dto/ComplaintRecordDTO.java

@@ -0,0 +1,68 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 申述记录
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/4 14:59
+ */
+@Getter
+@Setter
+public class ComplaintRecordDTO {
+    /**
+     * 申述人
+     */
+    private String representationName;
+    /**
+     * 所属科室
+     */
+    private String deptName;
+
+    /**
+     * 申述结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date complaintDate;
+    /**
+     * 病人住院序号
+     */
+    private String behospitalCode;
+    /**
+     * 患者姓名
+     */
+    private String name;
+    /**
+     * 申述模块
+     */
+    private String representationModule;
+    /**
+     * 缺陷详情
+     */
+    private String defectContent;
+    /**
+     * 审核人
+     */
+    private String reviewerName;
+    /**
+     * 审核时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date AuditDate;
+
+    /**
+     * 操作类型
+     */
+    private String operationType;
+
+    /**
+     * 状态
+     */
+    private String state;
+
+}

+ 66 - 0
src/main/java/com/diagbot/vo/ComplaintRecordPageVO.java

@@ -0,0 +1,66 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 申述记录
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/4 14:59
+ */
+@Getter
+@Setter
+public class ComplaintRecordPageVO extends Page implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 申述人id
+     */
+    private Long representationId;
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+    /**
+     * 申述开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date complaintDateStart;
+
+    /**
+     * 申述结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date complaintDateEnd;
+
+    /**
+     * 所属科室
+     */
+    private String deptName;
+
+    /**
+     * 申述模块
+     */
+    private String module;
+
+    /**
+     * 审核人
+     */
+    private String name;
+
+    /**
+     * 操作类型
+     */
+    private String operationType;
+
+    /**
+     * 状态
+     */
+    private String state;
+
+}

+ 49 - 0
src/main/java/com/diagbot/web/MedAppealInfoControllerME.java

@@ -0,0 +1,49 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+
+import com.diagbot.client.MedAppealInfoServiceClientME;
+import com.diagbot.dto.ComplaintRecordDTO;
+import com.diagbot.dto.RespDTO;
+
+import com.diagbot.vo.ComplaintRecordPageVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 申诉审核 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-07-06
+ */
+@RestController
+@RequestMapping("/qc/appealInfoME")
+@Api(value = "申诉审核API", tags = { "申诉审核API" })
+@SuppressWarnings("unchecked")
+public class MedAppealInfoControllerME {
+    @Autowired
+    MedAppealInfoServiceClientME medAppealInfoServiceClientME;
+
+    @ApiOperation(value = "获取申述记录列表[by:zhanghang]",
+            notes = "获取申诉任务接口")
+    @PostMapping("/getComplaintRecord")
+    @SysLogger("getComplaintRecord")
+    public RespDTO<ComplaintRecordDTO> getComplaintRecord(@RequestBody ComplaintRecordPageVO complaintRecordPageVO) {
+        IPage<List<ComplaintRecordDTO>> complaintRecord = medAppealInfoServiceClientME.getComplaintRecord(complaintRecordPageVO);
+        return RespDTO.onSuc(complaintRecord);
+    }
+
+}