From d8132035474e3f2182900dcb94d130be7ac1142b Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Fri, 19 Jun 2020 10:41:00 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/controller/SieveController.java    |  4 ++--
 .../com/lyms/platform/operate/web/facade/SieveFacade.java   | 13 +++++++++----
 pom.xml                                                     |  8 ++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
index 654cd6a..d2b2cca 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
@@ -379,9 +379,9 @@ public class SieveController extends BaseController {
     @RequestMapping(value = "/importSerologySieve")
     @ResponseBody
     @TokenRequired
-    public void importSerologySieve(@RequestParam MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
+    public BaseResponse importSerologySieve(@RequestParam MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        sieveFacade.importSerologySieve(file, loginState.getId(), response);
+        return sieveFacade.importSerologySieve(file, loginState.getId(), response);
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 4abc4d5..403c037 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -2543,6 +2543,9 @@ public class SieveFacade {
             if (CollectionUtils.isNotEmpty(list)) {
                 for (SieveListResult2 sive : list) {
                     Map<String, Object> data = new HashMap<>();
+                    if(StringUtils.isEmpty(sive.getNumber())){
+                        continue;
+                    }
                     data.put("SampleID", sive.getNumber());//样本号(标本号)
                     data.put("PatientID", sive.getPatientID());//孕妇编号
                     data.put("LastName", sive.getName());//姓名
@@ -2642,7 +2645,8 @@ public class SieveFacade {
      * @author 武涛涛
      * @date 2020/6/15
      */
-    public void importSerologySieve(MultipartFile file, Integer id, HttpServletResponse response) {
+    public BaseResponse importSerologySieve(MultipartFile file, Integer id, HttpServletResponse response) {
+
         Workbook wb = null;
         try {
             //把MultipartFile转化为File 第一种
@@ -2785,11 +2789,12 @@ public class SieveFacade {
 
 
             }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (BiffException e) {
+        } catch (Exception e) {
             e.printStackTrace();
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
         }
+        return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+
     }
 
     private void switchMth(ImportResult importResult, int j, String str) {
diff --git a/pom.xml b/pom.xml
index c3e4cba..5aad427 100644
--- a/pom.xml
+++ b/pom.xml
@@ -583,11 +583,11 @@
             <artifactId>velocity-tools</artifactId>
             <version>2.0</version>
         </dependency>
-        <dependency>
+      <!-- <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc14</artifactId>
             <version>11.2.0.1.0</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>commons-dbutils</groupId>
             <artifactId>commons-dbutils</artifactId>
@@ -604,11 +604,11 @@
             <version>1.2.8</version>
         </dependency>
 
-        <dependency>
+     <!--<dependency>
             <groupId>com.aspose</groupId>
             <artifactId>aspose-words</artifactId>
             <version>15.8.0</version>
-        </dependency>
+        </dependency>-->
 
     </dependencies>
 </project>
-- 
1.8.3.1