申诉-代码调整

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

@@ -74,7 +74,7 @@ public class AddAppealInfoVO {
     @NotNull(message = "审核人id不能为空")
     private Long checkId;
 
-    @ApiModelProperty(value = "当前工作流节点id 1:申诉|2:撤回|3:审核", required = true)
+    @ApiModelProperty(value = "当前工作流节点id 1:申诉|2:撤回|3:审核", hidden = true)
     @NotNull(message = "当前工作流节点id不能为空")
     private Long workFlowNodeId;
 

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

@@ -10,6 +10,7 @@ import java.math.BigDecimal;
 
 /**
  * 通过
+ *
  * @Description:
  * @author: cy
  * @time: 2020/9/4 14:59
@@ -19,28 +20,28 @@ import java.math.BigDecimal;
 public class ApprovedVo {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "医院id",hidden = true)
+    @ApiModelProperty(value = "医院id", hidden = true)
     private Long hospitalId;
 
-    @ApiModelProperty(value = "申诉id",required = true)
+    @ApiModelProperty(value = "申诉id", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "工作流节点")
+    @ApiModelProperty(value = "工作流节点", hidden = true)
     private Long workFlowNodeId;
 
-    @ApiModelProperty(value = "审核人id",hidden = true)
+    @ApiModelProperty(value = "审核人id", hidden = true)
     private Long appealId;
 
-    @ApiModelProperty(value = "病人住院序号",required = true)
+    @ApiModelProperty(value = "病人住院序号", required = true)
     private String behospitalCode;
 
-    @ApiModelProperty(value = "处理方式",required = true)
+    @ApiModelProperty(value = "处理方式", required = true)
     private String exampleOperation;
 
-    @ApiModelProperty(value = "处理结果",required = true)
+    @ApiModelProperty(value = "处理结果", required = true)
     private String processResult;
 
-    @ApiModelProperty(value = "申诉模块",required = true)
+    @ApiModelProperty(value = "申诉模块", required = true)
     private Long casesId;
 
     @ApiModelProperty(value = "质控缺陷ID")

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

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
 public class CancelAppealInfoVO {
     @ApiModelProperty(value = "申诉id", required = true)
     private Long id;
-    @ApiModelProperty(value = "当前工作流节点id 1:申诉|2:撤回|3:审核", required = true)
+    @ApiModelProperty(value = "当前工作流节点id 1:申诉|2:撤回|3:审核", hidden = true)
     @NotNull(message = "当前工作流节点id不能为空")
     private Long workFlowNodeId;
 }

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

@@ -9,6 +9,7 @@ import java.math.BigDecimal;
 
 /**
  * 驳回
+ *
  * @Description:
  * @author: cy
  * @time: 2020/9/4 14:59
@@ -18,19 +19,19 @@ import java.math.BigDecimal;
 public class RejectedVo {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "医院id",hidden = true)
+    @ApiModelProperty(value = "医院id", hidden = true)
     private Long hospitalId;
 
-    @ApiModelProperty(value = "申诉id",required = true)
+    @ApiModelProperty(value = "申诉id", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "工作流节点")
+    @ApiModelProperty(value = "工作流节点", hidden = true)
     private Long workFlowNodeId;
 
-    @ApiModelProperty(value = "审核人id",hidden = true)
+    @ApiModelProperty(value = "审核人id", hidden = true)
     private Long appealId;
 
-    @ApiModelProperty(value = "病人住院序号",required = true)
+    @ApiModelProperty(value = "病人住院序号", required = true)
     private String behospitalCode;
 
     @ApiModelProperty(value = "驳回理由")

gateway-service/src/main/resources/bootstrap.yml

@@ -93,7 +93,6 @@ secure:
       - "/message-service/pageSample/sample"
       - "/message-service/backSample/sendToDefaultTopic"
       - "/message-service/backSample/sendToTopic"
-      - "/report-service/medAppealInfoManage/getWorkById"
       - "/report-service/medAppealExamineInInfoManage/getComplaintRecord"
       - "/report-service/medAppealExamineInInfoManage/getAppealReview"
       - "/report-service/medAppealExamineInInfoManage/getAudit"

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

@@ -162,7 +162,6 @@ public class MedAppealExamineInfoManagementFacade {
                 appealInfo.setCasesEntryMsg(approvedVo.getCasesEntryMsg());
                 appealInfo.setCasesEntryName(approvedVo.getCasesEntryName());
                 appealInfo.setValue(approvedVo.getValue());
-                appealInfo.setWorkFlowNodeId(3L);
                 int appealInfoUpdate = appealInfoFacade.getBaseMapper().update(appealInfo, new QueryWrapper<AppealInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("hospital_id", approvedVo.getHospitalId())
@@ -253,7 +252,6 @@ public class MedAppealExamineInfoManagementFacade {
      */
     public Boolean rejected(RejectedVo rejectedVo) {
         AppealInfo appealInfo = new AppealInfo();
-        appealInfo.setWorkFlowNodeId(3L);
         int appealInfoUpdate = appealInfoFacade.getBaseMapper().update(appealInfo, new UpdateWrapper<AppealInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", rejectedVo.getHospitalId())
@@ -303,7 +301,6 @@ public class MedAppealExamineInfoManagementFacade {
 
     public Boolean updateAppealInfo (ApprovedVo approvedVo) {
         AppealInfo appealInfo = new AppealInfo();
-        appealInfo.setWorkFlowNodeId(3L);
         int appealInfoUpdate = appealInfoFacade.getBaseMapper().update(appealInfo, new UpdateWrapper<AppealInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", approvedVo.getHospitalId())

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

@@ -56,9 +56,6 @@ public class MedAppealInfoManagementFacade {
     @Autowired
     private AppealExamineInfoFacade appealExamineInfoFacade;
 
-    public WorkFlowNode getWorkById(MedAppealInfoVO medAppealInfoVO) {
-        return workFlowNodeFacade.getById(medAppealInfoVO.getId());
-    }
 
     public Boolean addAppealInfo(AddAppealInfoVO addAppealInfoVO) {
 

report-service/src/main/java/com/lantone/report/web/MedAppealInfoManagementController.java

@@ -40,13 +40,6 @@ public class MedAppealInfoManagementController {
     @Autowired
     MedAppealInfoManagementFacade medAppealInfoManagementFacade;
 
-    @ApiOperation(value = "通过id获取工作流[by:songxl]",
-            notes = "通过id获取工作流")
-    @PostMapping("/getWorkById")
-    public RespDTO<WorkFlowNode> getWorkById(@RequestBody MedAppealInfoVO medAppealInfoVO) {
-        WorkFlowNode workFlowInfo = medAppealInfoManagementFacade.getWorkById(medAppealInfoVO);
-        return RespDTO.onSuc(workFlowInfo);
-    }
 
 
     @ApiOperation(value = "申诉[by:songxl]",