接口归集

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

@@ -214,7 +214,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/medLisInfo/getExamineSonPage").permitAll()
                 .antMatchers("/console/medicalCheckForm").permitAll()
                 .antMatchers("/qc/behospitalInfo/analyzeCds").permitAll()
-                .antMatchers("/qc/behospitalInfo/addMedClickInfo").permitAll()
                 .antMatchers("/console/medicalCheckTitle").permitAll()
                 .antMatchers("/console/export/medicalCheckExport").permitAll()
                 .antMatchers("/console/export/medicalCheckInnerExport").permitAll()
@@ -264,6 +263,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/medCheckInfo/addMedCheckInfo").permitAll()
                 .antMatchers("/qc/medCheckInfo/getDataEdit").permitAll()
                 .antMatchers("/qc/medCheckInfo/saveDataEdit").permitAll()
+                .antMatchers("/qc/analysis/addMedClickInfo").permitAll()
                 .antMatchers("/qc/analysis/getQcClick").permitAll()
                 .antMatchers("/qc/analysis/getQcClickInnerPage").permitAll()
                 .antMatchers("/qc/analysis/getEntryDefectImprove").permitAll()

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

@@ -256,7 +256,6 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/medPacsInfo/getCheckPage", request)
                 || matchers("/qc/medLisInfo/getExaminePage", request)
                 || matchers("/qc/behospitalInfo/analyzeCds", request)
-                || matchers("/qc/behospitalInfo/addMedClickInfo", request)
                 || matchers("/qc/medLisInfo/getExamineSonPage", request)
                 || matchers("/console/medicalCheckForm", request)
                 || matchers("/console/medicalCheckTitle", request)
@@ -308,6 +307,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/medCheckInfo/addMedCheckInfo", request)
                 || matchers("/qc/dataEdit/getDataEdit", request)
                 || matchers("/qc/dataEdit/saveDataEdit", request)
+                || matchers("/qc/analysis/addMedClickInfo", request)
                 || matchers("/qc/analysis/getQcClick", request)
                 || matchers("/qc/analysis/getQcClickInnerPage", request)
                 || matchers("/qc/analysis/getEntryDefectImprove", request)

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -2495,29 +2495,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return baseMapper.malignancy(filterVO);
     }
 
