分值上传，科室获取接口上传，bug修改

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

@@ -182,7 +182,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/placeFile").permitAll()
                 .antMatchers("/qc/data/sendLisResults").permitAll()
                 .antMatchers("/qc/data/sendPacsResults").permitAll()
-                .antMatchers("/qc/data/getColumnZhAndCh").permitAll()
                 .antMatchers("/qc/data/analyseRec").permitAll()
                 .antMatchers("/qc/data/hisDataDeal").permitAll()
                 .antMatchers("/qc/data/sendDataDeal").permitAll()

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

@@ -258,7 +258,6 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/sendPacsResults", request)
                 || matchers("/qc/data/sendPacsInfos", request)
                 || matchers("/qc/data/sendLisInfos", request)
-                || matchers("/qc/data/getColumnZhAndCh", request)
                 || matchers("/qc/data/analyseRec", request)
                 || matchers("/qc/data/hisDataDeal", request)
                 || matchers("/qc/data/sendDataDeal", request)

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

@@ -115,8 +115,7 @@ public class AlgorithmFacade {
             //验证和操作数据
             if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
                 for (QcResultAlgVO qcResultAlgVO : qcResultAlgVOList) {
-                    if (qcResultAlgVO.getCasesId().equals(algorithmVO.getOptResultAlgVO().getCasesId())
-                            && qcResultAlgVO.getCasesEntryId().equals(algorithmVO.getOptResultAlgVO().getCasesEntryId())) {
+                    if (qcResultAlgVO.getCasesEntryId().equals(algorithmVO.getOptResultAlgVO().getCasesEntryId())) {
                         throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "不能重复加入已经评分的条目");
                     } else {
                         if (algorithmVO.getOptResultAlgVO().getCasesId().equals(qcResultAlgVO.getCasesId())) {
@@ -239,10 +238,6 @@ public class AlgorithmFacade {
      */
     private BigDecimal cal(AlgorithmVO algorithmVO) {
         BigDecimal res = new BigDecimal(100);
-        //统一为长兴的算法
-        if (algorithmVO.getIsHomePage().equals(true)) {
-            res = new BigDecimal(20);
-        }
         //模块总分
         Map<Long, BigDecimal> casesMap = new HashMap<>();
         //单票否决计分

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

@@ -28,6 +28,7 @@ import java.util.stream.Collectors;
 
 import javax.validation.Valid;
 
+import com.diagbot.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,29 +41,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.aggregate.AverageStatisticsAggregate;
 import com.diagbot.aggregate.MrStatisticsAggregate;
 import com.diagbot.aggregate.ResultStatisticsAggregate;
-import com.diagbot.dto.AverageStatisticsDTO;
-import com.diagbot.dto.AverageStatisticsFeeDTO;
-import com.diagbot.dto.CaseScoreDTO;
-import com.diagbot.dto.ColumnDTO;
-import com.diagbot.dto.DeptNumDTO;
-import com.diagbot.dto.EntryNumDTO;
-import com.diagbot.dto.EntryNumGroupDTO;
-import com.diagbot.dto.EntryStatisticsDTO;
-import com.diagbot.dto.HomePageImproveDTO;
-import com.diagbot.dto.HomePageNumDTO;
-import com.diagbot.dto.LevelStatisticsDTO;
-import com.diagbot.dto.MedManageParamsDTO;
-import com.diagbot.dto.NumDTO;
-import com.diagbot.dto.QcResultPercentDTO;
-import com.diagbot.dto.QcResultShortDTO;
-import com.diagbot.dto.QualityControlDTO;
-import com.diagbot.dto.QualityControlNullDTO;
-import com.diagbot.dto.ReBeHosDTO;
-import com.diagbot.dto.ReBeHosDetailDTO;
-import com.diagbot.dto.ReBeHosMergeDTO;
-import com.diagbot.dto.SjcfStatisticsDTO;
-import com.diagbot.dto.UnModifyMRDTO;
-import com.diagbot.dto.UnModifyMRDetailDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.MedIndexResult;
 import com.diagbot.entity.MedManagementInfo;
@@ -134,9 +112,7 @@ public class ConsoleFacade {
     @Qualifier("medManagementInfoServiceImpl")
     private MedManagementInfoService medManagementInfoService;
     @Autowired
-    private MedIndexResultFacade medIndexResultFacade;
-    @Autowired
-    private MedIndexRelevanceFacade medIndexRelevanceFacade;
+    private BasDeptInfoFacade basDeptInfoFacade;
     //region-----------------------聚合接口开始-------------------------------
 
     /**
@@ -3034,6 +3010,20 @@ public class ConsoleFacade {
 
     }
 
-
+    /**
+     * 获取关联科室
+     *
+     * @param
+     * @return
+     */
+    public List<DeptBaseDTO> getDept() {
+        FilterVO filterVO = new FilterVO();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        List<DeptBaseDTO> deptList = basDeptInfoFacade.getDeptByUser(filterVO);
+        return deptList;
+    }
 }
 

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

@@ -216,6 +216,19 @@ public class MedExamineInfoFacade extends MedExamineInfoServiceImpl {
                 .set("status", "5");
         behospitalInfoFacade.update(updateWrapper);
 
+        MedRejectedInfo medRejectedInfo = medRejectedInfoFacade.getOne(new QueryWrapper<MedRejectedInfo>()
+                .eq("hospital_id", medAppealInfoVO.getHospitalId())
+                .eq("behospital_code", medAppealInfoVO.getBehospitalCode())
+                .eq("cases_entry_id", medAppealInfoVO.getCasesEntryId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+        );
+
+        if (medRejectedInfo != null) {
+            //删除驳回记录
+            medRejectedInfoFacade.update(new UpdateWrapper<MedRejectedInfo>().set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .eq("id", medRejectedInfo.getId()));
+        }
+
         // 获取病历信息
         BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
                 .eq("behospital_code", medAppealInfoVO.getBehospitalCode())

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

@@ -59,7 +59,8 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
             hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
         }
 
-        if (null == qcresultVO.getOptResultAlgVO() || null == qcresultVO.getOptResultAlgVO().getId()) {
+//        if (null == qcresultVO.getOptResultAlgVO() || null == qcresultVO.getOptResultAlgVO().getId()) {
+        if (null == qcresultVO.getOptResultAlgVO()) {
             try {
                 QcresultDetail qcresultDetail
                         = qcresultDetailServiceImpl.getOne(

src/main/java/com/diagbot/facade/data/AMedAbnormalInfoFacade.java

@@ -32,15 +32,4 @@ public class AMedAbnormalInfoFacade extends MedAbnormalInfoServiceImpl {
         medAbnormalInfo.setGmtCreate(new Date());
         this.save(medAbnormalInfo);
     }
-
-    public void a(String name){
-        QueryWrapper<MedAbnormalInfo> wrapper =new QueryWrapper<>();
-        wrapper.eq("module_name",name);
-        List<MedAbnormalInfo> medAbnormalInfo =this.list(wrapper);
-        medAbnormalInfo.forEach(s->{
-            AHomePageIngVO aHomePageIngVO = JSON.parseObject(s.getParamIn(),AHomePageIngVO.class);
-            aHomePageFacade.updateHomePageIng(aHomePageIngVO);
-        });
-
-    }
 }

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -173,28 +173,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     }
 
 
-    /**
-     * 特殊公共方法处理数据
-     *
-     * @param
-     */
-    public void specialDataWithKey(Boolean encryptFlag, List<RecordContentDTO> recordContentDTOS
-    ) {
-
-        if (encryptFlag) {
-            try {
-                EncrypDES encrypDES = new EncrypDES();
-                for (RecordContentDTO mrj : recordContentDTOS) {
-                    mrj.setXmlText(encrypDES.decryptor(mrj.getXmlText()));
-                }
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-            }
-        }
-
-    }
-
-
     /**
      * 入参结构拼接-仅支持接口对接的方式
      *

src/main/java/com/diagbot/facade/data/SendDataDealFacade.java

@@ -42,13 +42,6 @@ public class SendDataDealFacade {
 
 
     public void sendDataDeal(String startDate,String stopDate){
-
-//        list.forEach(s->{
-//            sendDataDealABehospitalInfo(s);
-//            sendDataDealADoctorAdvice(s);
-//            sendDataDealAMedicalRecord(s);
-//        });
-
         List<BehospitalInfo> behospitalInfoList=sendDataDealABehospitalInfo(startDate,stopDate);
 //        根据的到的病人登记数据来获取病人的其他信息
         if (behospitalInfoList.size()>0){

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

@@ -0,0 +1,36 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.*;
+import com.diagbot.facade.ConsoleFacade;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
+/**
+ * @author zhaops
+ * @Description:
+ * @date 2020/5/9 13:20
+ **/
+@RequestMapping("/consoleByDept")
+@RestController
+@Api(value = "科室统计相关API", tags = { "科室统计相关API" })
+@SuppressWarnings("unchecked")
+public class ConsoleByDeptController {
+    @Autowired
+    private ConsoleFacade consoleFacade;
+
+    @ApiOperation(value = "用户关联科室[by:zhaops]",
+            notes = "")
+    @PostMapping("/getDept")
+    @SysLogger("getDept")
+    public RespDTO<List<DeptBaseDTO>> getDept() {
+        List<DeptBaseDTO> data = consoleFacade.getDept();
+        return RespDTO.onSuc(data);
+    }
+
+}

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

@@ -55,17 +55,7 @@ public class DataController {
     private SendDataDealFacade sendDataDealFacade;
     @Autowired
     private OldDataFacade oldDataFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
 
-
-//    @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
-//    @PostMapping("/sendDoctorInfos")
-//    @SysLogger("sendDoctorInfos")
-//    public RespDTO sendDoctorInfos(@RequestBody List<ABasDoctorInfoVO> list){
-//        return aBasDoctorInfoFacade.executeDoctor(list);
-//    }
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
     @PostMapping("/sendDoctorInfos")
     @SysLogger("sendDoctorInfos")
@@ -231,7 +221,7 @@ public class DataController {
         return RespDTO.onSuc(b);
     }
 
-    @ApiOperation(value = "数据引擎-历史数据拉取<七院>")
+    @ApiOperation(value = "数据引擎-历史数据拉取<视图>")
     @PostMapping("/sendDataDeal")
     @SysLogger("sendDataDeal")
     public void sendDataDeal(String startDate,String stopDate){
@@ -239,7 +229,7 @@ public class DataController {
     }
 
 
-    @ApiOperation(value = "数据引擎-单个病人历史数据拉取<七院>")
+    @ApiOperation(value = "数据引擎-单个病人历史数据拉取<视图-需配置视图地址>")
     @PostMapping("/sendDataDealOne")
     @SysLogger("sendDataDealOne")
     public void sendDataDealOne(String code){
@@ -254,22 +244,4 @@ public class DataController {
         oldDataFacade.execute();
     }
 
-
-    @ApiOperation(value = "测试")
-    @PostMapping("/getColumnZhAndCh")
-    @SysLogger("getColumnZhAndCh")
-    public RespDTO getColumnZhAndCh(String name){
-        aMedAbnormalInfoFacade.a(name);
-        return RespDTO.onSuc(true);
-    }
-
-//    @Autowired
-//    private ColumnFacade columnFacade;
-//    @ApiOperation(value = "病历解析")
-//    @PostMapping("/analyseRec")
-//    @SysLogger("analyseRec")
-//    public RespDTO analyseRec(@RequestBody AColumnVO aColumnVO){
-//        columnFacade.analyseRec(aColumnVO.getHospitalId(),aColumnVO.getModeId(),aColumnVO.getContent());
-//        return RespDTO.onSuc(true);
-//    }
 }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -3581,11 +3581,6 @@
         <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
-        <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
-        </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
             OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )