jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6ef8f8cb46351689a54de0d8e9ea789b826ab683

Authored by zhangchao
1 parent 16a9839760
Exists in luanping and in 1 other branch dev

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

Showing 5 changed files with 2 additions and 17 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java View file @ 6ef8f8c
... ... @@ -33,7 +33,6 @@
33 33  
34 34 List<Map<String,Object>> selectServiceByHospital(String hospitalId);
35 35  
36   - List<Map<String,String>> selectServiceByHospital(@Param("hospitalId") String hospitalId);
37 36  
38 37 int selectOnlyBzServiceCount(PatientServiceQuery query);
39 38  
platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java View file @ 6ef8f8c
... ... @@ -33,7 +33,6 @@
33 33 List<Map<String, Object>> getServeDetailList(ServiceListQuery param);
34 34  
35 35 List<String> getHospitalIds(ServiceListQuery param, List<String> ids);
36   - List<Map<String,String>> selectServiceByHospital(@Param("hospitalId") String hospitalId);
37 36 /**
38 37 * 查询病人服务list
39 38 *
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java View file @ 6ef8f8c
... ... @@ -98,10 +98,7 @@
98 98 return patientServiceMapper.getHospitalIds(param, hospitalIds);
99 99 }
100 100  
101   - @Override
102   - public List<Map<String, String>> selectServiceByHospital(String hospitalId) {
103   - return patientServiceMapper.selectServiceByHospital(hospitalId);
104   - }
  101 +
105 102  
106 103 /**
107 104 * 查询病人服务list
platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml View file @ 6ef8f8c
... ... @@ -373,16 +373,6 @@
373 373 <include refid="orderAndLimit"/>
374 374 </select>
375 375  
376   - <select id="selectServiceByHospital" resultType="java.util.HashMap">
377   - SELECT
378   - hso.ser_type as serType,hds.doct_id as doctId
379   -FROM
380   - `hospital_service_content` hso
381   -INNER JOIN hospital_doct_service hds
382   -on hso.id=hds.hosp_service_id
383   -where hso.hospital_id=#{hospitalId} and hso.ser_type in (3,4,6)
384   - </select>
385   -
386 376 <!--查询只开通了标准服务的数据 -->
387 377 <select id="selectOnlyBzService" resultType="java.util.HashMap"
388 378 parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml View file @ 6ef8f8c
... ... @@ -668,7 +668,7 @@
668 668 <!-- 配置一个触发器 0 0 18 * * ?-->
669 669 <bean id="patientServiceSyncTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
670 670 <property name="jobDetail" ref="patientServiceSyncWork"></property>
671   - <property name="cronExpression" value="0 5 17 * * ?"></property>
  671 + <property name="cronExpression" value="0 0 18 * * ?"></property>
672 672 </bean>
673 673  
674 674