Pārlūkot izejas kodu

申诉审核v2.2.0审核相关功能

zhanghang 3 gadi atpakaļ
vecāks
revīzija
1bb63a62c2

+ 3 - 2
src/main/java/com/diagbot/dto/GetAppealInfoDTO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -50,7 +51,7 @@ public class GetAppealInfoDTO implements Serializable {
     private String qcresultDetailMsg;
 
     @ApiModelProperty(value = "缺陷扣分分值")
-    private Long qcresultDetaiValue;
+    private BigDecimal qcresultDetaiValue;
 
     @ApiModelProperty(value = "条目ID")
     private Long casesEntryId;
@@ -62,7 +63,7 @@ public class GetAppealInfoDTO implements Serializable {
     private String casesEntryMsg;
 
     @ApiModelProperty(value = "分值(新增已有操作才有值)")
-    private Long value;
+    private BigDecimal value;
 
     @ApiModelProperty(value = "申诉模块id")
     private Long modeId;

+ 3 - 2
src/main/java/com/diagbot/dto/GetAuditDTO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -55,7 +56,7 @@ public class GetAuditDTO {
     private String qcresultDetailMsg;
 
     @ApiModelProperty(value = "缺陷扣分分值")
-    private Long qcresultDetaiValue;
+    private BigDecimal qcresultDetaiValue;
 
     @ApiModelProperty(value = "申述时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -80,7 +81,7 @@ public class GetAuditDTO {
     private String casesEntryMsg;
 
     @ApiModelProperty(value = "分值")
-    private Long value;
+    private BigDecimal value;
 
     @ApiModelProperty(value = "备注")
     private String remark;

+ 196 - 0
src/main/java/com/diagbot/entity/MedAppealExamineInfo.java

@@ -0,0 +1,196 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 申诉审批表
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public class MedAppealExamineInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 申诉审批id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 申诉id
+     */
+    private Long appealInfoId;
+
+    /**
+     * 审核人id
+     */
+    private Long checkId;
+
+    /**
+     * 审核状态:0:驳回|1:通过
+     */
+    private String exampleStatus;
+
+    /**
+     * 审核处理方式: 1:修改|2:删除|3:新增已有|4:新增缺失|5:恢复
+     */
+    private String exampleOperation;
+
+    /**
+     * 处理结果
+     */
+    private String processResult;
+
+    /**
+     * 驳回理由
+     */
+    private String rejectReason;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public Long getAppealInfoId() {
+        return appealInfoId;
+    }
+
+    public void setAppealInfoId(Long appealInfoId) {
+        this.appealInfoId = appealInfoId;
+    }
+    public Long getCheckId() {
+        return checkId;
+    }
+
+    public void setCheckId(Long checkId) {
+        this.checkId = checkId;
+    }
+    public String getExampleStatus() {
+        return exampleStatus;
+    }
+
+    public void setExampleStatus(String exampleStatus) {
+        this.exampleStatus = exampleStatus;
+    }
+    public String getExampleOperation() {
+        return exampleOperation;
+    }
+
+    public void setExampleOperation(String exampleOperation) {
+        this.exampleOperation = exampleOperation;
+    }
+    public String getProcessResult() {
+        return processResult;
+    }
+
+    public void setProcessResult(String processResult) {
+        this.processResult = processResult;
+    }
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "MedAppealExamineInfo{" +
+            "id=" + id +
+            ", appealInfoId=" + appealInfoId +
+            ", checkId=" + checkId +
+            ", exampleStatus=" + exampleStatus +
+            ", exampleOperation=" + exampleOperation +
+            ", processResult=" + processResult +
+            ", rejectReason=" + rejectReason +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 145 - 0
src/main/java/com/diagbot/entity/MedAppealInfo.java

@@ -0,0 +1,145 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 申诉记录表
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+@Data
+public class MedAppealInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 质控缺陷id
+     */
+    private Long qcresultDetailId;
+
+    /**
+     * 缺陷详情
+     */
+    private String qcresultDetailMsg;
+
+    /**
+     * 缺陷扣分分值
+     */
+    private BigDecimal qcresultDetaiValue;
+
+    /**
+     * 条目ID
+     */
+    private Long casesEntryId;
+
+    /**
+     * 质控条目(新增已有操作才有值)
+     */
+    private String casesEntryName;
+
+    /**
+     * 提示信息(新增已有操作才有值)
+     */
+    private String casesEntryMsg;
+
+    /**
+     * 分值(新增已有操作才有值)
+     */
+    private BigDecimal value;
+
+    /**
+     * 申诉模块id
+     */
+    private Long modeId;
+
+    /**
+     * 模块名称
+     */
+    private String modeName;
+
+    /**
+     * 病历内容
+     */
+    private String defectContent;
+
+    /**
+     * 申诉人id
+     */
+    private Long claimantId;
+
+    /**
+     * 申诉类型(0:医生申诉|1:质控申诉)
+     */
+    private String appealType;
+
+    /**
+     * 申诉操作类型(0:删改|1:新增已有|2:新增缺失|3:恢复)
+     */
+    private String appealOperationType;
+
+    /**
+     * 申诉说明
+     */
+    private String appealExplain;
+
+    /**
+     * 审核人id
+     */
+    private Long checkId;
+
+    /**
+     * 当前工作流节点id
+     */
+    private Long workFlowNodeId;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+}

+ 222 - 0
src/main/java/com/diagbot/facade/MedAppealExamineInfoManagementFacade.java

@@ -0,0 +1,222 @@
+package com.diagbot.facade;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.AnalyzeDTO;
+
+import com.diagbot.entity.MedAppealExamineInfo;
+import com.diagbot.entity.MedAppealInfo;
+
+import com.diagbot.entity.QcresultDetail;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.MedAppealExamineInfoServiceImpl;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.ApprovedVo;
+import com.diagbot.vo.QcResultAlgVO;
+import com.diagbot.vo.QcresultVO;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+
+/**
+ * @Description:申述记录
+ * @Author: songxl
+ * @Date 2022/1/5
+ */
+@Component
+public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoServiceImpl {
+    @Autowired
+    private QcresultDetailFacade qcresultDetailFacade;
+    @Autowired
+    private  MedAppealInfoManagementFacade medAppealInfoManagementFacade;
+    @Autowired
+    private QcresultInfoFacade qcresultInfoFacade;
+
+    /**
+     * 审核通过
+     * @param approvedVo
+     * @return
+     */
+    public Boolean approved (ApprovedVo approvedVo) {
+        QcresultVO qcresultVO = new QcresultVO();
+        qcresultVO.setBehospitalCode(approvedVo.getBehospitalCode());
+        qcresultVO.setHospitalId(approvedVo.getHospitalId());
+        QcResultAlgVO optResultAlgVO = approvedVo.getOptResultAlgVO();
+        optResultAlgVO.setCasesId(approvedVo.getCasesId());
+        optResultAlgVO.setScore(approvedVo.getValue());
+        optResultAlgVO.setMsg(approvedVo.getCasesEntryMsg());
+        optResultAlgVO.setExplainInfo(approvedVo.getRemark());
+        //获取处理方式
+        String handling = approvedVo.getExampleOperation();
+        if(StringUtil.isNotEmpty(handling) && handling.equals("删除")){
+            //调用删除接口
+            optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
+            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+            qcresultVO.setDelStatus(1);
+            qcresultVO.setType(4);
+            AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
+            if(analyzeDTORespDTO.getIsSuccess()){
+                Boolean appealInfo = updateAppealInfo(approvedVo);
+                MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
+                medAppealExamineInfo.setExampleOperation("2");
+                medAppealExamineInfo.setExampleStatus("2");
+                medAppealExamineInfo.setRemark(approvedVo.getRemark());
+                boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("appeal_info_id", approvedVo.getId())
+                        .eq("check_id", approvedVo.getAppealId())
+                );
+                if(appealInfo && update){
+                    return  true;
+                }else {
+                    throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "审核通过失败!");
+                }
+            }else {
+                throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "删除失败!");
+            }
+        }
+        if(StringUtil.isNotEmpty(handling) && handling.equals("修改")){
+            //调用修改接口
+            optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
+            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+            qcresultVO.setType(3);
+            AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
+            if(analyzeDTORespDTO.getIsSuccess()){
+                Boolean appealInfo = updateAppealInfo(approvedVo);
+                MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
+                medAppealExamineInfo.setExampleOperation("1");
+                medAppealExamineInfo.setExampleStatus("2");
+                medAppealExamineInfo.setRemark(approvedVo.getRemark());
+                boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("appeal_info_id", approvedVo.getId())
+                        .eq("check_id", approvedVo.getAppealId())
+                );
+                if(appealInfo && update){
+                    return  true;
+                }else {
+                    throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "审核通过失败!");
+                }
+            }else {
+                throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "修改失败!");
+            }
+        }
+        if(StringUtil.isNotEmpty(handling) && handling.equals("新增已有")){
+            optResultAlgVO.setCasesEntryId(approvedVo.getCasesEntryId());
+            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+            //判断是否已存在该条目
+            QcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<QcresultDetail>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", approvedVo.getHospitalId())
+                    .eq("behospital_code", approvedVo.getBehospitalCode())
+                    .eq("cases_entry_id", approvedVo.getCasesEntryId())
+            );
+            if(qcresultDetail!=null){
+                throw new CommonException(CommonErrorCode.IS_EXISTS, "该条目已存在!");
+            }
+            //调用新增接口
+            qcresultVO.setType(1);
+
+            AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
+            if(analyzeDTORespDTO.getIsSuccess()){
+                MedAppealInfo medAppealInfo = new MedAppealInfo();
+                medAppealInfo.setCasesEntryId(approvedVo.getCasesEntryId());
+                medAppealInfo.setCasesEntryMsg(approvedVo.getCasesEntryMsg());
+                medAppealInfo.setCasesEntryName(approvedVo.getCasesEntryName());
+                medAppealInfo.setValue(approvedVo.getValue());
+                medAppealInfo.setWorkFlowNodeId(3L);
+                boolean update = medAppealInfoManagementFacade.update(medAppealInfo, new UpdateWrapper<MedAppealInfo>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("hospital_id", approvedVo.getHospitalId())
+                        .eq("behospital_code", approvedVo.getBehospitalCode())
+                        .eq("check_id", approvedVo.getAppealId())
+                );
+                MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
+                medAppealExamineInfo.setExampleOperation("3");
+                medAppealExamineInfo.setExampleStatus("2");
+                medAppealExamineInfo.setRemark(approvedVo.getRemark());
+                boolean update1 = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("appeal_info_id", approvedVo.getId())
+                        .eq("check_id", approvedVo.getAppealId())
+                );
+                if(update  && update1){
+                    return  true;
+                }else {
+                    throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "审核通过失败!");
+                }
+            }else {
+                throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "新增失败!");
+            }
+        }
+        if(StringUtil.isNotEmpty(handling) && handling.equals("恢复")){
+            optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
+            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+            qcresultVO.setType(4);
+            qcresultVO.setDelStatus(0);
+            //调用删除接口
+            AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
+            if(analyzeDTORespDTO.getIsSuccess()){
+                Boolean appealInfo = updateAppealInfo(approvedVo);
+                MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
+                medAppealExamineInfo.setExampleOperation("5");
+                medAppealExamineInfo.setExampleStatus("2");
+                medAppealExamineInfo.setRemark(approvedVo.getRemark());
+                boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("appeal_info_id", approvedVo.getId())
+                        .eq("check_id", approvedVo.getAppealId())
+                );
+                if(appealInfo && update){
+                    return  true;
+                }else {
+                    throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "审核通过失败!");
+                }
+            }else {
+                throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "恢复失败!");
+            }
+        }
+        if(StringUtil.isNotEmpty(handling) && handling.equals("新增缺失")){
+            optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
+            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+            qcresultVO.setDelStatus(0);
+            Boolean appealInfo = updateAppealInfo(approvedVo);
+            MedAppealExamineInfo medAppealExamineInfo= new MedAppealExamineInfo();
+            medAppealExamineInfo.setExampleOperation("4");
+            medAppealExamineInfo.setExampleStatus("2");
+            medAppealExamineInfo.setProcessResult(approvedVo.getProcessResult());
+            boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("appeal_info_id", approvedVo.getId())
+                    .eq("check_id", approvedVo.getAppealId())
+            );
+            if (appealInfo && update) {
+                return true;
+            } else {
+                throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "审核通过失败!");
+            }
+        }
+        throw new CommonException(CommonErrorCode.NOT_EXISTS, "无此类型处理方式!");
+    }
+
+    public Boolean updateAppealInfo (ApprovedVo approvedVo) {
+        MedAppealInfo medAppealInfo = new MedAppealInfo();
+        medAppealInfo.setWorkFlowNodeId(3L);
+        boolean update = medAppealInfoManagementFacade.update(medAppealInfo, new UpdateWrapper<MedAppealInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", approvedVo.getHospitalId())
+                .eq("behospital_code", approvedVo.getBehospitalCode())
+                .eq("id", approvedVo.getAppealId())
+        );
+        if(update){
+            return true;
+        }else {
+            return false;
+        }
+    }
+}

