浏览代码

注释掉mq

shiyue 3 年之前
父节点
当前提交
c0812386b8

+ 81 - 81
src/main/java/com/diagbot/aop/MrqcLogAspect.java

@@ -1,81 +1,81 @@
-package com.diagbot.aop;
-
-import com.diagbot.entity.LogInfo;
-import com.diagbot.rabbit.MySender;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.FastJsonUtils;
-import com.diagbot.util.MrqcLogUtil;
-import com.diagbot.vo.data.ABasDoctorInfoVO;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Date;
-
-@Aspect
-@Component
-@ConditionalOnProperty(prefix = "mrqcLog", value = { "enable" }, havingValue = "true")
-@Slf4j
-public class MrqcLogAspect {
-
-    @Autowired
-    MySender mySender;
-
-    //切所有Controller
-    @Pointcut("execution(* com.diagbot.web..*.*(..)) && @annotation(com.diagbot.annotation.MrqcLog)")
-    public void pointcutController() {
-    }
-
-    @Around("pointcutController()")
-    public Object mrqcLogIntercept(ProceedingJoinPoint joinPoint) throws Throwable {
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        Method method = signature.getMethod();
-        //获取方法参数
-        Object[] args = joinPoint.getArgs();
-        //请求的参数
-        LogInfo tanLog = MrqcLogUtil.tranLogReqAspect(joinPoint);
-        //tanLog.setBehospitalCode();
-        //tanLog.setHospitalId();
-        tanLog.setFuncName(method.getName());
-        tanLog.setReqParam(FastJsonUtils.getBeanToJson(args));
-        Date now = DateUtil.now();
-        tanLog.setGmtReq(now);
-        long start = System.currentTimeMillis();
-        tanLog.setGmtReq(DateUtil.now());
-
-        Object proceed = joinPoint.proceed(args);
-        //执行方法后获取出参
-        tanLog = MrqcLogUtil.tranLogRespAspect(proceed, tanLog, start, joinPoint);
-
-        //异步记录日志
-        mySender.outputMrqcLogSend(tanLog);
-        return proceed;
-    }
-
-    @AfterThrowing(pointcut = "pointcutController()", throwing = "ex")
-    public void mrqcLogInterceptThrow(JoinPoint joinPoint, Throwable ex) {
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        Method method = signature.getMethod();
-        LogInfo tanLog = new LogInfo();
-        Date now = DateUtil.now();
-        /*tanLog.setGmtCreate(now);
-        tanLog.setGmtModified(now);
-        tanLog.setSceneName(method.getAnnotation(CdssLog.class).value());*/
-        long start = System.currentTimeMillis();
-        tanLog.setGmtReq(DateUtil.now());
-        tanLog = MrqcLogUtil.tranLogRespAspectThrow(joinPoint, tanLog, start, ex);
-
-        //保存日志
-        mySender.outputMrqcLogSend(tanLog);
-    }
-}
+//package com.diagbot.aop;
+//
+//import com.diagbot.entity.LogInfo;
+//import com.diagbot.rabbit.MySender;
+//import com.diagbot.util.DateUtil;
+//import com.diagbot.util.FastJsonUtils;
+//import com.diagbot.util.MrqcLogUtil;
+//import com.diagbot.vo.data.ABasDoctorInfoVO;
+//import lombok.extern.slf4j.Slf4j;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.ProceedingJoinPoint;
+//import org.aspectj.lang.annotation.AfterThrowing;
+//import org.aspectj.lang.annotation.Around;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.aspectj.lang.reflect.MethodSignature;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.stereotype.Component;
+//
+//import java.lang.reflect.Method;
+//import java.util.ArrayList;
+//import java.util.Date;
+//
+//@Aspect
+//@Component
+//@ConditionalOnProperty(prefix = "mrqcLog", value = { "enable" }, havingValue = "true")
+//@Slf4j
+//public class MrqcLogAspect {
+//
+//    @Autowired
+//    MySender mySender;
+//
+//    //切所有Controller
+//    @Pointcut("execution(* com.diagbot.web..*.*(..)) && @annotation(com.diagbot.annotation.MrqcLog)")
+//    public void pointcutController() {
+//    }
+//
+//    @Around("pointcutController()")
+//    public Object mrqcLogIntercept(ProceedingJoinPoint joinPoint) throws Throwable {
+//        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+//        Method method = signature.getMethod();
+//        //获取方法参数
+//        Object[] args = joinPoint.getArgs();
+//        //请求的参数
+//        LogInfo tanLog = MrqcLogUtil.tranLogReqAspect(joinPoint);
+//        //tanLog.setBehospitalCode();
+//        //tanLog.setHospitalId();
+//        tanLog.setFuncName(method.getName());
+//        tanLog.setReqParam(FastJsonUtils.getBeanToJson(args));
+//        Date now = DateUtil.now();
+//        tanLog.setGmtReq(now);
+//        long start = System.currentTimeMillis();
+//        tanLog.setGmtReq(DateUtil.now());
+//
+//        Object proceed = joinPoint.proceed(args);
+//        //执行方法后获取出参
+//        tanLog = MrqcLogUtil.tranLogRespAspect(proceed, tanLog, start, joinPoint);
+//
+//        //异步记录日志
+//        mySender.outputMrqcLogSend(tanLog);
+//        return proceed;
+//    }
+//
+//    @AfterThrowing(pointcut = "pointcutController()", throwing = "ex")
+//    public void mrqcLogInterceptThrow(JoinPoint joinPoint, Throwable ex) {
+//        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+//        Method method = signature.getMethod();
+//        LogInfo tanLog = new LogInfo();
+//        Date now = DateUtil.now();
+//        /*tanLog.setGmtCreate(now);
+//        tanLog.setGmtModified(now);
+//        tanLog.setSceneName(method.getAnnotation(CdssLog.class).value());*/
+//        long start = System.currentTimeMillis();
+//        tanLog.setGmtReq(DateUtil.now());
+//        tanLog = MrqcLogUtil.tranLogRespAspectThrow(joinPoint, tanLog, start, ex);
+//
+//        //保存日志
+//        mySender.outputMrqcLogSend(tanLog);
+//    }
+//}

