From 9750bd69cdc4a76d6a09c10448c4f205153decac Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 25 Sep 2017 11:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/PatientMarkHospServiceFacade.java   |  4 ++--
 .../operate/web/facade/PatientServiceFacade.java   |  4 ++++
 .../resources/spring/applicationContext-quartz.xml | 25 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
index aaa6f04..ce73a9d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
@@ -371,7 +371,7 @@ public class PatientMarkHospServiceFacade {
      * 同步查询乐陵住院数据
      */
     public void synLlHisData(int offset, int page) {
-
+        System.out.println("同步查询乐陵住院数据");
         PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
         patientMarkHospQuery.setSort("hospit_date");
         patientMarkHospQuery.setNeed("y");
@@ -381,7 +381,7 @@ public class PatientMarkHospServiceFacade {
 
         List<PatientMarkHospital> patientMarkHospitals = patientMarkHospitalService.queryPatientMarkHospital(patientMarkHospQuery);
         for (PatientMarkHospital ps : patientMarkHospitals) {
-            if (ps.getHospitType() == 1) {//分娩住院跳过
+            if (ps.getHospitType()!=null && ps.getHospitType() == 1) {//分娩住院跳过
                 continue;
             }
             synUpdateHisData(ps);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index d9185e8..66cc088 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -143,6 +143,10 @@ public class PatientServiceFacade {
             return baseResponse;
         }
 
+        Patients patients = patientsService.findOnePatientById(ps.getParentid());
+        if(patients!=null){
+            ps.setPid(patients.getPid());
+        }
         ps.setId(UUID.randomUUID().toString().replace("-", ""));
         ps.setHospitalId(hospitalId);
         // ps.setCreateDate(new Date());
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 96c19ee..1b92a28 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
@@ -9,6 +9,29 @@
                            http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-3.1.xsd
                            http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
+
+	<bean id="patientMarkHospServiceFacade" class="com.lyms.platform.operate.web.facade.PatientMarkHospServiceFacade"></bean>
+	<!-- 扫描乐陵视图，更新住院状态信息 -->
+	<bean id="synLlHisData" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<!-- 要调用的bean -->
+		<property name="targetObject" ref="patientMarkHospServiceFacade"></property>
+		<!-- 要调用的Method -->
+		<property name="targetMethod" value="synLlHisData"></property>
+		<property name="arguments">
+			<list>
+				<value>0</value>
+				<value>1</value>
+			</list>
+		</property>
+		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
+		<property name="concurrent" value="false"></property>
+	</bean>
+	<!-- 配置一个触发器 -->
+	<bean id="synLlHisDataTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="synLlHisData"></property>
+		<property name="cronExpression" value="0 0/10 * * * ?"></property>
+	</bean>
+
 	<bean id="genSequenceIdService" class="com.lyms.platform.biz.service.GenSequenceIdService"></bean>
 	<!-- 扫描生成的id库 数量不够时自动生成一批数据 -->
 	<bean id="autoInsertIdTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
@@ -149,6 +172,8 @@
 				<ref bean="addSieveJobTrigger"/>
 				<ref bean="correctSieveOrderTrigger"/>
 				<ref bean="autoInsertIdTrigger"/>
+				<!--乐陵住院系统同步-->
+				<ref bean="synLlHisDataTrigger"/>
 				<!--<ref bean="qhdFmTrigger"/>-->
 				<!--<ref bean="crisisTrigger"/>-->
 				<!--<ref bean="qhdFmHistoryTrigger"/>-->
-- 
1.8.3.1