Merge remote-tracking branch 'origin/dev/20210326_2.0.2' into dev/20210326_2.0.2

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

@@ -421,11 +421,12 @@ public class ConsoleFacade {
         //MR
         Long mr = triggeringRulesMap.get("MR");
         //细菌培养
-        Long bacterialCulture = 0L;
+        Long bacterialCulture = triggeringRulesMap.get("bacterialCulture");
         //抗菌药物
-        Long antibiosis = 0L;
+        Long antibiosis = triggeringRulesMap.get("antibiosis");
         //恶性肿瘤化学治疗
-        Long chemotherapyMalignantTumors = 0L;
+        Long chemotherapyMalignantTumors = triggeringRulesMap.get("chemotherapyMalignantTumors");
+
         Map<String, Double> medicalRecordIndicator = medIndexResultFacade.medicalRecordIndicator(filterVO);
         Double startCount = medicalRecordIndicator.get("startCount");
         Double operationFeeNum = medicalRecordIndicator.get("operationFeeNum");

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -17721,6 +17721,33 @@
         count(
         DISTINCT
         CASE
+        WHEN a.type = 11 THEN
+        a.behospital_code
+        ELSE
+        NULL
+        END
+        ) AS 'bacterialCulture',
+        count(
+        DISTINCT
+        CASE
+        WHEN a.type = 12 THEN
+        a.behospital_code
+        ELSE
+        NULL
+        END
+        ) AS 'antibiosis',
+        count(
+        DISTINCT
+        CASE
+        WHEN a.type = 13 THEN
+        a.behospital_code
+        ELSE
+        NULL
+        END
+        ) AS 'chemotherapyMalignantTumors',
+        count(
+        DISTINCT
+        CASE
         WHEN a.type = 15 THEN
         a.behospital_code
         ELSE
@@ -17885,8 +17912,17 @@
 
 <!--    首页恶性肿瘤-->
     <select id="malignancy" parameterType="com.diagbot.vo.FilterVO" resultType="java.util.Map">
+        select
+        a.behospital_code,
+        a.hospital_id,
+        d.diagnose_name,
+        d.diagnose_type,
+        d.icd_code
+        from(
         SELECT
-        d.behospital_code
+        d.behospital_code,
+        d.hospital_id,
+        b.home_page_id
         FROM
         (
         SELECT
@@ -17913,15 +17949,11 @@
         JOIN med_home_page b ON b.behospital_code = d.behospital_code
         AND d.hospital_id = b.hospital_id
         AND b.is_deleted = 'N'
-        AND (
-        (
-        b.outpatient_emr_diagnose LIKE '%恶性肿瘤%'
-        AND b.outpatient_emr_diagnose_code LIKE 'C%'
-        )
-        OR (
-        b.outpatient_emr_diagnose LIKE 'C%'
-        AND b.outpatient_emr_diagnose_code LIKE '%恶性肿瘤%'
-        )
-        )
+        )a join
+        med_home_diagnose_info d on a.hospital_id=d.hospital_id
+        where a.home_page_id =d.home_page_id
+        and d.is_deleted ='N'
+        and d.diagnose_name like '%恶性肿瘤%'
+        and d.icd_code like 'C%'
     </select>
 </mapper>