申诉审核获取详情

src/main/java/com/diagbot/client/MedAppealInfoServiceClientME.java

@@ -2,8 +2,11 @@ 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 com.diagbot.dto.*;
+import com.diagbot.vo.MedAppealAuditVO;
+import com.diagbot.vo.MedAppealComplaintRecordPageVO;
+import com.diagbot.vo.MedAppealReviewPageVO;
+import com.diagbot.vo.MedApprovedVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,9 +21,37 @@ import java.util.List;
  */
 @FeignClient(name = "gateway-service", url = "${appeal.address}", fallback = MedAppealInfoServiceHystrixME.class)
 public interface MedAppealInfoServiceClientME {
-
+    /**
+     * 获取申诉记录
+     * @param medAppealComplaintRecordPageVO
+     * @return
+     */
     @PostMapping(value = "/report-service/medAppealInfoManageME/getComplaintRecord")
-    IPage<List<ComplaintRecordDTO>> getComplaintRecord(@RequestBody ComplaintRecordPageVO complaintRecordPageVO);
+    RespDTO<IPage<MedAppealComplaintRecordDTO>> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO);
+
+    /**
+     * 获取申诉审核列表
+     * @param medAppealReviewPageVO
+     * @return
+     */
+    @PostMapping(value = "/report-service/medAppealInfoManageME/getAppealReview")
+    RespDTO<MedAppealReviewDTO> getAppealReview(@RequestBody  MedAppealReviewPageVO medAppealReviewPageVO);
+
+    /**
+     *审核获取申述详情
+     * @param medAppealAuditVO
+     * @return
+     */
+    @PostMapping(value = "/report-service/medAppealInfoManageME/getAudit")
+    RespDTO<MedAppealAuditDTO> getAudit(@RequestBody MedAppealAuditVO medAppealAuditVO);
+
+    /**
+     *审核通过
+     * @param medApprovedVo
+     * @return
+     */
+    @PostMapping(value = "/report-service/medAppealInfoManageME/approved")
+    RespDTO<Boolean> approved(@RequestBody MedApprovedVo medApprovedVo);
 
 
 }

src/main/java/com/diagbot/client/hystrix/MedAppealInfoServiceHystrixME.java

