Merge branch 'dev/20211117_2.1.4' into test

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

@@ -4,6 +4,7 @@ import com.diagbot.dto.BasDeptInfoDTO;
 import com.diagbot.service.impl.BasDeptInfoServiceImpl;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.BasDeptInfoVO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -24,10 +25,23 @@ public class BasDeptInfoFacade extends BasDeptInfoServiceImpl {
      */
     public List<BasDeptInfoDTO> listForUser(BasDeptInfoVO basDeptInfoVO) {
         basDeptInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+        listForUserSet(basDeptInfoVO);
         List<BasDeptInfoDTO> basDeptInfoDTOList = this.getList(basDeptInfoVO);
         return basDeptInfoDTOList;
     }
-
+    private void listForUserSet(BasDeptInfoVO basDeptInfoVO) {
+        if (StringUtils.isNotBlank(basDeptInfoVO.getInputStr())) {
+            String tranStr = basDeptInfoVO.getInputStr();
+            if( tranStr.contains("%")){
+                tranStr = tranStr.replace("%", "\\%");
+                basDeptInfoVO.setInputStr(tranStr);
+            }
+            if( tranStr.contains("_")){
+                tranStr = tranStr.replace("_","\\_");
+                basDeptInfoVO.setInputStr(tranStr);
+            }
+        }
+    }
 
     /**
      * 获取医院用户下拉列表信息

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

@@ -35,6 +35,7 @@ import com.diagbot.vo.GetEntryDefectImproveVO;
 import com.diagbot.vo.GetQcClickInnerPageVO;
 import com.diagbot.vo.GetQcClickVO;
 import com.diagbot.vo.MedClickInfoVO;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -121,7 +122,7 @@ public class DataAnalysisFacade {
             StringBuilder sbFir = new StringBuilder();
             for (QcresultDetail qcresultDetail : list) {
                 if (1 == qcresultDetail.getGradeType()) {
-                    if (null != qcresultDetail.getCasesEntryId()) {
+                    if (null != qcresultDetail.getCasesEntryId() && 0L != qcresultDetail.getCasesEntryId()) {
                         sbFir.append(qcresultDetail.getCasesEntryId() + "、");
                     }
                 }
@@ -298,11 +299,13 @@ public class DataAnalysisFacade {
         for (BehospitalCodeInfo behospitalCodeInfo : behospitalCodeInfoList) {
             //病历下
             List<QcResultDetailInfo> qcResultDetailInfos = behospitalCodeInfo.getQcResultDetailInfos();
-            //获取多病历多质控质控缺陷总量
-            totalMap = getEntryTotalMap(qcResultDetailInfos, totalMap);
-            //获取多病历多质控质控缺陷待改善总量
-            QcResultDetailInfo qcResultDetailInfo = qcResultDetailInfos.get(qcResultDetailInfos.size() - 1);
-            improveleMap = getEntryImproveleMap(qcResultDetailInfo, improveleMap);
+                //获取多病历多质控质控缺陷总量
+                totalMap = getEntryTotalMap(qcResultDetailInfos, totalMap);
+                if (MapUtils.isNotEmpty(totalMap)) {
+                    //获取多病历多质控质控缺陷待改善总量
+                    QcResultDetailInfo qcResultDetailInfo = qcResultDetailInfos.get(qcResultDetailInfos.size() - 1);
+                    improveleMap = getEntryImproveleMap(qcResultDetailInfo, improveleMap);
+                }
         }
     }
 
@@ -446,9 +449,12 @@ public class DataAnalysisFacade {
     public static Map getEntryTotalMap(List<QcResultDetailInfo> qcResultDetailInfos, Map<String, Long> totalMap) {
         Set<String> totalSet = new HashSet<String>();
         for (QcResultDetailInfo qcResultDetailInfo : qcResultDetailInfos) {
-            //质控下获取科室下总缺陷
-            String casesEntryIds = qcResultDetailInfo.getCasesEntryIds();
-            totalSet = getSetEntry(casesEntryIds, totalSet);
+                //质控下获取科室下总缺陷
+                String casesEntryIds = qcResultDetailInfo.getCasesEntryIds();
+                totalSet = getSetEntry(casesEntryIds, totalSet);
+        }
+        if (null == totalSet && totalSet.size() == 0) {
+            return totalMap;
         }
         totalMap = getSetEntryCount(totalMap, totalSet);
         return totalMap;
@@ -477,12 +483,14 @@ public class DataAnalysisFacade {
     }
 
     public static Map getSetEntryCount(Map<String, Long> map, Set<String> sets) {
+        if (null != sets && sets.size() > 0) {
         for (String set : sets) {
             if (map.containsKey(set)) {
                 long count = map.get(set) + 1l;
                 map.put(set, count);
             } else {
                 map.put(set, 1L);
+                }
             }
         }
         return map;
@@ -693,6 +701,15 @@ public class DataAnalysisFacade {
     }
 
     private void entryDefectInnerSet(GetEntryDefectImproveInnerVO getEntryDefectImproveInnerVO) {
+        if(StringUtils.isNotBlank(getEntryDefectImproveInnerVO.getPatName())){
+            getEntryDefectImproveInnerVO.setPatName(transferredMeaning(getEntryDefectImproveInnerVO.getPatName()));
+        }
+        if(StringUtils.isNotBlank(getEntryDefectImproveInnerVO.getDoctorId())){
+            getEntryDefectImproveInnerVO.setDoctorId(transferredMeaning(getEntryDefectImproveInnerVO.getDoctorId()));
+        }
+        if(StringUtils.isNotBlank(getEntryDefectImproveInnerVO.getDoctorName())){
+            getEntryDefectImproveInnerVO.setDoctorName(transferredMeaning(getEntryDefectImproveInnerVO.getDoctorName()));
+        }
         getEntryDefectImproveInnerVO.setCurrent(1L);
         getEntryDefectImproveInnerVO.setSize(Long.MAX_VALUE);
         //入参验证

src/main/resources/mapper/MedClickInfoMapper.xml

@@ -109,9 +109,6 @@
         <if test="deptName != null and deptName != ''">
             and a.dept_name like CONCAT('%',#{deptName},'%')
         </if>
-        <if test="deptId != null and deptId != ''">
-            and a.dept_id= #{deptId}
-        </if>
         <if test="startDate != null">
             <![CDATA[ and a.gmt_create >= #{startDate}]]>
         </if>
@@ -198,7 +195,7 @@
         b.beh_dept_id as deptId,
         b.beh_dept_name as deptName,
         b.behospital_code as behospitalCode,
-        a.cases_entry_ids as casesEntryIds
+        ifnull(a.cases_entry_ids,0) as casesEntryIds
         FROM
         med_qcresult_click a,
         med_behospital_info b
@@ -210,9 +207,6 @@
         <if test="hospitalId != null and hospitalId != ''">
             AND b.hospital_id = #{hospitalId}
         </if>
-        <if test="deptId != null and deptId != ''">
-            and b.beh_dept_id = #{deptId}
-        </if>
         <if test="deptName != null and deptName != ''">
             and b.beh_dept_name like CONCAT('%',#{deptName},'%')
         </if>
@@ -244,7 +238,7 @@
         ifnull(c. level, '未评分') AS `level`,
         c.score_res AS scoreRes,
         c.gmt_create AS gradeTime,
-        a.cases_entry_ids as casesEntryIds
+        ifnull(a.cases_entry_ids,0) as casesEntryIds
         FROM
         med_qcresult_click a,
         med_behospital_info b,
@@ -302,7 +296,7 @@
         b.behospital_code as behospitalCode,
         b.doctor_id AS doctorId,
         b.doctor_name AS doctorName,
-        a.cases_entry_ids as casesEntryIds
+        ifnull(a.cases_entry_ids,0) as casesEntryIds
         FROM
         med_qcresult_click a,
         med_behospital_info b