|
@@ -2,18 +2,12 @@ package com.diagbot.web;
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.diagbot.annotation.SysLogger;
|
|
|
-import com.diagbot.client.MedAppealInfoServiceClient;
|
|
|
+import com.diagbot.client.MedAppealInfoServiceClientFacade;
|
|
|
import com.diagbot.dto.GetAppealInfoDTO;
|
|
|
import com.diagbot.dto.GetReviewerDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
-import com.diagbot.dto.Response;
|
|
|
-import com.diagbot.entity.SysUser;
|
|
|
-import com.diagbot.entity.WorkFlowInfo;
|
|
|
import com.diagbot.facade.SysHospitalSetFacade;
|
|
|
-import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
-import com.diagbot.util.SysJwtUtil;
|
|
|
import com.diagbot.util.SysUserUtils;
|
|
|
import com.diagbot.vo.AddAppealInfoApiVO;
|
|
|
import com.diagbot.vo.AddAppealInfoVO;
|
|
@@ -22,20 +16,16 @@ import com.diagbot.vo.GetAppealInfoVO;
|
|
|
import com.diagbot.vo.GetAppealOperationTypeVO;
|
|
|
import com.diagbot.vo.GetReviewerApiVO;
|
|
|
import com.diagbot.vo.GetReviewerVO;
|
|
|
-import com.diagbot.vo.MedAppealInfoVO;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
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 springfox.documentation.annotations.ApiIgnore;
|
|
|
-import springfox.documentation.spring.web.json.Json;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
import java.util.List;
|
|
@@ -57,7 +47,7 @@ import java.util.Map;
|
|
|
public class MedAppealInfoController {
|
|
|
|
|
|
@Autowired
|
|
|
- MedAppealInfoServiceClient medAppealInfoServiceClient;
|
|
|
+ MedAppealInfoServiceClientFacade medAppealInfoServiceClientFacade;
|
|
|
|
|
|
@Autowired
|
|
|
SysHospitalSetFacade sysHospitalSetFacade;
|
|
@@ -70,12 +60,12 @@ public class MedAppealInfoController {
|
|
|
addAppealInfoVO.setHospitalId(Long.parseLong(SysUserUtils.getCurrentHospitalID()));
|
|
|
addAppealInfoVO.setClaimantId(SysUserUtils.getCurrentPrincipleID());
|
|
|
//获取操作流节点
|
|
|
- String mapping = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()),"work_flow_node_mapping");
|
|
|
- if(StringUtil.isNotEmpty(mapping)){
|
|
|
+ String mapping = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()), "work_flow_node_mapping");
|
|
|
+ if (StringUtil.isNotEmpty(mapping)) {
|
|
|
JSONObject mapJSON = JSONObject.parseObject(mapping);
|
|
|
addAppealInfoVO.setWorkFlowNodeId(mapJSON.getLong("addAppealInfo"));
|
|
|
}
|
|
|
- return medAppealInfoServiceClient.addAppealInfo(addAppealInfoVO);
|
|
|
+ return medAppealInfoServiceClientFacade.addAppealInfo(addAppealInfoVO);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "申诉-对外api接口[by:songxl]",
|
|
@@ -84,14 +74,14 @@ public class MedAppealInfoController {
|
|
|
@Transactional
|
|
|
public RespDTO<Boolean> addAppealInfoApi(@RequestBody @Valid AddAppealInfoApiVO addAppealInfoApiVO) {
|
|
|
//获取操作流节点
|
|
|
- String mapping = sysHospitalSetFacade.getValue(addAppealInfoApiVO.getHospitalId(),"work_flow_node_mapping");
|
|
|
+ String mapping = sysHospitalSetFacade.getValue(addAppealInfoApiVO.getHospitalId(), "work_flow_node_mapping");
|
|
|
AddAppealInfoVO addAppealInfoVO = new AddAppealInfoVO();
|
|
|
- BeanUtils.copyProperties(addAppealInfoApiVO,addAppealInfoVO);
|
|
|
- if(StringUtil.isNotEmpty(mapping)){
|
|
|
+ BeanUtils.copyProperties(addAppealInfoApiVO, addAppealInfoVO);
|
|
|
+ if (StringUtil.isNotEmpty(mapping)) {
|
|
|
JSONObject mapJSON = JSONObject.parseObject(mapping);
|
|
|
addAppealInfoVO.setWorkFlowNodeId(mapJSON.getLong("addAppealInfo"));
|
|
|
}
|
|
|
- return medAppealInfoServiceClient.addAppealInfo(addAppealInfoVO);
|
|
|
+ return medAppealInfoServiceClientFacade.addAppealInfo(addAppealInfoVO);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "获取审核人-对外api接口[by:songxl]",
|
|
@@ -99,13 +89,13 @@ public class MedAppealInfoController {
|
|
|
@PostMapping("/getReviewerApi")
|
|
|
public RespDTO<List<GetReviewerDTO>> getReviewerApi(@RequestBody GetReviewerApiVO getReviewerApiVO) {
|
|
|
//申诉人是否包含自身开关
|
|
|
- String flag = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()),"self_flag");
|
|
|
+ String flag = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()), "self_flag");
|
|
|
GetReviewerVO getReviewerVO = new GetReviewerVO();
|
|
|
- BeanUtils.copyProperties(getReviewerApiVO,getReviewerVO);
|
|
|
- if(StringUtils.isNotEmpty(flag)){
|
|
|
+ BeanUtils.copyProperties(getReviewerApiVO, getReviewerVO);
|
|
|
+ if (StringUtils.isNotEmpty(flag)) {
|
|
|
getReviewerVO.setSelfFlag(Boolean.parseBoolean(flag));
|
|
|
}
|
|
|
- return medAppealInfoServiceClient.getReviewer(getReviewerVO);
|
|
|
+ return medAppealInfoServiceClientFacade.getReviewer(getReviewerVO);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "获取审核人[by:songxl]",
|
|
@@ -114,18 +104,18 @@ public class MedAppealInfoController {
|
|
|
public RespDTO<List<GetReviewerDTO>> getReviewer(@RequestBody GetReviewerVO getReviewerVO) {
|
|
|
getReviewerVO.setClaimantId(SysUserUtils.getCurrentPrincipleID());
|
|
|
//申诉人是否包含自身开关
|
|
|
- String flag = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()),"self_flag");
|
|
|
- if(StringUtils.isNotEmpty(flag)){
|
|
|
+ String flag = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()), "self_flag");
|
|
|
+ if (StringUtils.isNotEmpty(flag)) {
|
|
|
getReviewerVO.setSelfFlag(Boolean.parseBoolean(flag));
|
|
|
}
|
|
|
- return medAppealInfoServiceClient.getReviewer(getReviewerVO);
|
|
|
+ return medAppealInfoServiceClientFacade.getReviewer(getReviewerVO);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "再次申诉获取操作类型[by:songxl]",
|
|
|
notes = "再次申诉获取操作类型")
|
|
|
@PostMapping("/getAppealOperationType")
|
|
|
public RespDTO<Map<String, String>> getAppealOperationType(@RequestBody @Valid GetAppealOperationTypeVO getAppealOperationTypeVO) {
|
|
|
- return medAppealInfoServiceClient.getAppealOperationType(getAppealOperationTypeVO);
|
|
|
+ return medAppealInfoServiceClientFacade.getAppealOperationType(getAppealOperationTypeVO);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "撤回申诉[by:songxl]",
|
|
@@ -134,19 +124,19 @@ public class MedAppealInfoController {
|
|
|
@Transactional
|
|
|
public RespDTO<Boolean> cancelAppealInfo(@RequestBody @Valid CancelAppealInfoVO cancelAppealInfoVO) {
|
|
|
//获取操作流节点
|
|
|
- String mapping = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()),"work_flow_node_mapping");
|
|
|
- if(StringUtil.isNotEmpty(mapping)){
|
|
|
+ String mapping = sysHospitalSetFacade.getValue(Long.parseLong(SysUserUtils.getCurrentHospitalID()), "work_flow_node_mapping");
|
|
|
+ if (StringUtil.isNotEmpty(mapping)) {
|
|
|
JSONObject mapJSON = JSONObject.parseObject(mapping);
|
|
|
cancelAppealInfoVO.setWorkFlowNodeId(mapJSON.getLong("cancelAppealInfo"));
|
|
|
}
|
|
|
- return medAppealInfoServiceClient.cancelAppealInfo(cancelAppealInfoVO);
|
|
|
+ return medAppealInfoServiceClientFacade.cancelAppealInfo(cancelAppealInfoVO);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "申诉记录详情-查看[by:songxl]",
|
|
|
notes = "申诉记录详情-查看")
|
|
|
@PostMapping("/getAppealInfo")
|
|
|
public RespDTO<GetAppealInfoDTO> getAppealInfo(@RequestBody GetAppealInfoVO getAppealInfoVO) {
|
|
|
- return medAppealInfoServiceClient.getAppealInfo(getAppealInfoVO);
|
|
|
+ return medAppealInfoServiceClientFacade.getAppealInfo(getAppealInfoVO);
|
|
|
}
|
|
|
|
|
|
}
|