+ 18 - 0
src/main/java/com/diagbot/facade/MedAppealInfoManagementFacade.java

@@ -0,0 +1,18 @@
+package com.diagbot.facade;
+
+
+
+
+import com.diagbot.service.impl.MedAppealInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @Description:申诉审核管理
+ * @Author: songxl
+ * @Date 2022/1/5
+ */
+@Component
+public class MedAppealInfoManagementFacade extends MedAppealInfoServiceImpl {
+
+}

+ 16 - 0
src/main/java/com/diagbot/mapper/MedAppealExamineInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedAppealExamineInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 申诉审批表 Mapper 接口
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface MedAppealExamineInfoMapper extends BaseMapper<MedAppealExamineInfo> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/mapper/MedAppealInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedAppealInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 申诉记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface MedAppealInfoMapper extends BaseMapper<MedAppealInfo> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/service/MedAppealExamineInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedAppealExamineInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 申诉审批表 服务类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface MedAppealExamineInfoService extends IService<MedAppealExamineInfo> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/service/MedAppealInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedAppealInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 申诉记录表 服务类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface MedAppealInfoService extends IService<MedAppealInfo> {
+
+}

+ 20 - 0
src/main/java/com/diagbot/service/impl/MedAppealExamineInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedAppealExamineInfo;
+import com.diagbot.mapper.MedAppealExamineInfoMapper;
+import com.diagbot.service.MedAppealExamineInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 申诉审批表 服务实现类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+@Service
+public class MedAppealExamineInfoServiceImpl extends ServiceImpl<MedAppealExamineInfoMapper, MedAppealExamineInfo> implements MedAppealExamineInfoService {
+
+}

