From b12a0e8a06d46aef2ba8ab4966b57af1325fe320 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 16 Apr 2021 17:22:12 +0800
Subject: [PATCH] update

---
 .../lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java   | 1 -
 .../src/main/resources/mainOrm/master/MasterMysqlAntexc.xml             | 2 +-
 .../java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java  | 1 -
 .../com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java    | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java
index 69a01b0..167a0f0 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java
@@ -282,7 +282,6 @@ public class MysqlAntexcServiceImpl implements MysqlAntexcService {
         return masterMysqlAntexcMapper.getCheckFourRiskCounts(param);
     }
 
-
     @Override
     public List<Map<String,String>>  getMatDeliverOrgCheckPersonCounts(Map param){
         return masterMysqlAntexcMapper.getMatDeliverOrgCheckPersonCounts(param);
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
index f6da8fb..d2afd0d 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
@@ -1341,7 +1341,7 @@
     <select id="getMatDeliverCount" resultType="java.util.Map" parameterType="java.util.Map">
         select count(m.sourceId) as matDeliverCount from report_matdeliver m
         INNER JOIN report_patients p on m.sourceId=p.patientId
-        where p.type =3
+        where p.type =3 and p.enable is NULL
         <if test="hospitalId != null and hospitalId != ''">
             and p.hospitalId = #{hospitalId,jdbcType=VARCHAR}
         </if>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
index d52858e..7d5ef2c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
@@ -462,7 +462,6 @@ public class PatientCourseFacade {
                 return objectResponse;
             }
         }
-
         PatientCourseQuery patientCourseQuery = new PatientCourseQuery();
         patientCourseQuery.setYn(YnEnums.YES.getId());
         //状态 1预约，2签到
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
index daa5918..7ae5a0b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
@@ -1534,7 +1534,6 @@ public class PatientSyncMysqlFacade {
 
     public BaseObjectResponse getAreaCheckCount(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer userId)
     {
-
         Date startDate = null;
         Date endDate = null;
         if (StringUtils.isNotEmpty(time))
-- 
1.8.3.1