From 5a097c10693df5be3390fde3adad5e405829da3f Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Thu, 13 Dec 2018 17:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=8A=A5=E5=91=8A=E5=8D=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/MatDeliverController.java       | 25 +++++++++++++++++-----
 .../operate/web/facade/BabySieveFacede.java        | 11 +++++++++-
 .../web/result/ChildbirthManagerQueryModel.java    | 18 ++++++++++++++++
 .../operate/web/worker/MaterDeliverWorker.java     |  2 ++
 .../resources/spring/applicationContext-quartz.xml | 19 +++++++++++++++-
 5 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index 9a56f68..c2fba33 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -325,7 +325,7 @@ public class MatDeliverController extends BaseController{
                 map.put("regAddress",regAddress);
                 map.put("phone",queryModel.getPhone());
 
-                AntExChuQuery antExChuQuery = new AntExChuQuery();
+               /* AntExChuQuery antExChuQuery = new AntExChuQuery();
                 antExChuQuery.setYn(YnEnums.YES.getId());
                 antExChuQuery.setParentId(patients.getId());
                 List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
@@ -340,14 +340,29 @@ public class MatDeliverController extends BaseController{
                 {
                     map.put("yc","");
                     map.put("cc","");
-                }
+                }*/
+                map.put("yc",queryModel.getGravidity());
+                map.put("cc",queryModel.getDueCount());
                 map.put("week",queryModel.getDueWeek());
                 HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
                 //妊娠期高危因素
                 map.put("risk", highScoreResult.gethighRiskStr());
-                map.put("A","-");
-                map.put("M","-");
-                map.put("Y","-");
+                String a = "";
+                String m = "";
+                String y = "";
+                Map<String,Object> amy = queryModel.getMyzd();
+                if(true == amy.get("0")){
+                    a = "√";
+                }
+                else if(true == amy.get("1")){
+                    m = "√";
+                }
+                else if(true == amy.get("2")){
+                    y = "√";
+                }
+                map.put("A",a);
+                map.put("M",m);
+                map.put("Y",y);
                 String aModel1 = "";
                 String aModel2 = "";
                 String aModel3 = "";
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
index 4a0b7dc..9ab9ca4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
@@ -894,7 +894,8 @@ public class BabySieveFacede {
     public void newSieveLab(String date){
         try{
             String nowDate=null;
-            String path = "E:\\temp";
+            //String path = "E:\\temp";
+            String path = "/data/soft/mms/csjg";
             File file = new File(path);
             File[] files = file.listFiles();
             System.out.println("该目录下文件个数:" + files.length);
@@ -1042,4 +1043,12 @@ public class BabySieveFacede {
         return br;
     }
 
+
+    public void handWorker(){
+        String date = DateUtil.getymd();
+        newSieveLab(date);
+        System.out.print(date);
+        //System.out.print("我是定时任务！！！");
+    }
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
index 1b3d9af..339ad3c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
@@ -407,10 +407,28 @@ public class ChildbirthManagerQueryModel {
     private String fmTime;
 
     private Integer gravidity;//孕次
+    private Integer dueCount;//产次
     private String department;//科室(1：产一；2：产二)
     private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
     private Integer siLielevel;//会阴撕裂
     private String incision;//切开方式
+    private Map<String,Object> myzd;//母婴阻断
+
+    public Integer getDueCount() {
+        return dueCount;
+    }
+
+    public void setDueCount(Integer dueCount) {
+        this.dueCount = dueCount;
+    }
+
+    public Map<String, Object> getMyzd() {
+        return myzd;
+    }
+
+    public void setMyzd(Map<String, Object> myzd) {
+        this.myzd = myzd;
+    }
 
     public Integer getSiLielevel() {
         return siLielevel;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
index de82a44..7a13110 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
@@ -479,6 +479,8 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                 childbirthManagerQueryModel.setGravidity(maternalDeliverModel.getGravidity());//孕次
                 childbirthManagerQueryModel.setDepartment(maternalDeliverModel.getDepartment());//科室
                 childbirthManagerQueryModel.setAnalMode(maternalDeliverModel.getAnalMode());//镇痛方式
+                childbirthManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount());//产次
+                childbirthManagerQueryModel.setMyzd(maternalDeliverModel.getMyzd());//母婴阻断
 
                 childbirthManagerQueryModelList.add(childbirthManagerQueryModel);
 
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 839b999..a6c1694 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
@@ -363,6 +363,22 @@
 	</bean>
 
 
+	<!-- 承德新筛接口对接-->
+	<bean id="cdBabySieveDataJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<!-- 要调用的bean -->
+		<property name="targetObject" ref="babySieveFacede"/>
+		<!-- 要调用的Method -->
+		<property name="targetMethod" value="handWorker"/>
+		<!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->
+		<property name="concurrent" value="false"/>
+	</bean>
+
+	<bean id="cdBsDataJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+		<property name="jobDetail" ref="cdBabySieveDataJob"/>
+		<property name="cronExpression" value="0 0 20 * * ?"/>
+	</bean>
+
+
 	<!-- 总调度,用于启动定时器 -->
 	<bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
 		<property name="triggers" >
@@ -395,7 +411,8 @@
 				<!--<ref bean="dzfyFmTrigger"/>-->
 				<!--<ref bean="crisisTrigger"/>-->
 				<!--<ref bean="qhdFmHistoryTrigger"/>-->
-
+				<!-- 承德新筛接口-->
+				<!--<ref bean="cdBsDataJobTrigger"/>-->
 				<!--<ref bean="zcChanJianTrigger"/>-->
 				<ref bean="patientSerivceEndJobTrigger"/>
 			</list>
-- 
1.8.3.1