From 20c883ec8212d92faa6c4e1d4cf4aeeb3d6b0c9a Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 11 Jan 2017 10:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/biz/service/SieveService.java    | 65 ++++++----------------
 1 file changed, 18 insertions(+), 47 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java
index f577371..0b761c5 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java
@@ -97,38 +97,33 @@ public class SieveService {
     }
 
     public void deleteSieve(String parentId, String hospitalId, Date lastMenses) {
-
-//        int days = DateUtil.daysBetween(lastMenses, new Date());
-        //判断是否在区间
-//        if (days >= 108 && days <= 146) {
-        SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
-        sieveApplyOrderQuery.setParentId(parentId);
-        sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
-        sieveApplyOrderQuery.setHospitalId(hospitalId);
-        List<SieveApplyOrderModel> list = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
-        if (CollectionUtils.isEmpty(list)) {
-            //做分娩的时候需要删除产筛数据
-            SieveQuery sieveQuery = new SieveQuery();
-            sieveQuery.setParentId(parentId);
-            sieveQuery.setYn(YnEnums.YES.getId());
-            sieveQuery.setHospitalId(hospitalId);
-            deleteById(sieveQuery);
+        if (StringUtils.isNotEmpty(parentId)) {
+            SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
+            sieveApplyOrderQuery.setParentId(parentId);
+            sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
+            sieveApplyOrderQuery.setHospitalId(hospitalId);
+            List<SieveApplyOrderModel> list = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
+            if (CollectionUtils.isEmpty(list)) {
+                //做分娩的时候需要删除产筛数据
+                SieveQuery sieveQuery = new SieveQuery();
+                sieveQuery.setParentId(parentId);
+                sieveQuery.setYn(YnEnums.YES.getId());
+                sieveQuery.setHospitalId(hospitalId);
+                deleteById(sieveQuery);
+            }
         }
-//        }
     }
 
     /**
-     *
      * 修正产筛order
-     *
      */
-    public void correctSieveOrder(){
+    public void correctSieveOrder() {
         SieveQuery sieveQuery = new SieveQuery();
         sieveQuery.setYn(YnEnums.YES.getId());
         sieveQuery.setStatus(SieveStatusEnums.O.getId());
-        List<SieveModel> modelList=  queryList(sieveQuery);
-        if(CollectionUtils.isNotEmpty(modelList)){
-            for(SieveModel sieveModel:modelList){
+        List<SieveModel> modelList = queryList(sieveQuery);
+        if (CollectionUtils.isNotEmpty(modelList)) {
+            for (SieveModel sieveModel : modelList) {
                 handOrder(sieveModel);
                 updateOneChanQianDiaSieve(sieveModel);
             }
@@ -136,7 +131,6 @@ public class SieveService {
     }
 
     public static void handOrder(SieveModel sieveModel) {
-
         int days = DateUtil.getDays(sieveModel.getLastMenses(), new Date());
         int order = 100;
         if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O.getId()) && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) {
@@ -150,27 +144,4 @@ public class SieveService {
         }
         sieveModel.setOrder(order);
     }
-
-    public static void main(String[] args) {
-        new Thread(){
-            @Override
-            public void run() {
-                SieveModel sieveModel = new SieveModel();
-                sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-15"));
-                sieveModel.setStatus(1);
-                handOrder(sieveModel);
-                System.out.print("1:"+sieveModel.getOrder());
-            }
-        }.start();
-        new Thread(){
-            @Override
-            public void run() {
-                SieveModel sieveModel = new SieveModel();
-                sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-1"));
-                sieveModel.setStatus(1);
-                handOrder(sieveModel);
-                System.out.print("2:"+sieveModel.getOrder());
-            }
-        }.start();
-    }
 }
\ No newline at end of file
-- 
1.8.3.1