From 6ef8f8cb46351689a54de0d8e9ea789b826ab683 Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Wed, 24 Jan 2024 17:10:03 +0800
Subject: [PATCH] Merge branch 'dev' of
 https://git.healthbaby.com.cn/jiangjiazhi/regional-platform into dev

# Conflicts:
#	platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
#	platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
---
 .../platform/permission/dao/master/PatientServiceMapper.java   |  1 -
 .../platform/permission/service/PatientServiceService.java     |  1 -
 .../permission/service/impl/PatientServiceServiceImpl.java     |  5 +----
 .../src/main/resources/mainOrm/master/PatientService.xml       | 10 ----------
 .../src/main/resources/spring/applicationContext-quartz.xml    |  2 +-
 5 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java
index 75c947f..84345ae 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java
@@ -33,7 +33,6 @@ public interface PatientServiceMapper {
 
     List<Map<String,Object>> selectServiceByHospital(String hospitalId);
 
-    List<Map<String,String>> selectServiceByHospital(@Param("hospitalId") String hospitalId);
 
     int  selectOnlyBzServiceCount(PatientServiceQuery query);
 
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java
index c9c3e6f..2251470 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java
@@ -33,7 +33,6 @@ public interface PatientServiceService {
     List<Map<String, Object>> getServeDetailList(ServiceListQuery param);
 
     List<String> getHospitalIds(ServiceListQuery param, List<String> ids);
-    List<Map<String,String>> selectServiceByHospital(@Param("hospitalId") String hospitalId);
     /**
      * 查询病人服务list
      *
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java
index 1618c69..c437988 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java
@@ -98,10 +98,7 @@ public class PatientServiceServiceImpl implements PatientServiceService {
         return patientServiceMapper.getHospitalIds(param, hospitalIds);
     }
 
-    @Override
-    public List<Map<String, String>> selectServiceByHospital(String hospitalId) {
-        return patientServiceMapper.selectServiceByHospital(hospitalId);
-    }
+
 
     /**
      * 查询病人服务list
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index 4d72a39..81a7770 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -373,16 +373,6 @@
         <include refid="orderAndLimit"/>
     </select>
 
-    <select id="selectServiceByHospital" resultType="java.util.HashMap">
-        SELECT
-	hso.ser_type as serType,hds.doct_id as doctId
-FROM
-	`hospital_service_content` hso
-INNER JOIN hospital_doct_service hds
-on hso.id=hds.hosp_service_id
-where hso.hospital_id=#{hospitalId} and hso.ser_type in (3,4,6)
-    </select>
-
     <!--查询只开通了标准服务的数据 -->
     <select id="selectOnlyBzService" resultType="java.util.HashMap"
             parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
index 1a7ea3d..cac8de3 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
@@ -668,7 +668,7 @@
 	<!-- 配置一个触发器  0 0 18 * * ?-->
 	<bean id="patientServiceSyncTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
 		<property name="jobDetail" ref="patientServiceSyncWork"></property>
-		<property name="cronExpression" value="0 5 17 * * ?"></property>
+		<property name="cronExpression" value="0 0 18 * * ?"></property>
 	</bean>
 
 
-- 
1.8.3.1