+ 1 - 1
src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -200,7 +200,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/hisDataDeal").permitAll()
                 .antMatchers("/qc/data/sendDateOld").permitAll()
                 .antMatchers("/qc/data/sendDataOld").permitAll()
-                .antMatchers("/qc/data/sendOldData").permitAll()
+                .antMatchers("/qc/data/sendData").permitAll()
                 .antMatchers("/qc/data/sendDataOldOne").permitAll()
                 .antMatchers("/qc/data_str/sendAdmissionNote").permitAll()
                 .antMatchers("/qc/data_str/sendBloodResult").permitAll()

+ 29 - 29
src/main/java/com/diagbot/rabbit/MyReceiver.java

@@ -1,29 +1,29 @@
-package com.diagbot.rabbit;
-
-import com.diagbot.entity.LogInfo;
-import com.diagbot.facade.data.LogInfoFacade;
-import com.diagbot.util.FastJsonUtils;
-import com.diagbot.util.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.StreamListener;
-
-/**
- * @Description: 消费者
- * @author: wangfeng
- * @time: 2018/8/29 14:02
- */
-@EnableBinding({ MyProcessor.class })
-public class MyReceiver {
-
-    @Autowired
-    private LogInfoFacade logInfoFacade;
-
-    @StreamListener(MyProcessor.INPUT_MrqcLog)
-    public void inputMrqcLog(String message) {
-        //System.out.println("Received <" + "接受到的信息" + ">" + message);
-        if (StringUtil.isNotBlank(message)) {
-            logInfoFacade.save(FastJsonUtils.getJsonToBean(message, LogInfo.class));
-        }
-    }
-}
+//package com.diagbot.rabbit;
+//
+//import com.diagbot.entity.LogInfo;
+//import com.diagbot.facade.data.LogInfoFacade;
+//import com.diagbot.util.FastJsonUtils;
+//import com.diagbot.util.StringUtil;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.cloud.stream.annotation.EnableBinding;
+//import org.springframework.cloud.stream.annotation.StreamListener;
+//
+///**
+// * @Description: 消费者
+// * @author: wangfeng
+// * @time: 2018/8/29 14:02
+// */
+////@EnableBinding({ MyProcessor.class })
+//public class MyReceiver {
+//
+//    @Autowired
+//    private LogInfoFacade logInfoFacade;
+//
+//    @StreamListener(MyProcessor.INPUT_MrqcLog)
+//    public void inputMrqcLog(String message) {
+//        //System.out.println("Received <" + "接受到的信息" + ">" + message);
+//        if (StringUtil.isNotBlank(message)) {
+//            logInfoFacade.save(FastJsonUtils.getJsonToBean(message, LogInfo.class));
+//        }
+//    }
+//}

+ 28 - 28
src/main/java/com/diagbot/rabbit/MySender.java

@@ -1,28 +1,28 @@
-package com.diagbot.rabbit;
-
-import com.diagbot.entity.LogInfo;
-import com.diagbot.util.FastJsonUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.integration.support.MessageBuilder;
-import org.springframework.messaging.MessageChannel;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 发布者
- * @author: gaodm
- * @time: 2018/8/29 13:41
- */
-@Component
-@EnableBinding({ MyProcessor.class })
-public class MySender {
-
-    @Autowired
-    @Qualifier("outputMrqcLog")
-    MessageChannel outputMrqcLog;
-
-    public void outputMrqcLogSend(LogInfo msg) {
-        outputMrqcLog.send(MessageBuilder.withPayload(FastJsonUtils.getBeanToJson(msg)).build());
-    }
-}
+//package com.diagbot.rabbit;
+//
+//import com.diagbot.entity.LogInfo;
+//import com.diagbot.util.FastJsonUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.cloud.stream.annotation.EnableBinding;
+//import org.springframework.integration.support.MessageBuilder;
+//import org.springframework.messaging.MessageChannel;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * @Description: 发布者
+// * @author: gaodm
+// * @time: 2018/8/29 13:41
+// */
+//@Component
+//@EnableBinding({ MyProcessor.class })
+//public class MySender {
+//
+//    @Autowired
+//    @Qualifier("outputMrqcLog")
+//    MessageChannel outputMrqcLog;
+//
+//    public void outputMrqcLogSend(LogInfo msg) {
+//        outputMrqcLog.send(MessageBuilder.withPayload(FastJsonUtils.getBeanToJson(msg)).build());
+//    }
+//}

