Merge remote-tracking branch 'origin/dev/20220105_2.2.0_通用版_申诉驳回' into dev/20220105_2.2.0_通用版_申诉驳回

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

@@ -283,7 +283,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/appealInfo/updCase").permitAll()
                 .antMatchers("/qc/appealInfo/getAppealOperationType").permitAll()
                 .antMatchers("/qc/appealInfo/cancelAppealInfo").permitAll()
+                .antMatchers("/qc/appealInfo/cancelAppealInfoApi").permitAll()
                 .antMatchers("/qc/appealInfo/getAppealInfo").permitAll()
+                .antMatchers("/qc/mode/getModes").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -360,7 +360,9 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/behospitalInfo/updCase", request)
                 || matchers("/qc/appealInfo/getAppealOperationType", request)
                 || matchers("/qc/appealInfo/cancelAppealInfo", request)
+                || matchers("/qc/appealInfo/cancelAppealInfoApi", request)
                 || matchers("/qc/appealInfo/getAppealInfo", request)
+                || matchers("/qc/mode/getModes", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -21,7 +21,7 @@ public class AppealExamineRecordDTO implements Serializable {
     @ApiModelProperty(value = "条目ID")
     private Long casesEntryId;
 
-    @ApiModelProperty(value = "质控条目(新增已有操作才有值)")
+    @ApiModelProperty(value = "质控条目")
     private String casesEntryName;
 
     @ApiModelProperty(value = "申诉-提示信息(新增已有操作才有值)")

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

@@ -50,10 +50,10 @@ public class GetAppealInfoDTO implements Serializable {
     private Date leaveHospitalDate;
 
     @ApiModelProperty(value = "申诉模块id")
-    private Long casesId;
+    private Long modeId;
 
     @ApiModelProperty(value = "模块名称")
-    private String casesName;
+    private String modeName;
 
     @ApiModelProperty(value = "病历内容")
     private String defectContent;

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

@@ -46,7 +46,7 @@ public class GetAppealReviewDTO {
     private String name;
 
     @ApiModelProperty(value = "申述模块")
-    private String casesName;
+    private String modeName;
 
     @ApiModelProperty(value = "缺陷详情")
     private String qcresultDetailMsg;

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

@@ -53,7 +53,7 @@ public class GetComplaintRecordDTO {
     private String name;
 
     @ApiModelProperty(value = "申述模块")
-    private String casesName;
+    private String modeName;
 
     @ApiModelProperty(value = "缺陷详情")
     private String qcresultDetailMsg;
@@ -80,6 +80,6 @@ public class GetComplaintRecordDTO {
     @ApiModelProperty(value = "单项否决（1-单项否决 0-非）")
     private Integer isReject;
 
-    @ApiModelProperty(value = "模块数据标准id")
-    private Integer casesId;
+    @ApiModelProperty(value = "模块id")
+    private Long modeId;
 }

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

@@ -49,11 +49,11 @@ public class AddAppealInfoVO {
     @ApiModelProperty(value = "分值(新增已有操作才有值)")
     private BigDecimal value;
 
-    @ApiModelProperty(value = "模块数据标准id")
-    private Long casesId;
+    @ApiModelProperty(value = "模块id")
+    private Long modeId;
 
     @ApiModelProperty(value = "模块名称", hidden = true)
-    private String casesName;
+    private String modeName;
 
 
     @ApiModelProperty(value = "病历内容")

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

@@ -0,0 +1,22 @@
+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 CancelAppealInfoApiVO {
+    @ApiModelProperty(value = "申诉id", required = true)
+    private Long id;
+    @ApiModelProperty(value = "医院ID",required = true)
+    @NotNull(message = "医院ID不能为空")
+    private Long hospitalId;
+    @ApiModelProperty(value = "当前工作流节点id 1:申诉|2:撤回|3:审核", hidden = true)
+    private Long workFlowNodeId;
+}

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

@@ -38,7 +38,7 @@ public class GetAppealReviewVO extends Page implements Serializable {
     private String deptName;
 
     @ApiModelProperty(value = "申述模块")
-    private String casesName;
+    private String modeName;
 
     @ApiModelProperty(value = "申诉人")
     private String name;

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

@@ -41,7 +41,7 @@ public class GetComplaintRecordVO extends Page implements Serializable {
     private String deptName;
 
     @ApiModelProperty(value = "申述模块")
-    private String casesName;
+    private String modeName;
 
     @ApiModelProperty(value = "审核人")
     private String name;

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

@@ -11,6 +11,7 @@ import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.AddAppealInfoApiVO;
 import com.diagbot.vo.AddAppealInfoVO;
+import com.diagbot.vo.CancelAppealInfoApiVO;
 import com.diagbot.vo.CancelAppealInfoVO;
 import com.diagbot.vo.GetAppealInfoVO;
 import com.diagbot.vo.GetAppealOperationTypeVO;
@@ -118,6 +119,22 @@ public class MedAppealInfoController {
         return medAppealInfoServiceClientFacade.getAppealOperationType(getAppealOperationTypeVO);
     }
 
+    @ApiOperation(value = "撤回申诉[by:songxl]",
+            notes = "撤回申诉")
+    @PostMapping("/cancelAppealInfoApi")
+    @Transactional
+    public RespDTO<Boolean> cancelAppealInfoApi(@RequestBody @Valid CancelAppealInfoApiVO cancelAppealInfoApiVO) {
+        //获取操作流节点
+        String mapping = sysHospitalSetFacade.getValue(cancelAppealInfoApiVO.getHospitalId(),"work_flow_node_mapping");
+        CancelAppealInfoVO cancelAppealInfoVO = new CancelAppealInfoVO();
+        BeanUtils.copyProperties(cancelAppealInfoApiVO,cancelAppealInfoVO);
+        if(StringUtil.isNotEmpty(mapping)){
+            JSONObject mapJSON = JSONObject.parseObject(mapping);
+            cancelAppealInfoVO.setWorkFlowNodeId(mapJSON.getLong("cancelAppealInfo"));
+        }
+        return medAppealInfoServiceClient.cancelAppealInfo(cancelAppealInfoVO);
+    }
+
     @ApiOperation(value = "撤回申诉[by:songxl]",
             notes = "撤回申诉")
     @PostMapping("/cancelAppealInfo")