修改获取申诉列表接口

common/src/main/java/com/lantone/common/dto/appeal/GetComplaintRecordDTO.java

@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -66,4 +67,6 @@ public class GetComplaintRecordDTO {
     @ApiModelProperty(value = "状态")
     private String exampleStatus;
 
+    @ApiModelProperty(value = "缺陷扣分分值")
+    private BigDecimal qcresultDetaiValue;
 }

common/src/main/java/com/lantone/common/vo/appeal/AddAppealInfoVO.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
 @Data
 public class AddAppealInfoVO {
 
-    @ApiModelProperty(value = "医院ID", hidden = true)
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
     @ApiModelProperty(value = "病人住院ID", required = true)
@@ -60,7 +60,7 @@ public class AddAppealInfoVO {
     private String defectContent;
 
     @ApiModelProperty(value = "申诉人id", hidden = true)
-    private Long claimantId;
+    private String claimantId;
 
     @ApiModelProperty(value = "申诉类型(0:医生申诉|1:质控申诉)", required = true)
     @NotBlank(message = "申诉类型不能为空")

common/src/main/java/com/lantone/common/vo/appeal/GetReviewerVO.java

@@ -11,7 +11,7 @@ import lombok.Data;
 @Data
 public class GetReviewerVO {
     @ApiModelProperty(value = "申诉人id", hidden = true)
-    private Long claimantId;
+    private String claimantId;
     @ApiModelProperty(value = "是否包含自身开关", hidden = true)
     private Boolean selfFlag = false;
     @ApiModelProperty(value = "审核角色id", hidden = true)

dblayer-mbg/src/main/resources/mapperdb2/AppealExamineInfoMapper.xml

@@ -28,7 +28,8 @@
         a.gmt_create AS claimant_gmt_create,
         b.`name`,
         b.beh_dept_name,
-        a.appeal_operation_type
+        a.appeal_operation_type,
+        a.qcresult_detai_value qcresultDetaiValue
         FROM
         (
         SELECT

report-service/src/main/java/com/lantone/report/facade/MedAppealInfoManagementFacade.java

@@ -72,9 +72,10 @@ public class MedAppealInfoManagementFacade {
                 //获取该病历缺陷申诉记录(医院id+病历id+质控缺陷id+未删除)
                 AppealInfo appealInfo = getAppealInfo(addAppealInfoVO.getHospitalId()
                         , addAppealInfoVO.getBehospitalCode()
-                        , addAppealInfoVO.getQcresultDetailId());
+                        , addAppealInfoVO.getQcresultDetailId()
+                        , addAppealInfoVO.getClaimantId());
                 //缺陷状态-删除
-                if (qcresultDetail.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
+                if (IsDeleteEnum.Y.getKey().equals(qcresultDetail.getIsDeleted())) {
                     Asserts.fail2("该缺陷已被删除，请走恢复流程");
                 }
                 //申诉记录不存在
@@ -83,7 +84,7 @@ public class MedAppealInfoManagementFacade {
                     return addAppealInfoAndExamineInfo(addAppealInfoVO);
                 }
                 //获取申诉记录当前节点状态(1:申诉|2：撤销|3：科室审核)
-                if (WorkFlowNodeEnum.APPEAL.getKey().equals(addAppealInfoVO.getWorkFlowNodeId() + "")) {
+                if (WorkFlowNodeEnum.APPEAL.getKey().equals(appealInfo.getWorkFlowNodeId()+ "")) {
                     Asserts.fail2("该缺陷已被申诉");
                 } else {
                     //删除申诉记录
@@ -115,7 +116,8 @@ public class MedAppealInfoManagementFacade {
                 //获取该病历缺陷申诉记录(医院id+病历id+质控缺陷id+未删除)
                 AppealInfo appealInfo1 = getAppealInfo(addAppealInfoVO.getHospitalId()
                         , addAppealInfoVO.getBehospitalCode()
-                        , addAppealInfoVO.getQcresultDetailId());
+                        , addAppealInfoVO.getQcresultDetailId()
+                        , addAppealInfoVO.getClaimantId());
                 //缺陷状态-删除
                 if (qcresultDetail1.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
                     Asserts.fail2("缺陷已被恢复无需再次恢复");
@@ -163,7 +165,7 @@ public class MedAppealInfoManagementFacade {
      * @Description获取该病历缺陷申诉记录
      * @Return com.lantone.dblayermbg.entity.appeal.AppealInfo
      */
-    private AppealInfo getAppealInfo(Long hospitalId, String behospitalCode, Long qcresultDetailId) {
+    private AppealInfo getAppealInfo(Long hospitalId, String behospitalCode, Long qcresultDetailId ,String claimantId) {
 
         if (qcresultDetailId == null) {
             Asserts.fail2("质控缺陷id为空");
@@ -172,7 +174,9 @@ public class MedAppealInfoManagementFacade {
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", behospitalCode)
                 .eq("qcresult_detail_id", qcresultDetailId)
-                .eq("is_deleted", IsDeleteEnum.N.getKey()));
+                .eq("claimant_id", claimantId)
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .orderByDesc("gmt_create"));
         if (ListUtil.isNotEmpty(appealInfos)) {
             return appealInfos.get(0);
         }