+ 24 - 24
src/main/java/com/diagbot/web/DataController.java

@@ -66,7 +66,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
     @PostMapping("/sendDoctorInfos")
     @SysLogger("sendDoctorInfos")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list) {
         return aBasDoctorInfoFacade.executeDoctor(list);
     }
@@ -74,7 +74,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-获取医院所有有效科室的基本信息")
     @PostMapping("/sendDeptInfos")
     @SysLogger("sendDeptInfos")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<ABasDeptInfoDTO>> sendDeptInfos(@RequestBody List<ABasDeptInfoVO> list) {
         return aBasDeptInfoFacade.executeDept(list);
     }
@@ -82,7 +82,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-获取医院所有文书模板基本信息")
     @PostMapping("/sendRecordTypes")
     @SysLogger("sendRecordTypes")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AMedicalRecordTypeDTO>> sendRecordTypes(@RequestBody List<AMedicalRecordTypeVO> list) {
         return aMedRecordTypeFacade.executeMRType(list);
     }
@@ -90,7 +90,7 @@ public class DataController {
     @ApiOperation(value = "运行质控-评分-文书信息")
     @PostMapping("/sendMrRecordIng")
     @SysLogger("sendMrRecordIng")
-    @MrqcLog
+//    @MrqcLog
     public Map<String, String> sendMrRecordIng(@Valid @RequestBody AMrContentVO aMrContentVO) {
         return aMedicalRecordFacade.executeMrRecordIng(aMrContentVO);
     }
@@ -99,7 +99,7 @@ public class DataController {
     @ApiOperation(value = "终末质控-文书信息")
     @PostMapping("/sendMrRecord")
     @SysLogger("sendMrRecord")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AMedicalRecordDTO>> sendMrRecord(@RequestBody List<AMedicalRecordVO> list) {
         return aMedicalRecordFacade.executeMrRecord(list);
     }
@@ -107,7 +107,7 @@ public class DataController {
     @ApiOperation(value = "终末质控-文书详情")
     @PostMapping("/sendMrContent")
     @SysLogger("sendMrContent")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AMedicalRecordContentDTO>> sendMrContent(@RequestBody List<AMedicalRecordContentVO> list) {
         return aMedicalRecordContentFacade.executeMrRecordContent(list);
     }
@@ -115,7 +115,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-获取医院病人住院记录信息")
     @PostMapping("/sendPatientInfo")
     @SysLogger("sendPatientInfo")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<ABehospitalInfoDTO>> sendPatientInfo(@RequestBody List<ABehospitalInfoVO> list) {
         return aBehospitalInfoFacade.executeBehospital(list);
     }
@@ -123,7 +123,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-获取病人出院信息")
     @PostMapping("/sendLeaveInfo")
     @SysLogger("sendLeaveInfo")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO sendLeaveInfo(@RequestBody ABehospitalInfoVO aBehospitalInfoVO){
         return aBehospitalInfoFacade.sendLeaveInfo(aBehospitalInfoVO);
     }
@@ -131,7 +131,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-获取医院医生医嘱信息")
     @PostMapping(value = "/sendDoctorAdvice")
     @SysLogger("sendDoctorAdvice")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<ADoctorAdviceDTO>> sendDoctorAdvice(@RequestBody List<ADoctorAdviceVO> list) {
         return aDoctorAdviceFacade.executeDoctorAdvice(list);
     }
@@ -146,7 +146,7 @@ public class DataController {
     @ApiOperation(value = "运行质控-获取病案首页")
     @PostMapping("/sendHomePageIng")
     @SysLogger("sendHomePageIng")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<Map<String, Object>> sendHomePageIng(@Valid @RequestBody XyHomePageVo xyHomePageVo) {
         return viewFacade.getHomePageByView(xyHomePageVo);
     }
@@ -154,7 +154,7 @@ public class DataController {
     @ApiOperation(value = "终末质控-获取病案首页")
     @PostMapping("/sendHomePage")
     @SysLogger("sendHomePage")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AHomePageDTO>> sendHomePage(@RequestBody List<AHomePageVO> list) {
         return aHomePageFacade.executeHomePage(list);
     }
@@ -162,7 +162,7 @@ public class DataController {
     @ApiOperation(value = "终末质控-获取病案首页诊断")
     @PostMapping("/sendHomeDiagnose")
     @SysLogger("sendHomeDiagnose")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AHomeDiagnoseDTO>> sendHomeDiagnose(@RequestBody List<AHomeDiagnoseVO> list) {
         return aHomeDiagnoseInfoFacade.executeHomeDiagnose(list);
     }
@@ -170,7 +170,7 @@ public class DataController {
     @ApiOperation(value = "终末质控-获取病案首页手术")
     @PostMapping("/sendHomeOperation")
     @SysLogger("sendHomeOperation")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AHomeOperationDTO>> sendHomeOperation(@RequestBody List<AHomeOperationVO> list) {
         return RespDTO.onSuc(aHomeOperationInfoFacade.executeHomeOperation(list));
     }
@@ -178,7 +178,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-获取危急值")
     @PostMapping("/sendCrisis")
     @SysLogger("sendCrisis")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AMedCrisisDTO>> sendCrisis(@RequestBody List<AMedCrisisVO> list) {
         return aMedCrisisFacade.executeMedCrisis(list);
     }
@@ -186,7 +186,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-删除标识")
     @PostMapping("/deleteFlag")
     @SysLogger("deleteFlag")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO deleteFlag(@RequestBody ADeleteFlagVO aDeleteFlagVO) {
         if ("brzyxx".equals(aDeleteFlagVO.getModeType())) {
             return aBehospitalInfoFacade.deleteFlag(aDeleteFlagVO);
@@ -213,7 +213,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-归档标识")
     @PostMapping("/placeFile")
     @SysLogger("placeFile")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO placeFileFlag(@RequestBody APlaceFileVO aPlaceFileVO) {
         return aBehospitalInfoFacade.placeFileFlag(aPlaceFileVO);
     }
@@ -221,7 +221,7 @@ public class DataController {
     @ApiOperation(value = "检查结果")
     @PostMapping("/sendPacsResults")
     @SysLogger("sendPacsResults")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AMedPacsResultVO>> sendPacsResults(@RequestBody List<AMedPacsResultVO> list) {
         return aMedPacsResultFacade.executeMedPacsResult(list);
     }
@@ -229,7 +229,7 @@ public class DataController {
     @ApiOperation(value = "化验结果")
     @PostMapping("/sendLisResults")
     @SysLogger("sendLisResults")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AMedLisResultVO>> sendLisResults(@RequestBody List<AMedLisResultVO> list) {
         return aMedLisResultFacade.executeMedLisResult(list);
     }
@@ -237,7 +237,7 @@ public class DataController {
     @ApiOperation(value = "检查信息")
     @PostMapping("/sendPacsInfos")
     @SysLogger("sendPacsInfos")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO sendPacsInfos(@RequestBody List<AMedPacsInfoVO> list) {
         return aMedPacsInfoFacade.dealData(list);
     }
@@ -253,7 +253,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-历史数据结构化处理")
     @PostMapping("/hisDataDeal")
     @SysLogger("hisDataDeal")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO<List<AMedCrisisDTO>> hisDataDeal(@RequestBody HisDataDealVO hisDataDealVO) {
         boolean b = true;
         try {
@@ -279,8 +279,8 @@ public class DataController {
     }
 
     @ApiOperation(value = "数据引擎-历史数据拉取(出院时间)")
-    @PostMapping("/sendDateOld")
-    @SysLogger("sendDateOld")
+    @PostMapping("/sendData")
+    @SysLogger("sendData")
     public void sendDateOld(String startDate,String stopDate){
         viewFacade.executeData(startDate,stopDate);
     }
@@ -332,7 +332,7 @@ public class DataController {
     @ApiOperation(value = "his数据补录")
     @PostMapping("/dataSupplement")
     @SysLogger("dataSupplement")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO dataSupplement(@RequestBody List<ABehospitalInfoVO> list) {
         RespDTO respDTO = null;
         try {
@@ -348,7 +348,7 @@ public class DataController {
     @ApiOperation(value = "his历史数据批量导入")
     @PostMapping("/getPatientRecord")
     @SysLogger("getPatientRecord")
-    @MrqcLog
+//    @MrqcLog
     public RespDTO getPatientRecord(@RequestBody HisDataImportVO hisDataImportVO){
         try {
             hisBehospitalInfoFacade.getPatientRecord(hisDataImportVO);

+ 282 - 282
src/main/java/com/diagbot/web/DataStrController.java

@@ -1,282 +1,282 @@
-package com.diagbot.web;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.str.*;
-import com.diagbot.vo.str.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-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 java.util.List;
-
-@RestController
-@RequestMapping("/qc/data_str")
-@Api(value = "对接接口API-结构化", tags = { "对接接口API-结构化" })
-public class DataStrController {
-
-    @Autowired
-    private BStrAdmissionNoteFacade bStrAdmissionNoteFacade;
-
-    @Autowired
-    private BStrBloodResultFacade bStrBloodResultFacade;
-
-    @Autowired
-    private BStrBloodTransfusionFacade bStrBloodTransfusionFacade;
-
-    @Autowired
-    private BStrConsultationApplyFacade bStrConsultationApplyFacade;
-
-    @Autowired
-    private BStrCrisisNoteFacade bStrCrisisNoteFacade;
-
-    @Autowired
-    private BStrConsultationRecordFacade bStrConsultationRecordFacade;
-
-    @Autowired
-    private BStrConsultationResultFacade bStrConsultationResultFacade;
-
-    @Autowired
-    private BStrConsultationNoteFacade bStrConsultationNoteFacade;
-
-    @Autowired
-    private BStrFirstRecordFacade bStrFirstRecordFacade;
-
-    @Autowired
-    private BStrDifficultCaseFacade bStrDifficultCaseFacade;
-
-    @Autowired
-    private BStrDeathDiscussionFacade bStrDeathDiscussionFacade;
-
-    @Autowired
-    private BStrDeathNoteFacade bStrDeathNoteFacade;
-
-    @Autowired
-    private BStrOperativeFirstRecordFacade bStrOperativeFirstRecordFacade;
-
-    @Autowired
-    private BStrLeaveHospitalFacade bStrLeaveHospitalFacade;
-
-    @Autowired
-    private BStrIllCriticallyFacade bStrIllCriticallyFacade;
-
-    @Autowired
-    private BStrIllSeriouslFacade bStrIllSeriouslFacade;
-
-    @Autowired
-    private BStrPreoperativeDiscussionFacade bStrPreoperativeDiscussionFacade;
-
-    @Autowired
-    private BStrPeriodConclusionFacade bStrPeriodConclusionFacade;
-
-    @Autowired
-    private BStrRescueNoteFacade bStrRescueNoteFacade;
-
-    @Autowired
-    private BStrTransferInNoteFacade bStrTransferInNoteFacade;
-
-    @Autowired
-    private BStrTransferOutNoteFacade bStrTransferOutNoteFacade;
-
-    @Autowired
-    private BStrWardRecordFacade bStrWardRecordFacade;
-
-    @Autowired
-    private BStrOperativeNoteFacade bStrOperativeNoteFacade;
-
-    @Autowired
-    private BStrTalkInformFacade bStrTalkInformFacade;
-
-    @Autowired
-    private BStrInformedConsentFacade bStrInformedConsentFacade;
-
-    @Autowired
-    private BStrContentFacade bStrContentFacade;
-
-    @ApiOperation(value = "文书内容")
-    @PostMapping("/sendContent")
-    @SysLogger("sendContent")
-    public RespDTO sendContent(@RequestBody StrContentVO strContentVO){
-        return bStrContentFacade.execDealData(strContentVO);
-    }
-
-    @ApiOperation(value = "入院记录")
-    @PostMapping("/sendAdmissionNote")
-    @SysLogger("sendAdmissionNote")
-    public RespDTO sendAdmissionNote(@RequestBody List<StrAdmissionNoteVO> list){
-        return bStrAdmissionNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "输血后效果评价")
-    @PostMapping("/sendBloodResult")
-    @SysLogger("sendBloodResult")
-    public RespDTO sendBloodResult(@RequestBody List<StrBloodResultVO> list){
-        return bStrBloodResultFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "输血/血制品病程记录")
-    @PostMapping("/sendBloodTransfusion")
-    @SysLogger("sendBloodTransfusion")
-    public RespDTO sendBloodTransfusion(@RequestBody List<StrBloodTransfusionVO> list){
-        return bStrBloodTransfusionFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "会诊申请单")
-    @PostMapping("/sendConsultationApply")
-    @SysLogger("sendConsultationApply")
-    public RespDTO sendConsultationApply(@RequestBody List<StrConsultationApplyVO> list){
-        return bStrConsultationApplyFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "会诊单(申请和结果)")
-    @PostMapping("/sendConsultationNote")
-    @SysLogger("sendConsultationNote")
-    public RespDTO sendConsultationNote(@RequestBody List<StrConsultationNoteVO> list){
-        return bStrConsultationNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "会诊记录")
-    @PostMapping("/sendConsultationRecord")
-    @SysLogger("sendConsultationRecord")
-    public RespDTO sendConsultationRecord(@RequestBody List<StrConsultationRecordVO> list){
-        return bStrConsultationRecordFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "会诊结果单")
-    @PostMapping("/sendConsultationResult")
-    @SysLogger("sendConsultationResult")
-    public RespDTO sendConsultationResult(@RequestBody List<StrConsultationResultVO> list){
-        return bStrConsultationResultFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "危急值记录")
-    @PostMapping("/sendCrisisNote")
-    @SysLogger("sendCrisisNote")
-    public RespDTO sendCrisisNote(@RequestBody List<StrCrisisNoteVO> list){
-        return bStrCrisisNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "死亡病例讨论记录")
-    @PostMapping("/sendDeathDiscussion")
-    @SysLogger("sendDeathDiscussion")
-    public RespDTO sendDeathDiscussion(@RequestBody List<StrDeathDiscussionVO> list){
-        return bStrDeathDiscussionFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "死亡记录")
-    @PostMapping("/sendDeathNote")
-    @SysLogger("sendDeathNote")
-    public RespDTO sendDeathNote(@RequestBody List<StrDeathNoteVO> list){
-        return bStrDeathNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "疑难病例讨论记录")
-    @PostMapping("/sendDifficultCase")
-    @SysLogger("sendDifficultCase")
-    public RespDTO sendDifficultCase(@RequestBody List<StrDifficultCaseVO> list){
-        return bStrDifficultCaseFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "首次病程录")
-    @PostMapping("/sendFirstRecord")
-    @SysLogger("sendFirstRecord")
-    public RespDTO sendFirstRecord(@RequestBody List<StrFirstRecordVO> list){
-        return bStrFirstRecordFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "病危通知单")
-    @PostMapping("/sendIllCritically")
-    @SysLogger("sendIllCritically")
-    public RespDTO sendIllCritically(@RequestBody List<StrIllCriticallyVO> list){
-        return bStrIllCriticallyFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "病重通知单")
-    @PostMapping("/sendIllSeriousl")
-    @SysLogger("sendIllSeriousl")
-    public RespDTO sendIllSeriousl(@RequestBody List<StrIllSeriouslVO> list){
-        return bStrIllSeriouslFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "出院小结")
-    @PostMapping("/sendLeaveHospital")
-    @SysLogger("sendLeaveHospital")
-    public RespDTO sendLeaveHospital(@RequestBody List<StrLeaveHospitalVO> list){
-        return bStrLeaveHospitalFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "术后首程")
-    @PostMapping("/sendOperativeFirstRecord")
-    @SysLogger("sendOperativeFirstRecord")
-    public RespDTO sendOperativeFirstRecord(@RequestBody List<StrOperativeFirstRecordVO> list){
-        return bStrOperativeFirstRecordFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "手术记录")
-    @PostMapping("/sendOperativeNote")
-    @SysLogger("sendOperativeNote")
-    public RespDTO sendOperativeNote(@RequestBody List<StrOperativeNoteVO> list){
-        return bStrOperativeNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "查房记录")
-    @PostMapping("/sendWardRecord")
-    @SysLogger("sendWardRecord")
-    public RespDTO sendWardRecord(@RequestBody List<StrWardRecordVO> list){
-        return bStrWardRecordFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "转出记录")
-    @PostMapping("/sendTransferOutNote")
-    @SysLogger("sendTransferOutNote")
-    public RespDTO sendTransferOutNote(@RequestBody List<StrTransferOutNoteVO> list){
-        return bStrTransferOutNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "转入记录")
-    @PostMapping("/sendTransferInNote")
-    @SysLogger("sendTransferInNote")
-    public RespDTO sendTransferInNote(@RequestBody List<StrTransferInNoteVO> list){
-        return bStrTransferInNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "抢救记录")
-    @PostMapping("/sendRescueNote")
-    @SysLogger("sendRescueNote")
-    public RespDTO sendRescueNote(@RequestBody List<StrRescueNoteVO> list){
-        return bStrRescueNoteFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "阶段小结")
-    @PostMapping("/sendPeriodConclusion")
-    @SysLogger("sendPeriodConclusion")
-    public RespDTO sendPeriodConclusion(@RequestBody List<StrPeriodConclusionVO> list){
-        return bStrPeriodConclusionFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "术前讨论小结")
-    @PostMapping("/sendPreoperativeDiscussion")
-    @SysLogger("sendPreoperativeDiscussion")
-    public RespDTO sendPreoperativeDiscussion(@RequestBody List<StrPreoperativeDiscussionVO> list){
-        return bStrPreoperativeDiscussionFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "告知书记录")
-    @PostMapping("/sendTalkInform")
-    @SysLogger("sendTalkInform")
-    public RespDTO sendTalkInform(@RequestBody List<StrTalkInformVO> list){
-        return bStrTalkInformFacade.execDealData(list);
-    }
-
-    @ApiOperation(value = "知情同意书")
-    @PostMapping("/sendInformedConsent")
-    @SysLogger("sendInformedConsent")
-    public RespDTO sendInformedConsent(@RequestBody List<StrInformedConsentVO> list){
-        return bStrInformedConsentFacade.execDealData(list);
-    }
-
-}
+//package com.diagbot.web;
+//
+//import com.diagbot.annotation.SysLogger;
+//import com.diagbot.dto.RespDTO;
+//import com.diagbot.facade.str.*;
+//import com.diagbot.vo.str.*;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//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 java.util.List;
+//
+//@RestController
+//@RequestMapping("/qc/data_str")
+//@Api(value = "对接接口API-结构化", tags = { "对接接口API-结构化" })
+//public class DataStrController {
+//
+//    @Autowired
+//    private BStrAdmissionNoteFacade bStrAdmissionNoteFacade;
+//
+//    @Autowired
+//    private BStrBloodResultFacade bStrBloodResultFacade;
+//
+//    @Autowired
+//    private BStrBloodTransfusionFacade bStrBloodTransfusionFacade;
+//
+//    @Autowired
+//    private BStrConsultationApplyFacade bStrConsultationApplyFacade;
+//
+//    @Autowired
+//    private BStrCrisisNoteFacade bStrCrisisNoteFacade;
+//
+//    @Autowired
+//    private BStrConsultationRecordFacade bStrConsultationRecordFacade;
+//
+//    @Autowired
+//    private BStrConsultationResultFacade bStrConsultationResultFacade;
+//
+//    @Autowired
+//    private BStrConsultationNoteFacade bStrConsultationNoteFacade;
+//
+//    @Autowired
+//    private BStrFirstRecordFacade bStrFirstRecordFacade;
+//
+//    @Autowired
+//    private BStrDifficultCaseFacade bStrDifficultCaseFacade;
+//
+//    @Autowired
+//    private BStrDeathDiscussionFacade bStrDeathDiscussionFacade;
+//
+//    @Autowired
+//    private BStrDeathNoteFacade bStrDeathNoteFacade;
+//
+//    @Autowired
+//    private BStrOperativeFirstRecordFacade bStrOperativeFirstRecordFacade;
+//
+//    @Autowired
+//    private BStrLeaveHospitalFacade bStrLeaveHospitalFacade;
+//
+//    @Autowired
+//    private BStrIllCriticallyFacade bStrIllCriticallyFacade;
+//
+//    @Autowired
+//    private BStrIllSeriouslFacade bStrIllSeriouslFacade;
+//
+//    @Autowired
+//    private BStrPreoperativeDiscussionFacade bStrPreoperativeDiscussionFacade;
+//
+//    @Autowired
+//    private BStrPeriodConclusionFacade bStrPeriodConclusionFacade;
+//
+//    @Autowired
+//    private BStrRescueNoteFacade bStrRescueNoteFacade;
+//
+//    @Autowired
+//    private BStrTransferInNoteFacade bStrTransferInNoteFacade;
+//
+//    @Autowired
+//    private BStrTransferOutNoteFacade bStrTransferOutNoteFacade;
+//
+//    @Autowired
+//    private BStrWardRecordFacade bStrWardRecordFacade;
+//
+//    @Autowired
+//    private BStrOperativeNoteFacade bStrOperativeNoteFacade;
+//
+//    @Autowired
+//    private BStrTalkInformFacade bStrTalkInformFacade;
+//
+//    @Autowired
+//    private BStrInformedConsentFacade bStrInformedConsentFacade;
+//
+//    @Autowired
+//    private BStrContentFacade bStrContentFacade;
+//
+//    @ApiOperation(value = "文书内容")
+//    @PostMapping("/sendContent")
+//    @SysLogger("sendContent")
+//    public RespDTO sendContent(@RequestBody StrContentVO strContentVO){
+//        return bStrContentFacade.execDealData(strContentVO);
+//    }
+//
+//    @ApiOperation(value = "入院记录")
+//    @PostMapping("/sendAdmissionNote")
+//    @SysLogger("sendAdmissionNote")
+//    public RespDTO sendAdmissionNote(@RequestBody List<StrAdmissionNoteVO> list){
+//        return bStrAdmissionNoteFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "输血后效果评价")
+//    @PostMapping("/sendBloodResult")
+//    @SysLogger("sendBloodResult")
+//    public RespDTO sendBloodResult(@RequestBody List<StrBloodResultVO> list){
+//        return bStrBloodResultFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "输血/血制品病程记录")
+//    @PostMapping("/sendBloodTransfusion")
+//    @SysLogger("sendBloodTransfusion")
+//    public RespDTO sendBloodTransfusion(@RequestBody List<StrBloodTransfusionVO> list){
+//        return bStrBloodTransfusionFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "会诊申请单")
+//    @PostMapping("/sendConsultationApply")
+//    @SysLogger("sendConsultationApply")
+//    public RespDTO sendConsultationApply(@RequestBody List<StrConsultationApplyVO> list){
+//        return bStrConsultationApplyFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "会诊单(申请和结果)")
+//    @PostMapping("/sendConsultationNote")
+//    @SysLogger("sendConsultationNote")
+//    public RespDTO sendConsultationNote(@RequestBody List<StrConsultationNoteVO> list){
+//        return bStrConsultationNoteFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "会诊记录")
+//    @PostMapping("/sendConsultationRecord")
+//    @SysLogger("sendConsultationRecord")
+//    public RespDTO sendConsultationRecord(@RequestBody List<StrConsultationRecordVO> list){
+//        return bStrConsultationRecordFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "会诊结果单")
+//    @PostMapping("/sendConsultationResult")
+//    @SysLogger("sendConsultationResult")
+//    public RespDTO sendConsultationResult(@RequestBody List<StrConsultationResultVO> list){
+//        return bStrConsultationResultFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "危急值记录")
+//    @PostMapping("/sendCrisisNote")
+//    @SysLogger("sendCrisisNote")
+//    public RespDTO sendCrisisNote(@RequestBody List<StrCrisisNoteVO> list){
+//        return bStrCrisisNoteFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "死亡病例讨论记录")
+//    @PostMapping("/sendDeathDiscussion")
+//    @SysLogger("sendDeathDiscussion")
+//    public RespDTO sendDeathDiscussion(@RequestBody List<StrDeathDiscussionVO> list){
+//        return bStrDeathDiscussionFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "死亡记录")
+//    @PostMapping("/sendDeathNote")
+//    @SysLogger("sendDeathNote")
+//    public RespDTO sendDeathNote(@RequestBody List<StrDeathNoteVO> list){
+//        return bStrDeathNoteFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "疑难病例讨论记录")
+//    @PostMapping("/sendDifficultCase")
+//    @SysLogger("sendDifficultCase")
+//    public RespDTO sendDifficultCase(@RequestBody List<StrDifficultCaseVO> list){
+//        return bStrDifficultCaseFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "首次病程录")
+//    @PostMapping("/sendFirstRecord")
+//    @SysLogger("sendFirstRecord")
+//    public RespDTO sendFirstRecord(@RequestBody List<StrFirstRecordVO> list){
+//        return bStrFirstRecordFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "病危通知单")
+//    @PostMapping("/sendIllCritically")
+//    @SysLogger("sendIllCritically")
+//    public RespDTO sendIllCritically(@RequestBody List<StrIllCriticallyVO> list){
+//        return bStrIllCriticallyFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "病重通知单")
+//    @PostMapping("/sendIllSeriousl")
+//    @SysLogger("sendIllSeriousl")
+//    public RespDTO sendIllSeriousl(@RequestBody List<StrIllSeriouslVO> list){
+//        return bStrIllSeriouslFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "出院小结")
+//    @PostMapping("/sendLeaveHospital")
+//    @SysLogger("sendLeaveHospital")
+//    public RespDTO sendLeaveHospital(@RequestBody List<StrLeaveHospitalVO> list){
+//        return bStrLeaveHospitalFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "术后首程")
+//    @PostMapping("/sendOperativeFirstRecord")
+//    @SysLogger("sendOperativeFirstRecord")
+//    public RespDTO sendOperativeFirstRecord(@RequestBody List<StrOperativeFirstRecordVO> list){
+//        return bStrOperativeFirstRecordFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "手术记录")
+//    @PostMapping("/sendOperativeNote")
+//    @SysLogger("sendOperativeNote")
+//    public RespDTO sendOperativeNote(@RequestBody List<StrOperativeNoteVO> list){
+//        return bStrOperativeNoteFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "查房记录")
+//    @PostMapping("/sendWardRecord")
+//    @SysLogger("sendWardRecord")
+//    public RespDTO sendWardRecord(@RequestBody List<StrWardRecordVO> list){
+//        return bStrWardRecordFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "转出记录")
+//    @PostMapping("/sendTransferOutNote")
+//    @SysLogger("sendTransferOutNote")
+//    public RespDTO sendTransferOutNote(@RequestBody List<StrTransferOutNoteVO> list){
+//        return bStrTransferOutNoteFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "转入记录")
+//    @PostMapping("/sendTransferInNote")
+//    @SysLogger("sendTransferInNote")
+//    public RespDTO sendTransferInNote(@RequestBody List<StrTransferInNoteVO> list){
+//        return bStrTransferInNoteFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "抢救记录")
+//    @PostMapping("/sendRescueNote")
+//    @SysLogger("sendRescueNote")
+//    public RespDTO sendRescueNote(@RequestBody List<StrRescueNoteVO> list){
+//        return bStrRescueNoteFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "阶段小结")
+//    @PostMapping("/sendPeriodConclusion")
+//    @SysLogger("sendPeriodConclusion")
+//    public RespDTO sendPeriodConclusion(@RequestBody List<StrPeriodConclusionVO> list){
+//        return bStrPeriodConclusionFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "术前讨论小结")
+//    @PostMapping("/sendPreoperativeDiscussion")
+//    @SysLogger("sendPreoperativeDiscussion")
+//    public RespDTO sendPreoperativeDiscussion(@RequestBody List<StrPreoperativeDiscussionVO> list){
+//        return bStrPreoperativeDiscussionFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "告知书记录")
+//    @PostMapping("/sendTalkInform")
+//    @SysLogger("sendTalkInform")
+//    public RespDTO sendTalkInform(@RequestBody List<StrTalkInformVO> list){
+//        return bStrTalkInformFacade.execDealData(list);
+//    }
+//
+//    @ApiOperation(value = "知情同意书")
+//    @PostMapping("/sendInformedConsent")
+//    @SysLogger("sendInformedConsent")
+//    public RespDTO sendInformedConsent(@RequestBody List<StrInformedConsentVO> list){
+//        return bStrInformedConsentFacade.execDealData(list);
+//    }
+//
+//}

+ 18 - 18
src/main/resources/application-local.yml

@@ -108,23 +108,23 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
 
-  cloud:
-    stream:
-      bindings:
-        outputMrqcLog:
-          destination: mrqcLog
-        inputMrqcLog:
-          destination: mrqcLog
-          group: mrqcLogReceiveGroup
-
-
-  rabbitmq:
-    host: 132.147.253.31
-    port: 5672
-    username: lantone
-    password: lantone
-    publisher-confirms: true
-    virtual-host: /
+#  cloud:
+#    stream:
+#      bindings:
+#        outputMrqcLog:
+#          destination: mrqcLog
+#        inputMrqcLog:
+#          destination: mrqcLog
+#          group: mrqcLogReceiveGroup
+
+
+#  rabbitmq:
+#    host: 132.147.253.31
+#    port: 5672
+#    username: lantone
+#    password: lantone
+#    publisher-confirms: true
+#    virtual-host: /
 
   #redis
   redis:
@@ -209,4 +209,4 @@ log_switch:
   enable: false
 
 mrqcLog:
-  enable: true
+  enable: false