-    /**
-     * @Description:医生质控信息次数
-     * @Param: [medClickInfoVO]
-     * @return: void
-     * @Author: cy
-     * @Date: 2021/11/10
-     */
-    public Boolean addMedClickInfo(MedClickInfoVO medClickInfoVO) {
-        MedClickInfo medClickInfo = new MedClickInfo();
-        BeanUtil.copyProperties(medClickInfoVO, medClickInfo);
-        QcresultInfo qcresultInfo = qcresultInfoFacade.lambdaQuery()
-                .eq(QcresultInfo::getHospitalId, medClickInfoVO.getHospitalId())
-                .eq(QcresultInfo::getBehospitalCode, medClickInfoVO.getBehospitalCode())
-                .eq(QcresultInfo::getIsDeleted, IsDeleteEnum.N.getKey())
-                .select(QcresultInfo::getId).one();
-        if(null == qcresultInfo || null == qcresultInfo.getId()
-        ){
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "内部参数异常");
-        }
-        medClickInfo.setQcresultInfoId(qcresultInfo.getId());
-        medClickInfo.setGmtCreate(new Date());
-        return medClickInfoService.save(medClickInfo);
-    }
 
     /**
      * 获取患者年龄信息(通过出生日期和入院日期重新计算)

src/main/java/com/diagbot/facade/DataAnalysisFacade.java

@@ -4,9 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetEntryDefectImproveDTO;
 import com.diagbot.dto.GetQcClickDTO;
 import com.diagbot.dto.GetQcClickInnerPageDTO;
+import com.diagbot.entity.MedClickInfo;
+import com.diagbot.entity.QcresultInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.MedClickInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
@@ -14,9 +18,12 @@ import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.GetEntryDefectImproveVO;
 import com.diagbot.vo.GetQcClickInnerPageVO;
 import com.diagbot.vo.GetQcClickVO;
+import com.diagbot.vo.MedClickInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
+
+import java.util.Date;
 import java.util.List;
 
 
@@ -31,6 +38,34 @@ public class DataAnalysisFacade {
     @Qualifier("medClickInfoServiceImpl")
     private MedClickInfoServiceImpl medClickInfoService;
 
+    @Autowired
+    private QcresultInfoFacade qcresultInfoFacade;
+
+
+    /**
+     * @Description:医生质控信息次数
+     * @Param: [medClickInfoVO]
+     * @return: void
+     * @Author: cy
+     * @Date: 2021/11/10
+     */
+    public Boolean addMedClickInfo(MedClickInfoVO medClickInfoVO) {
+        MedClickInfo medClickInfo = new MedClickInfo();
+        BeanUtil.copyProperties(medClickInfoVO, medClickInfo);
+        QcresultInfo qcresultInfo = qcresultInfoFacade.lambdaQuery()
+                .eq(QcresultInfo::getHospitalId, medClickInfoVO.getHospitalId())
+                .eq(QcresultInfo::getBehospitalCode, medClickInfoVO.getBehospitalCode())
+                .eq(QcresultInfo::getIsDeleted, IsDeleteEnum.N.getKey())
+                .select(QcresultInfo::getId).one();
+        if(null == qcresultInfo || null == qcresultInfo.getId()
+        ){
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "内部参数异常");
+        }
+        medClickInfo.setQcresultInfoId(qcresultInfo.getId());
+        medClickInfo.setGmtCreate(new Date());
+        return medClickInfoService.save(medClickInfo);
+    }
+
     public List<GetQcClickDTO> getQcClick(GetQcClickVO getQcClickVO) {
         clickPageSet(getQcClickVO);
         List<GetQcClickDTO> records = medClickInfoService.getBaseMapper().getQcClick(getQcClickVO);

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

@@ -46,11 +46,6 @@ public class MedClickInfoVO implements Serializable {
     @NotBlank(message = "请输入医生姓名")
     private String doctorName;
 
-    /**
-     * 质控结果基本信息ID
-     */
-    private Long qcresultInfoId;
-
     /**
      * 病人住院ID
      */

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

@@ -284,11 +284,5 @@ public class BehospitalInfoController {
         return RespDTO.onSuc(behospitalInfoFacade.analyzeCds(analyzeCdsVO));
     }
 
-    @ApiOperation(value = "记录医生点击质控病历信息[by:cy]",
-            notes = "")
-    @PostMapping("/addMedClickInfo")
-    @SysLogger("addMedClickInfo")
-    public RespDTO<Boolean> addMedClickInfo(@RequestBody @Valid MedClickInfoVO medClickInfoVO) {
-        return RespDTO.onSuc(behospitalInfoFacade.addMedClickInfo(medClickInfoVO));
-    }
+
 }

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

@@ -10,6 +10,7 @@ import com.diagbot.facade.DataAnalysisFacade;
 import com.diagbot.vo.GetQcClickInnerPageVO;
 import com.diagbot.vo.GetQcClickVO;
 import com.diagbot.vo.GetEntryDefectImproveVO;
+import com.diagbot.vo.MedClickInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,13 @@ public class DataAnalysisController {
     @Autowired
     DataAnalysisFacade dataAnalysisFacade;
 
+    @ApiOperation(value = "记录医生点击质控病历信息[by:cy]")
+    @PostMapping("/addMedClickInfo")
+    @SysLogger("addMedClickInfo")
+    public RespDTO<Boolean> addMedClickInfo(@RequestBody @Valid MedClickInfoVO medClickInfoVO) {
+        return RespDTO.onSuc(dataAnalysisFacade.addMedClickInfo(medClickInfoVO));
+    }
+
     /**
      * 临床质控使用统计
      *