+ 20 - 0
src/main/java/com/diagbot/service/impl/MedAppealInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedAppealInfo;
+import com.diagbot.mapper.MedAppealInfoMapper;
+import com.diagbot.service.MedAppealInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 申诉记录表 服务实现类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+@Service
+public class MedAppealInfoServiceImpl extends ServiceImpl<MedAppealInfoMapper, MedAppealInfo> implements MedAppealInfoService {
+
+}

+ 3 - 2
src/main/java/com/diagbot/vo/AddAppealInfoVO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 /**
  * @Description:
@@ -28,7 +29,7 @@ public class AddAppealInfoVO {
     private String qcresultDetailMsg;
 
     @ApiModelProperty(value = "缺陷扣分分值")
-    private Long qcresultDetaiValue;
+    private BigDecimal qcresultDetaiValue;
 
     @ApiModelProperty(value = "条目ID")
     private Long casesEntryId;
@@ -40,7 +41,7 @@ public class AddAppealInfoVO {
     private String casesEntryMsg;
 
     @ApiModelProperty(value = "分值(新增已有操作才有值)")
-    private Long value;
+    private BigDecimal value;
 
     @ApiModelProperty(value = "申诉模块id", required = true)
     @NotNull(message = "申诉模块id不能为空")

+ 9 - 0
src/main/java/com/diagbot/vo/ApprovedVo.java

@@ -39,6 +39,7 @@ public class ApprovedVo {
 
     @ApiModelProperty(value = "处理结果",required = true)
     private String processResult;
+
     @ApiModelProperty(value = "申诉模块",required = true)
     private Long casesId;
 
@@ -60,4 +61,12 @@ public class ApprovedVo {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(hidden = true)
+    private Integer type;
+
+    @ApiModelProperty("逻辑删除接口(1-恢复和0-删除)标志")
+    private Integer delStatus;
+
+    @ApiModelProperty(value = "操作条目")
+    private QcResultAlgVO optResultAlgVO;
 }

+ 13 - 3
src/main/java/com/diagbot/web/MedAppealExamineInfoController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.client.MedAppealExamineInfoServiceClient;
 import com.diagbot.dto.*;
+import com.diagbot.facade.MedAppealExamineInfoManagementFacade;
 import com.diagbot.facade.SysDictionaryFacade;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.*;
@@ -38,6 +39,8 @@ public class MedAppealExamineInfoController {
     MedAppealExamineInfoServiceClient medAppealExamineInfoServiceClient;
     @Autowired
     SysDictionaryFacade sysDictionaryFacade;
+    @Autowired
+    MedAppealExamineInfoManagementFacade medAppealExamineInfoManagementFacade;
     @ApiOperation(value = "获取申述记录列表[by:zhanghang]",
             notes = "获取申诉任务接口")
     @PostMapping("/getComplaintRecord")
@@ -76,8 +79,12 @@ public class MedAppealExamineInfoController {
     @PostMapping("/approved")
     @Transactional
     public RespDTO<Boolean> approved(@RequestBody ApprovedVo approvedVo) {
-
-        return RespDTO.onSuc(medAppealExamineInfoServiceClient.approved(approvedVo));
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        approvedVo.setHospitalId(Long.valueOf(hospitalId));
+        approvedVo.setAppealId(Long.valueOf(userId));
+        // return RespDTO.onSuc(medAppealExamineInfoServiceClient.approved(approvedVo));
+        return RespDTO.onSuc(medAppealExamineInfoManagementFacade.approved(approvedVo));
     }
 
     @ApiOperation(value = "驳回[by:zhanghang]",
@@ -85,7 +92,10 @@ public class MedAppealExamineInfoController {
     @PostMapping("/rejected")
     @Transactional
     public RespDTO<Boolean> rejected(@RequestBody RejectedVo rejectedVo) {
-
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        rejectedVo.setHospitalId(Long.valueOf(hospitalId));
+        rejectedVo.setAppealId(Long.valueOf(userId));
         return RespDTO.onSuc(medAppealExamineInfoServiceClient.rejected(rejectedVo));
     }
     @ApiOperation(value = "审核查看[by:zhanghang]",

+ 22 - 0
src/main/resources/mapper/MedAppealExamineInfoMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.MedAppealExamineInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedAppealExamineInfo">
+        <id column="id" property="id" />
+        <result column="appeal_info_id" property="appealInfoId" />
+        <result column="check_id" property="checkId" />
+        <result column="example_status" property="exampleStatus" />
+        <result column="example_operation" property="exampleOperation" />
+        <result column="process_result" property="processResult" />
+        <result column="reject_reason" property="rejectReason" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 34 - 0
src/main/resources/mapper/MedAppealInfoMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.MedAppealInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedAppealInfo">
+        <id column="id" property="id" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="behospital_code" property="behospitalCode" />
+        <result column="qcresult_detail_id" property="qcresultDetailId" />
+        <result column="qcresult_detail_msg" property="qcresultDetailMsg" />
+        <result column="qcresult_detai_value" property="qcresultDetaiValue" />
+        <result column="cases_entry_id" property="casesEntryId" />
+        <result column="cases_entry_name" property="casesEntryName" />
+        <result column="cases_entry_msg" property="casesEntryMsg" />
+        <result column="value" property="value" />
+        <result column="mode_id" property="modeId" />
+        <result column="mode_name" property="modeName" />
+        <result column="defect_content" property="defectContent" />
+        <result column="claimant_id" property="claimantId" />
+        <result column="appeal_type" property="appealType" />
+        <result column="appeal_operation_type" property="appealOperationType" />
+        <result column="appeal_explain" property="appealExplain" />
+        <result column="check_id" property="checkId" />
+        <result column="work_flow_node_id" property="workFlowNodeId" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>