@@ -3,8 +3,11 @@ 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 com.diagbot.dto.*;
+import com.diagbot.vo.MedAppealAuditVO;
+import com.diagbot.vo.MedAppealComplaintRecordPageVO;
+import com.diagbot.vo.MedAppealReviewPageVO;
+import com.diagbot.vo.MedApprovedVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,8 +24,26 @@ import java.util.List;
 public class MedAppealInfoServiceHystrixME implements MedAppealInfoServiceClientME {
 
     @Override
-    public IPage<List<ComplaintRecordDTO>> getComplaintRecord(@RequestBody ComplaintRecordPageVO complaintRecordPageVO) {
+    public RespDTO<IPage<MedAppealComplaintRecordDTO>> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO) {
         log.error("【hystrix】调用{}异常", "getComplaintRecord");
         return null;
     }
+
+    @Override
+    public RespDTO<MedAppealReviewDTO> getAppealReview(@RequestBody MedAppealReviewPageVO medAppealReviewPageVO) {
+        log.error("【hystrix】调用{}异常", "getAppealReview");
+        return null;
+    }
+
+    @Override
+    public RespDTO<MedAppealAuditDTO> getAudit( @RequestBody MedAppealAuditVO medAppealAuditVO) {
+        log.error("【hystrix】调用{}异常", "getAudit");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> approved( @RequestBody MedApprovedVo medApprovedVo) {
+        log.error("【hystrix】调用{}异常", "approved");
+        return null;
+    }
 }

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -291,6 +291,10 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/analysisDept/getDefectImproveInnerByDeptExport").permitAll()
                 .antMatchers("/qc/appealInfo/getWorkById").permitAll()
                 .antMatchers("/qc/appealInfoME/getComplaintRecord").permitAll()
+                .antMatchers("/qc/appealInfoME/getAppealReview").permitAll()
+                .antMatchers("/qc/appealInfoME/getAudit").permitAll()
+                .antMatchers("/qc/appealInfoME/approved").permitAll()
+                .antMatchers("/qc/appealInfoME/getAppealReviewDictionary").permitAll()
                 .antMatchers("/qc/appealInfo/addAppealInfo").permitAll()
                 .antMatchers("/qc/appealInfo/getReviewer").permitAll()
                 .antMatchers("/**").authenticated();

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -343,6 +343,10 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/analysisDept/getDefectImproveInnerByDeptExport", request)
                 || matchers("/qc/appealInfo/getWorkById", request)
                 || matchers("/qc/appealInfoME/getComplaintRecord", request)
+                || matchers("/qc/appealInfoME/getAppealReview", request)
+                || matchers("/qc/appealInfoME/getAudit", request)
+                || matchers("/qc/appealInfoME/approved", request)
+                || matchers("/qc/appealInfoME/getAppealReviewDictionary", request)
                 || matchers("/qc/appealInfo/addAppealInfo", request)
                 || matchers("/qc/appealInfo/getReviewer", request)
                 || matchers("/", request)) {

src/main/java/com/diagbot/dto/MedAppealAuditDTO.java

@@ -0,0 +1,116 @@
+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 MedAppealAuditDTO {
+    /**
+     * 病案号
+     */
+    private String behospitalCode;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 性别
+     */
+    private String sex;
+    /**
+     * 年龄
+     */
+    private String age;
+    /**
+     * 科室
+     */
+    private String behDeptName;
+
+    /**
+     * 主管医生
+     */
+    private String doctorName;
+    /**
+     * 入院时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date behospitalDate;
+    /**
+     * 出院时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date leaveHospitalDate;
+    /**
+     * 申诉模块
+     */
+    private String modeName;
+    /**
+     * 质控缺陷ID
+     */
+    private Long qcresultDetailId;
+    /**
+     * 病历内容
+     */
+    private String defectContent;
+    /**
+     * 缺陷详情
+     */
+    private String qcresultDetailMsg;
+    /**
+     * 缺陷扣分分值
+     */
+    private Long qcresultDetaiValue;
+    /**
+     * 申述时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date gmtCreate;
+    /**
+     * 申述人
+     */
+    private String claimantName;
+
+    /**
+     * 审核人
+     */
+    private String checkName;
+    /**
+     * 操作类型
+     */
+    private String appealOperationType;
+    /**
+     * 条目ID
+     */
+    private Long casesEntryId;
+    /**
+     * 质控条目
+     */
+    private String casesEntryName;
+    /**
+     * 提示信息
+     */
+    private String casesEntryMsg;
+    /**
+     * 分值
+     */
+    private Long value;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 申诉说明
+     */
+    private String appealExplain;
+
+}

src/main/java/com/diagbot/dto/MedAppealComplaintRecordDTO.java

@@ -0,0 +1,74 @@
+package com.diagbot.dto;
+
+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 MedAppealComplaintRecordDTO {
+    /**
+     * 申述id
+     */
+    private Long id;
+    /**
+     * 申述人
+     */
+    private String claimantName;
+    /**
+     * 所属科室
+     */
+    private String behDeptName;
+
+    /**
+     * 申述申诉时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date claimantGmtCreate;
+    /**
+     * 病人住院序号
+     */
+    private String behospitalCode;
+    /**
+     * 患者姓名
+     */
+    private String name;
+    /**
+     * 申述模块
+     */
+    private String modeName;
+    /**
+     * 缺陷详情
+     */
+    private String defectContent;
+    /**
+     * 审核人
+     */
+    private String checkName;
+    /**
+     * 审核时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date checkGmtCreate;
+
+    /**
+     * 操作类型
+     */
+    private String appealOperationType;
+
+    /**
+     * 状态
+     */
+    private String exampleStatus;
+
+}

src/main/java/com/diagbot/dto/ComplaintRecordDTO.java

@@ -7,28 +7,32 @@ import lombok.Setter;
 import java.util.Date;
 
 /**
- * 申述记录
+ * 审核
  * @Description:
  * @author: cy
  * @time: 2020/9/4 14:59
  */
 @Getter
 @Setter
-public class ComplaintRecordDTO {
+public class MedAppealReviewDTO {
+    /**
+     * 申述id
+     */
+    private Long id;
     /**
      * 申述人
      */
-    private String representationName;
+    private String claimantName;
     /**
      * 所属科室
      */
-    private String deptName;
+    private String behDeptName;
 
     /**
-     * 申述结束时间
+     * 申述申诉时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date complaintDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date claimantGmtCreate;
     /**
      * 病人住院序号
      */
@@ -40,7 +44,7 @@ public class ComplaintRecordDTO {
     /**
      * 申述模块
      */
-    private String representationModule;
+    private String modeName;
     /**
      * 缺陷详情
      */
@@ -48,21 +52,21 @@ public class ComplaintRecordDTO {
     /**
      * 审核人
      */
-    private String reviewerName;
+    private String checkName;
     /**
      * 审核时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date AuditDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date checkGmtCreate;
 
     /**
      * 操作类型
      */
-    private String operationType;
+    private String appealOperationType;
 
     /**
      * 状态
      */
-    private String state;
+    private String exampleStatus;
 
 }

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

@@ -70,4 +70,31 @@ public class SysDictionaryFacade extends SysDictionaryInfoServiceImpl {
         }
         return accessToken;
     }
+
+    /**
+     * 获取字典申诉审核操作类型及状态
+     * @return
+     */
+    public  Map<String, String> getAppealOperationDictionary(){
+        Map<String, String> appealOperationMap = new HashMap<>();
+        if (getDictionaryWithKey() != null
+                && getDictionaryWithKey().containsKey("32")
+                ) {
+            appealOperationMap= getDictionaryWithKey().get("32");
+        }
+        return appealOperationMap;
+    }
+    /**
+     * 获取字典申诉审核状态
+     * @return
+     */
+    public Map<String, String> getAppealStatusDictionary(){
+        Map<String, String> appealStatusMap = new HashMap<>();
+        if (getDictionaryWithKey() != null
+                && getDictionaryWithKey().containsKey("33")
+        ) {
+            appealStatusMap= getDictionaryWithKey().get("33");
+        }
+        return appealStatusMap;
+    }
 }

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 审核申诉
+ * @Author songxl
+ * @Date 2022/1/6
+ */
+@Data
+public class MedAppealAuditVO {
+    @ApiModelProperty(value = "审核编号",required = true)
+    @NotNull(message = "编号为空")
+    private Long id;
+}

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

@@ -0,0 +1,72 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 申述记录
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/4 14:59
+ */
+@Getter
+@Setter
+public class MedAppealComplaintRecordPageVO extends Page implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 申述人id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long complaintId;
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId;
+    /**
+     * 申述开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date complaintDateStart;
+
+    /**
+     * 申述结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date complaintDateEnd;
+
+    /**
+     * 所属科室
+     */
+    private String deptName;
+
+    /**
+     * 申述模块
+     */
+    private String module;
+
+    /**
+     * 审核人
+     */
+    private String name;
+
+    /**
+     * 操作类型
+     */
+    private String operationType;
+
+    /**
+     * 状态
+     */
+    private String state;
+
+}

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

@@ -1,41 +1,44 @@
 package com.diagbot.vo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 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 {
+public class MedAppealReviewPageVO extends Page implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
-     * 申述人id
+     * 审核人id
      */
-    private Long representationId;
+    @ApiModelProperty(hidden = true)
+    private Long appealId;
     /**
      * 医院id
      */
+    @ApiModelProperty(hidden = true)
     private Long hospitalId;
     /**
      * 申述开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date complaintDateStart;
 
     /**
      * 申述结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date complaintDateEnd;
 
     /**
@@ -49,7 +52,7 @@ public class ComplaintRecordPageVO extends Page implements Serializable {
     private String module;
 
     /**
-     * 审核人
+     * 申诉人
      */
     private String name;
 

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

@@ -0,0 +1,71 @@
+package com.diagbot.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 通过驳回
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/4 14:59
+ */
+@Getter
+@Setter
+public class MedApprovedVo {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId;
+    /**
+     * 申诉id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long id;
+    /**
+     * 工作流节点
+     */
+    @ApiModelProperty(hidden = true)
+    private Long workFlowNodeId;
+    /**
+     * 审核人id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long appealId;
+    /**
+     * 病人住院序号
+     */
+    private String behospitalCode;
+    /**
+     * 操作类型
+     */
+    private String operationType;
+    /**
+     * 质控缺陷ID
+     */
+    private Long qcresultDetailId;
+    /**
+     * 条目ID
+     */
+    private Long casesEntryId;
+    /**
+     * 质控条目
+     */
+    private String casesEntryName;
+    /**
+     * 提示信息
+     */
+    private String casesEntryMsg;
+    /**
+     * 分值
+     */
+    private Long value;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -3,22 +3,29 @@ 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.MedAppealAuditDTO;
+import com.diagbot.dto.MedAppealComplaintRecordDTO;
+import com.diagbot.dto.MedAppealReviewDTO;
 import com.diagbot.dto.RespDTO;
-
-import com.diagbot.vo.ComplaintRecordPageVO;
-
+import com.diagbot.facade.SysDictionaryFacade;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.MedAppealAuditVO;
+import com.diagbot.vo.MedAppealComplaintRecordPageVO;
+import com.diagbot.vo.MedAppealReviewPageVO;
+import com.diagbot.vo.MedApprovedVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 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.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -36,14 +43,56 @@ import java.util.List;
 public class MedAppealInfoControllerME {
     @Autowired
     MedAppealInfoServiceClientME medAppealInfoServiceClientME;
+    @Autowired
+    SysDictionaryFacade sysDictionaryFacade;
 
     @ApiOperation(value = "获取申述记录列表[by:zhanghang]",
             notes = "获取申诉任务接口")
     @PostMapping("/getComplaintRecord")
     @SysLogger("getComplaintRecord")
-    public RespDTO<ComplaintRecordDTO> getComplaintRecord(@RequestBody ComplaintRecordPageVO complaintRecordPageVO) {
-        IPage<List<ComplaintRecordDTO>> complaintRecord = medAppealInfoServiceClientME.getComplaintRecord(complaintRecordPageVO);
+    public RespDTO<MedAppealComplaintRecordDTO> getComplaintRecord(@RequestBody MedAppealComplaintRecordPageVO medAppealComplaintRecordPageVO) {
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        medAppealComplaintRecordPageVO.setHospitalId(Long.valueOf(hospitalId));
+        medAppealComplaintRecordPageVO.setComplaintId(Long.valueOf(userId));
+        RespDTO<IPage<MedAppealComplaintRecordDTO>> complaintRecord = medAppealInfoServiceClientME.getComplaintRecord(medAppealComplaintRecordPageVO);
         return RespDTO.onSuc(complaintRecord);
     }
 
+    @ApiOperation(value = "获取申诉审核列表[by:zhanghang]",
+            notes = "获取申诉审核列表")
+    @PostMapping("/getAppealReview")
+    public RespDTO<MedAppealReviewDTO> getAppealReview(@RequestBody MedAppealReviewPageVO medAppealReviewPageVO) {
+        RespDTO<MedAppealReviewDTO> appealReview = medAppealInfoServiceClientME.getAppealReview(medAppealReviewPageVO);
+        return RespDTO.onSuc(appealReview);
+    }
+
+    @ApiOperation(value = "审核获取申述详情[by:zhanghang]",
+            notes = "审核获取申述详情")
+    @PostMapping("/getAudit")
+    public RespDTO<MedAppealAuditDTO> getAudit(@RequestBody MedAppealAuditVO medAppealAuditVO) {
+        RespDTO<MedAppealAuditDTO> audit = medAppealInfoServiceClientME.getAudit(medAppealAuditVO);
+        return RespDTO.onSuc(audit);
+    }
+
+    @ApiOperation(value = "审核通过[by:zhanghang]",
+            notes = "审核通过")
+    @PostMapping("/approved")
+    @Transactional
+    public RespDTO<Boolean> approved(@RequestBody MedApprovedVo medApprovedVo) {
+        return RespDTO.onSuc(medAppealInfoServiceClientME.approved(medApprovedVo));
+    }
+    @ApiOperation(value = "获取操作类型及状态[by:zhanghang]",
+            notes = "获取操作类型及状态")
+    @PostMapping("/getAppealReviewDictionary")
+    public RespDTO<Map<String,Map<String,String>>> getAppealReviewDictionary() {
+        Map<String, String> appealOperationDictionary = sysDictionaryFacade.getAppealOperationDictionary();
+        Map<String, String> appealStatusDictionary = sysDictionaryFacade.getAppealStatusDictionary();
+        Map<String, Map<String, String>> appealReviewMap = new HashMap<>();
+        if(appealOperationDictionary!=null && appealStatusDictionary!=null){
+            appealReviewMap.put("操作类型",appealOperationDictionary);
+            appealReviewMap.put("状态",appealStatusDictionary);
+        }
+        return RespDTO.onSuc(appealReviewMap);
+    }
 }