|
|
|
@ -6,7 +6,7 @@ import com.docus.infrastructure.web.api.CommonResult;
|
|
|
|
|
import com.docus.server.collection.entity.TBasic;
|
|
|
|
|
import com.docus.server.collection.mapper.TBasicMapper;
|
|
|
|
|
import com.docus.server.report.job.ReportJob;
|
|
|
|
|
import com.docus.server.report.noviwtask.NoViewTaskService;
|
|
|
|
|
import com.docus.server.report.api.TaskDistributeService;
|
|
|
|
|
import com.docus.server.report.service.ReportService;
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
@ -32,37 +32,37 @@ public class ReportDownController {
|
|
|
|
|
private TBasicMapper tBasicMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
ReportJob reportJob;
|
|
|
|
|
@Resource
|
|
|
|
|
private NoViewTaskService noViewTaskService;
|
|
|
|
|
@Resource
|
|
|
|
|
private TaskDistributeService taskDistributeService;
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "获取任务测试")
|
|
|
|
|
@PostMapping("/getTaskTest")
|
|
|
|
|
public CommonResult<Object> getTaskTest(@RequestParam("collectorId") String collectorId){
|
|
|
|
|
return CommonResult.success(noViewTaskService.getTaskByCollectorId(collectorId));
|
|
|
|
|
public CommonResult<Object> getTaskTest(@RequestParam("collectorId") String collectorId) {
|
|
|
|
|
return CommonResult.success(taskDistributeService.getNoviewTaskByCollectorId(collectorId));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = " lis 检验 采集 job 测试")
|
|
|
|
|
@GetMapping("/sdRyLisCollectJob")
|
|
|
|
|
public CommonResult<String> sdRyLisCollectJob(){
|
|
|
|
|
public CommonResult<String> sdRyLisCollectJob() {
|
|
|
|
|
reportJob.sdRyLisCollectJob();
|
|
|
|
|
return CommonResult.success("成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = " inspect 检查 采集 job 测试")
|
|
|
|
|
@GetMapping("/sdRyInspectCollectJob")
|
|
|
|
|
public CommonResult<String> sdRyInspectCollectJob(){
|
|
|
|
|
public CommonResult<String> sdRyInspectCollectJob() {
|
|
|
|
|
reportJob.sdRyInspectCollectJob();
|
|
|
|
|
return CommonResult.success("成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = " inspectReport 根据病案主键补偿")
|
|
|
|
|
@PostMapping("/inspectReportMakeup")
|
|
|
|
|
public CommonResult<String> inspectReportMakeup(@RequestBody List<String> patientIds){
|
|
|
|
|
if(Func.isEmpty(patientIds)){
|
|
|
|
|
public CommonResult<String> inspectReportMakeup(@RequestBody List<String> patientIds) {
|
|
|
|
|
if (Func.isEmpty(patientIds)) {
|
|
|
|
|
return CommonResult.failed("病案主键不能为空!");
|
|
|
|
|
}
|
|
|
|
|
List<TBasic> tBasics =tBasicMapper.selectBasicListByPatientIds(patientIds);
|
|
|
|
|
if(Func.isEmpty(tBasics)){
|
|
|
|
|
List<TBasic> tBasics = tBasicMapper.selectBasicListByPatientIds(patientIds);
|
|
|
|
|
if (Func.isEmpty(tBasics)) {
|
|
|
|
|
return CommonResult.failed("未查询到病案基础数据!");
|
|
|
|
|
}
|
|
|
|
|
reportJob.queryInspectReport(tBasics);
|
|
|
|
@ -71,12 +71,12 @@ private NoViewTaskService noViewTaskService;
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "lisReport 根据病案主键补偿")
|
|
|
|
|
@PostMapping("/lisReportMakeup")
|
|
|
|
|
public CommonResult<String> lisReportMakeup(@RequestBody List<String> patientIds){
|
|
|
|
|
if(Func.isEmpty(patientIds)){
|
|
|
|
|
public CommonResult<String> lisReportMakeup(@RequestBody List<String> patientIds) {
|
|
|
|
|
if (Func.isEmpty(patientIds)) {
|
|
|
|
|
return CommonResult.failed("病案主键不能为空!");
|
|
|
|
|
}
|
|
|
|
|
List<TBasic> tBasics =tBasicMapper.selectBasicListByPatientIds(patientIds);
|
|
|
|
|
if(Func.isEmpty(tBasics)){
|
|
|
|
|
List<TBasic> tBasics = tBasicMapper.selectBasicListByPatientIds(patientIds);
|
|
|
|
|
if (Func.isEmpty(tBasics)) {
|
|
|
|
|
return CommonResult.failed("未查询到病案基础数据!");
|
|
|
|
|
}
|
|
|
|
|
reportJob.queryLisReport(tBasics);
|
|
|
|
@ -86,7 +86,7 @@ private NoViewTaskService noViewTaskService;
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "根据任务id补偿报告下载(接收推送的报告)")
|
|
|
|
|
@PostMapping("/makeupReportByTaskIds")
|
|
|
|
|
public CommonResult<String> makeupReportByTaskIds(@RequestBody List<Long> taskIds){
|
|
|
|
|
public CommonResult<String> makeupReportByTaskIds(@RequestBody List<Long> taskIds) {
|
|
|
|
|
if (Func.isEmpty(taskIds)) {
|
|
|
|
|
return CommonResult.failed("补偿任务id不能为空!");
|
|
|
|
|
}
|
|
|
|
@ -100,36 +100,35 @@ private NoViewTaskService noViewTaskService;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "report lis job 测试",hidden = true)
|
|
|
|
|
@ApiOperation(value = "report lis job 测试", hidden = true)
|
|
|
|
|
@PostMapping("/lisreportJobTest")
|
|
|
|
|
public CommonResult<String> LisreportJobTest(){
|
|
|
|
|
public CommonResult<String> LisreportJobTest() {
|
|
|
|
|
reportJob.sdRyLisReportQueryJob();
|
|
|
|
|
return CommonResult.success("成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "report inspect job 测试",hidden = true)
|
|
|
|
|
@ApiOperation(value = "report inspect job 测试", hidden = true)
|
|
|
|
|
@PostMapping("/inspectReportJobTest")
|
|
|
|
|
public CommonResult<String> inspectReportJobTest(){
|
|
|
|
|
public CommonResult<String> inspectReportJobTest() {
|
|
|
|
|
reportJob.sdRyInspectReportQueryJob();
|
|
|
|
|
return CommonResult.success("成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "inspect检查报告测试地址",hidden = true)
|
|
|
|
|
@ApiOperation(value = "inspect检查报告测试地址", hidden = true)
|
|
|
|
|
@PostMapping("/inspectTest/query")
|
|
|
|
|
public JSONObject inspectTest(@RequestParam("uuid") String uuid,
|
|
|
|
|
@RequestParam("action") String action,
|
|
|
|
|
@RequestParam("accessKey") String accessKey,
|
|
|
|
|
@RequestParam("creationTime") String creationTime,
|
|
|
|
|
@RequestBody Map<String,Object> map){
|
|
|
|
|
System.out.println("请求的参数为 uuid:"+uuid);
|
|
|
|
|
System.out.println("请求的参数为 action:"+action);
|
|
|
|
|
System.out.println("请求的参数为 accessKey:"+accessKey);
|
|
|
|
|
System.out.println("请求的参数为 creationTime:"+creationTime);
|
|
|
|
|
System.out.println("请求的参数为 body:"+map);
|
|
|
|
|
|
|
|
|
|
String result="{\n" +
|
|
|
|
|
@RequestBody Map<String, Object> map) {
|
|
|
|
|
System.out.println("请求的参数为 uuid:" + uuid);
|
|
|
|
|
System.out.println("请求的参数为 action:" + action);
|
|
|
|
|
System.out.println("请求的参数为 accessKey:" + accessKey);
|
|
|
|
|
System.out.println("请求的参数为 creationTime:" + creationTime);
|
|
|
|
|
System.out.println("请求的参数为 body:" + map);
|
|
|
|
|
|
|
|
|
|
String result = "{\n" +
|
|
|
|
|
"\"compcode\": \"INSPECT_REPORTQuery\",\n" +
|
|
|
|
|
"\"compname\": \"检查报告查询服务\",\n" +
|
|
|
|
|
"\"count\": 2,\n" +
|
|
|
|
@ -281,25 +280,25 @@ private NoViewTaskService noViewTaskService;
|
|
|
|
|
"\"ResultCode\": \"0\"\n" +
|
|
|
|
|
"}";
|
|
|
|
|
|
|
|
|
|
return Func.readJson(result,JSONObject.class);
|
|
|
|
|
return Func.readJson(result, JSONObject.class);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "inspect检查报告测试地址 ",hidden = true)
|
|
|
|
|
@ApiOperation(value = "inspect检查报告测试地址 ", hidden = true)
|
|
|
|
|
@PostMapping("/inspectTestNoResult/query")
|
|
|
|
|
public JSONObject inspectTestNoResult(@RequestParam("uuid") String uuid,
|
|
|
|
|
@RequestParam("action") String action,
|
|
|
|
|
@RequestParam("accessKey") String accessKey,
|
|
|
|
|
@RequestParam("creationTime") String creationTime,
|
|
|
|
|
@RequestBody Map<String,Object> map){
|
|
|
|
|
System.out.println("请求的参数为 uuid:"+uuid);
|
|
|
|
|
System.out.println("请求的参数为 action:"+action);
|
|
|
|
|
System.out.println("请求的参数为 accessKey:"+accessKey);
|
|
|
|
|
System.out.println("请求的参数为 creationTime:"+creationTime);
|
|
|
|
|
System.out.println("请求的参数为 body:"+map);
|
|
|
|
|
|
|
|
|
|
String result="{\n" +
|
|
|
|
|
@RequestParam("action") String action,
|
|
|
|
|
@RequestParam("accessKey") String accessKey,
|
|
|
|
|
@RequestParam("creationTime") String creationTime,
|
|
|
|
|
@RequestBody Map<String, Object> map) {
|
|
|
|
|
System.out.println("请求的参数为 uuid:" + uuid);
|
|
|
|
|
System.out.println("请求的参数为 action:" + action);
|
|
|
|
|
System.out.println("请求的参数为 accessKey:" + accessKey);
|
|
|
|
|
System.out.println("请求的参数为 creationTime:" + creationTime);
|
|
|
|
|
System.out.println("请求的参数为 body:" + map);
|
|
|
|
|
|
|
|
|
|
String result = "{\n" +
|
|
|
|
|
"\"compcode\": \"INSPECT_REPORTQuery\",\n" +
|
|
|
|
|
"\"compname\": \"检查报告查询服务\",\n" +
|
|
|
|
|
"\"count\": 0,\n" +
|
|
|
|
@ -308,26 +307,25 @@ private NoViewTaskService noViewTaskService;
|
|
|
|
|
"\"ResultCode\": \"0\"\n" +
|
|
|
|
|
"}";
|
|
|
|
|
|
|
|
|
|
return Func.readJson(result,JSONObject.class);
|
|
|
|
|
return Func.readJson(result, JSONObject.class);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "lis检验报告测试地址" ,hidden = true)
|
|
|
|
|
@ApiOperation(value = "lis检验报告测试地址", hidden = true)
|
|
|
|
|
@PostMapping("/lisTest/query")
|
|
|
|
|
public JSONObject lisTest(@RequestParam("uuid") String uuid,
|
|
|
|
|
@RequestParam("action") String action,
|
|
|
|
|
@RequestParam("accessKey") String accessKey,
|
|
|
|
|
@RequestParam("creationTime") String creationTime,
|
|
|
|
|
@RequestBody Map<String,Object> map){
|
|
|
|
|
System.out.println("请求的参数为 uuid:"+uuid);
|
|
|
|
|
System.out.println("请求的参数为 action:"+action);
|
|
|
|
|
System.out.println("请求的参数为 accessKey:"+accessKey);
|
|
|
|
|
System.out.println("请求的参数为 creationTime:"+creationTime);
|
|
|
|
|
System.out.println("请求的参数为 body:"+map);
|
|
|
|
|
|
|
|
|
|
String result="{\n" +
|
|
|
|
|
@RequestParam("action") String action,
|
|
|
|
|
@RequestParam("accessKey") String accessKey,
|
|
|
|
|
@RequestParam("creationTime") String creationTime,
|
|
|
|
|
@RequestBody Map<String, Object> map) {
|
|
|
|
|
System.out.println("请求的参数为 uuid:" + uuid);
|
|
|
|
|
System.out.println("请求的参数为 action:" + action);
|
|
|
|
|
System.out.println("请求的参数为 accessKey:" + accessKey);
|
|
|
|
|
System.out.println("请求的参数为 creationTime:" + creationTime);
|
|
|
|
|
System.out.println("请求的参数为 body:" + map);
|
|
|
|
|
|
|
|
|
|
String result = "{\n" +
|
|
|
|
|
"\"compcode\": \"LIS_REPORTQuery\",\n" +
|
|
|
|
|
"\"compname\": \"检验报告查询服务\",\n" +
|
|
|
|
|
"\"count\": 4,\n" +
|
|
|
|
@ -437,27 +435,25 @@ private NoViewTaskService noViewTaskService;
|
|
|
|
|
"\"ResultCode\": \"0\"\n" +
|
|
|
|
|
"}";
|
|
|
|
|
|
|
|
|
|
return Func.readJson(result,JSONObject.class);
|
|
|
|
|
return Func.readJson(result, JSONObject.class);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "lis检验报告测试地址",hidden = true)
|
|
|
|
|
@ApiOperation(value = "lis检验报告测试地址", hidden = true)
|
|
|
|
|
@PostMapping("/lisTestNoResult/query")
|
|
|
|
|
public JSONObject lisTestNoResult(@RequestParam("uuid") String uuid,
|
|
|
|
|
@RequestParam("action") String action,
|
|
|
|
|
@RequestParam("accessKey") String accessKey,
|
|
|
|
|
@RequestParam("creationTime") String creationTime,
|
|
|
|
|
@RequestBody Map<String,Object> map){
|
|
|
|
|
System.out.println("请求的参数为 uuid:"+uuid);
|
|
|
|
|
System.out.println("请求的参数为 action:"+action);
|
|
|
|
|
System.out.println("请求的参数为 accessKey:"+accessKey);
|
|
|
|
|
System.out.println("请求的参数为 creationTime:"+creationTime);
|
|
|
|
|
System.out.println("请求的参数为 body:"+map);
|
|
|
|
|
|
|
|
|
|
String result="{\n" +
|
|
|
|
|
@RequestParam("action") String action,
|
|
|
|
|
@RequestParam("accessKey") String accessKey,
|
|
|
|
|
@RequestParam("creationTime") String creationTime,
|
|
|
|
|
@RequestBody Map<String, Object> map) {
|
|
|
|
|
System.out.println("请求的参数为 uuid:" + uuid);
|
|
|
|
|
System.out.println("请求的参数为 action:" + action);
|
|
|
|
|
System.out.println("请求的参数为 accessKey:" + accessKey);
|
|
|
|
|
System.out.println("请求的参数为 creationTime:" + creationTime);
|
|
|
|
|
System.out.println("请求的参数为 body:" + map);
|
|
|
|
|
|
|
|
|
|
String result = "{\n" +
|
|
|
|
|
"\"compcode\": \"ObtainInpatientInformation\",\n" +
|
|
|
|
|
"\"compname\": \"获取患者住院信息(移动护理定制)\",\n" +
|
|
|
|
|
"\"count\": 0,\n" +
|
|
|
|
@ -466,7 +462,7 @@ private NoViewTaskService noViewTaskService;
|
|
|
|
|
"\"ResultCode\": \"0\"\n" +
|
|
|
|
|
"}";
|
|
|
|
|
|
|
|
|
|
return Func.readJson(result,JSONObject.class);
|
|
|
|
|
return Func.readJson(result, JSONObject.class);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|