From 64ef4a696e147e43f9f05f76ca9deb1be7931f17 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 27 Apr 2017 15:53:01 +0800
Subject: [PATCH] update

---
 .../main/resources/mainOrm/master/MasterLis.xml    |  2 +-
 .../platform/operate/web/facade/LisFacade.java     | 34 +++++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
index 7c37759..afda6b7 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -271,7 +271,7 @@
     </select>
 
     <update id="updateAppLisStatus" parameterType="java.util.List" >
-        UPDATE LIS_REPORT_TBL STATUS = 1 WHERE ID IN
+        UPDATE LIS_REPORT_TBL SET STATUS = 1 WHERE ID IN
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
index 242fcbc..b3aab3b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
@@ -417,6 +417,20 @@ public class LisFacade {
             query.setHospitalId(patients.getHospitalId());
 
             List<LisReportModel> lises = lisService.queryLisDataByQuery(query);
+            if (CollectionUtils.isNotEmpty(lises))
+            {
+                for(LisReportModel lisReportModel : lises)
+                {
+                    String json = lisReportModel.getItemJson();
+                    if (StringUtils.isNotEmpty(json))
+                    {
+                        List<LisReportItemModel> items = JsonUtil.toList(json,LisReportItemModel.class);
+                        lisReportModel.setItems(items);
+                        lisReportModel.setItemJson(null);
+                    }
+                }
+            }
+
             BaseObjectResponse objectResponse = new BaseObjectResponse();
             objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
             objectResponse.setData(lises);
@@ -432,16 +446,22 @@ public class LisFacade {
      * @return
      */
     public BaseResponse updateAppLisStatus(String ids) {
-        if (StringUtils.isNotEmpty(ids))
-        {
-            String[] arrs =  ids.split(",");
-            if (arrs != null && arrs.length > 0)
+        try {
+            if (StringUtils.isNotEmpty(ids))
             {
-                List<String> list = new ArrayList<>();
-                CollectionUtils.addAll(list, arrs);
-                lisService.updateAppLisStatus(list);
+                String[] arrs =  ids.split(",");
+                if (arrs != null && arrs.length > 0)
+                {
+                    List<String> list = new ArrayList<>();
+                    CollectionUtils.addAll(list, arrs);
+                    lisService.updateAppLisStatus(list);
+                }
             }
         }
+        catch (Exception e)
+        {
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
+        }
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
     }
 }
\ No newline at end of file
-- 
1.8.3.1