Merge branch 'dev/20210326_2.0.2' into test

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

@@ -640,8 +640,6 @@ public class ConsoleFacade {
                 }
                 if(ListUtil.isNotEmpty(operationCode)) {
                     operationFeeNum = Long.valueOf(operationCode.size());
-                }else {
-                    operationFeeNum=0L;
                 }
                 //CT人数
                 List<String> ctList = adviceNum.get("CT");
@@ -656,13 +654,13 @@ public class ConsoleFacade {
                     MRNum = Long.valueOf(mrList.size());
                 }
                 //手术病理人数
+                Long operationPathologyFeeNum=0L;
                 List<String> operationPathologyList = adviceNum.get("operationPathology");
                 if(ListUtil.isNotEmpty(operationPathologyList)){
                     for (String s : operationPathologyList) {
                         operationPathologyCode.add(s);
                     }
                 }
-                 Long operationPathologyFeeNum=0L;
                 if(ListUtil.isNotEmpty(operationPathologyCode)) {
                     operationPathologyFeeNum = Long.valueOf(operationPathologyCode.size());
                 }
@@ -806,6 +804,13 @@ public class ConsoleFacade {
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
+            if(ListUtil.isNotEmpty(outHospitalCode)) {
+                medIndexRelevance.setRelevanceType(18);
+                for (String Code : outHospitalCode) {
+                    medIndexRelevance.setBehospitalCode(Code);
+                    medIndexRelevanceFacade.save(medIndexRelevance);
+                }
+            }
             if(ListUtil.isNotEmpty(rescueCode)) {
                 medIndexRelevance.setRelevanceType(19);
                 for (String Code : rescueCode) {

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -17631,7 +17631,7 @@
         AND a.hospital_id = #{filterVO.hospitalId}
         and a.behospital_code = c.behospital_code
         ) d
-        LEFT JOIN med_home_page b ON b.behospital_code = d.behospital_code
+        JOIN med_home_page b ON b.behospital_code = d.behospital_code
         AND d.hospital_id = b.hospital_id
         AND b.is_deleted = 'N'
     </select>