From 416356df029c3bf640e298ff5107834746e38f3f Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 30 Nov 2017 10:51:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/TestController.java     |  1 -
 .../web/request/MatDeliverFollowAddRequest.java    | 54 +++++++++++-----------
 .../web/request/MatDeliverFollowQueryRequest.java  |  2 -
 .../web/worker/BuildSerToPatientSerWorker.java     |  3 +-
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index 29fc6e2..27b2c07 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -148,7 +148,6 @@ public class TestController {
         //排查本院隐藏建档
         patientsQuery.setExtEnable(false);
         patientsQuery.setBuildTypeNot(1);
-        // patientsQuery.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
         patientsQuery.setYn(YnEnums.YES.getId());
         patientsQuery.setType(1);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java
index 0ddbfb7..a012229 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java
@@ -143,11 +143,11 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
     /**
      * 乳房
      */
-    private String breast;
+    private Integer breast;
     /**
      * 恶露
      */
-    private String lochia;
+    private Integer lochia;
     /**
      * 子宫
      */
@@ -155,7 +155,7 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
     /**
      * 伤口
      */
-    private String wound;
+    private Integer wound;
     /**
      * 其他
      */
@@ -203,6 +203,30 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         return matdeliverFollowModel;
     }
 
+    public Integer getBreast() {
+        return breast;
+    }
+
+    public void setBreast(Integer breast) {
+        this.breast = breast;
+    }
+
+    public Integer getLochia() {
+        return lochia;
+    }
+
+    public void setLochia(Integer lochia) {
+        this.lochia = lochia;
+    }
+
+    public Integer getWound() {
+        return wound;
+    }
+
+    public void setWound(Integer wound) {
+        this.wound = wound;
+    }
+
     public Date getUpdateDate() {
         return updateDate;
     }
@@ -475,22 +499,6 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.bpk = bpk;
     }
 
-    public String getBreast() {
-        return breast;
-    }
-
-    public void setBreast(String breast) {
-        this.breast = breast;
-    }
-
-    public String getLochia() {
-        return lochia;
-    }
-
-    public void setLochia(String lochia) {
-        this.lochia = lochia;
-    }
-
     public String getMatrix() {
         return matrix;
     }
@@ -499,14 +507,6 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert<Matdeliv
         this.matrix = matrix;
     }
 
-    public String getWound() {
-        return wound;
-    }
-
-    public void setWound(String wound) {
-        this.wound = wound;
-    }
-
     public String getOtherDesc() {
         return otherDesc;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowQueryRequest.java
index a5f72c3..bec328b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowQueryRequest.java
@@ -32,8 +32,6 @@ public class MatDeliverFollowQueryRequest {
     private Integer visitAffirm;
 
 
-
-
     public Integer getContactResult() {
         return contactResult;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java
index 7060dfe..39ad53f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BuildSerToPatientSerWorker.java
@@ -83,7 +83,7 @@ public class BuildSerToPatientSerWorker implements Callable {
                         patientsMap.put(pt.getId(),1);
                     }
                     if (pt.getServiceType() == null) {
-                        System.out.println("跳过数据："+pt.getId());
+                        System.out.println("服务类型不存在跳过数据："+pt.getId());
                         continue;
                     }
 
@@ -143,7 +143,6 @@ public class BuildSerToPatientSerWorker implements Callable {
 
                         List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
                         if (CollectionUtils.isNotEmpty(patientServices)) {
-                            System.out.println("增量查询数据存在："+pt.getId());
                             continue;
                         }
                     }
-- 
1.8.3.1