评分接口-分值计算优化

common/src/main/java/com/lantone/common/vo/analyze/AlgorithmVO.java

@@ -1,5 +1,6 @@
 package com.lantone.common.vo.analyze;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -34,4 +35,7 @@ public class AlgorithmVO {
     //-------长兴特殊算分用结束-----------
 
     private String isPlacefile = "1";
+
+    @ApiModelProperty(value = "模块详情集合")
+    private List<QcCasesHospitalVO> qcCasesHospitalVOS;
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/HospitalSetFacade.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.service.RedisService;
+import com.lantone.common.util.StringUtil;
 import com.lantone.dblayermbg.entity.HospitalSet;
 import com.lantone.dblayermbg.service.impl.HospitalSetServiceImpl;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -47,4 +49,19 @@ public class HospitalSetFacade extends HospitalSetServiceImpl {
         return hospitalSetMap;
     }
 
+    /**
+     * @param hospitalId 医院id
+     * @param code  分组集合
+     * @Description获取某医院code的内容
+     * @Return java.util.Map<java.lang.String, java.util.Map < java.lang.String, java.lang.String>>
+     */
+    public Map<String, String> getHospitalCodeMap(String hospitalId, String code) {
+        Map<String, Map<String, Map<String, String>>> hospitalSetMap = redisService.get(AuthConstant.HOSPITAL_SET_MAP_KEY);
+        Map<String, Map<String, String>> codeMap = hospitalSetMap.get(hospitalId);
+        if (MapUtils.isNotEmpty(codeMap) && StringUtil.isNotBlank(code)) {
+            return codeMap.get(code);
+        }
+        return null;
+    }
+
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/analyze/QcCasesHospitalMapper.java

@@ -1,7 +1,11 @@
 package com.lantone.dblayermbg.mapper.analyze;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.common.vo.analyze.QcCasesHospitalVO;
 import com.lantone.dblayermbg.entity.analyze.QcCasesHospital;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -10,4 +14,5 @@ import com.lantone.dblayermbg.entity.analyze.QcCasesHospital;
  */
 public interface QcCasesHospitalMapper extends BaseMapper<QcCasesHospital> {
 
+    List<QcCasesHospitalVO> getCasesByHospitals(@Param("hospitalId") Long hospitalId);
 }

dblayer-mbg/src/main/resources/mapper/analyze/QcCasesHospitalMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.analyze.QcCasesHospitalMapper">
 
+    <select id="getCasesByHospitals" resultType="com.lantone.common.vo.analyze.QcCasesHospitalVO">
+        SELECT
+          cases_id casesId,
+          score
+        FROM
+            qc_cases_hospital
+        WHERE
+            is_deleted = 'N'
+        AND hospital_id = #{hospitalId}
+    </select>
 </mapper>

security-center/src/main/java/com/lantone/security/enums/DictionaryEnum.java

@@ -17,6 +17,7 @@ public enum DictionaryEnum implements KeyedNamed {
     STATUS(47, "启用禁用"),
     DATA_AUTH(48, "数据权限"),
     NOTICE_TYPE(50, "通知类型"),
+    NOTICE_STATUS(51, "通知状态"),
     NOT_SHOW_MENU(41,"不显示菜单");
 
     @Setter

security-center/src/main/java/com/lantone/security/facade/HospitalManagementFacade.java

@@ -516,6 +516,8 @@ public class HospitalManagementFacade {
         Map<String, List<GetDictionaryInfoByTypeDTO>> dicMapObj = dictionaryInfoFacade.getDicMapObj(ReturnTypeEnum.INTERFACE.getKey(),
                 Lists.newArrayList(DictionaryEnum.TITLE.getKey() + "",
                         DictionaryEnum.STATUS.getKey() + "",
+                        DictionaryEnum.NOTICE_TYPE.getKey() + "",
+                        DictionaryEnum.NOTICE_STATUS.getKey() + "",
                         DictionaryEnum.HOSPITAL_TYPE.getKey() + "",
                         DictionaryEnum.DATA_AUTH.getKey() + ""));
         outMap.putAll(dicMapObj);

security-center/src/main/java/com/lantone/security/web/BehospitalInfoController.java

@@ -4,6 +4,7 @@ import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.analyze.AnalyzeDTO;
 import com.lantone.common.vo.analyze.AnalyzeVO;
 import com.lantone.security.facade.analyze.BehospitalInfoManagementFacade;
+import com.lantone.security.facade.analyze.compute.BehospitalInfoManagementFacade_New;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,11 +25,21 @@ import org.springframework.web.bind.annotation.RestController;
 public class BehospitalInfoController {
     @Autowired
     private BehospitalInfoManagementFacade behospitalInfoManagementFacade;
+    @Autowired
+    private BehospitalInfoManagementFacade_New behospitalInfoManagementFacadeNew;
+
     @ApiOperation(value = "评分[by:zhoutg]",
             notes = "")
-    @PostMapping("/analyze")
+    @PostMapping("/analyze===")
     @Transactional
     public CommonResult<AnalyzeDTO> analyze(@RequestBody AnalyzeVO analyzeVO) {
         return CommonResult.success(behospitalInfoManagementFacade.analyze(analyzeVO));
     }
+
+    @ApiOperation(value = "评分[by:zhoutg]",notes = "")
+    @PostMapping("/analyze")
+    @Transactional
+    public CommonResult<AnalyzeDTO> analyzeNew(@RequestBody AnalyzeVO analyzeVO) {
+        return CommonResult.success(behospitalInfoManagementFacadeNew.analyze(analyzeVO));
+    }
 }