diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
index e31550d..05a9bd2 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
@@ -18,4 +18,5 @@ public interface MasterLisMapper {
 
     List<LisReportItemModel> queryLisItemByModel(LisReportItemModel query);
 
+    List<LisReportModel> queryListItems(LisReportModel query);
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java
index 206f40a..4d04efb 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java
@@ -51,6 +51,18 @@ public class LisReportModel {
 	//检验项集合
 	private List<LisReportItemModel> items;
 
+
+	//检验明细json
+	private String itemJson;
+
+	public String getItemJson() {
+		return itemJson;
+	}
+
+	public void setItemJson(String itemJson) {
+		this.itemJson = itemJson;
+	}
+
 	public String getPhone() {
 		return phone;
 	}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java
index 4e46de9..8c9dd0d 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java
@@ -14,4 +14,6 @@ public interface LisService {
     List<LisReportModel> queryLisDataByModel(LisReportModel model);
 
     List<LisReportItemModel> queryLisItemByModel(LisReportItemModel query);
+
+    List<LisReportModel> queryListItems(LisReportModel model);
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
index 07e4e79..a4a4763 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
@@ -40,11 +40,11 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService
                             if (CollectionUtils.isEmpty(dbLis))
                             {
                                 masterLisMapper.saveLisData(model);
-                                List<LisReportItemModel> items = model.getItems();
-                                if (CollectionUtils.isNotEmpty(items))
-                                {
-                                    masterLisMapper.saveLisItemsData(items);
-                                }
+//                                List<LisReportItemModel> items = model.getItems();
+//                                if (CollectionUtils.isNotEmpty(items))
+//                                {
+//                                    masterLisMapper.saveLisItemsData(items);
+//                                }
                             }
 
                         }
@@ -71,4 +71,9 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService
 
         return masterLisMapper.queryLisItemByModel(query);
     }
+
+    @Override
+    public List<LisReportModel> queryListItems(LisReportModel query) {
+        return masterLisMapper.queryListItems(query);
+    }
 }
\ No newline at end of file
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 fbd0df6..b90cb23 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -21,7 +21,8 @@
            MODIFIED,
            CREATED,
            HOSPITAL_ID,
-           PHONE
+           PHONE,
+           ITEM_JSON
         ) VALUES (
           #{lisId},
           #{title},
@@ -40,7 +41,8 @@
           #{modified},
           #{created},
           #{hospitalId},
-          #{phone}
+          #{phone},
+          #{itemJson}
         )
 
     </insert>
@@ -138,4 +140,79 @@
             AND HOSPITAL_ID = #{hospitalId}
         </if>
     </select>
+
+
+    <select id="queryListItems" parameterType="com.lyms.platform.permission.model.LisReportModel" resultMap="queryListItemsMap">
+      SELECT
+           LR.LIS_ID,
+           LR.TITLE,
+           LR.TYPE,
+           LR.VCCARDNO,
+           LR.NAME,
+           LR.BHNUM,
+           LR.AGE,
+           LR.SEX,
+           LR.APPLY_TIME,
+           LR.CHECK_TIME,
+           LR.PUBLISH_TIME,
+           LR.APPLY_DOCTOR,
+           LR.APPLY_DEPT,
+           LR.CHECKER,
+           LR.MODIFIED,
+           LR.CREATED,
+           LR.HOSPITAL_ID,
+           LR.PHONE,
+           LI.LIS_ID AS ITEM_LIS_ID,
+           LI.CODE,
+           LI.NAME AS ITEM_NAME,
+           LI.RESULT,
+           LI.RESULT_FLAG,
+           LI.REF,
+           LI.RESULT_TYPE,
+           LI.UNIT,
+           LI.PRINT_ORDER
+         FROM  LIS_REPORT_ITEM_TBL LI
+         LEFT JOIN  LIS_REPORT_TBL LR
+         ON LR.LIS_ID = LI.LIS_ID
+         WHERE
+            LR.VCCARDNO=#{vcCardNo}
+         AND
+            LR.HOSPITAL_ID=#{hospitalId}
+         AND
+            LI.HOSPITAL_ID=#{hospitalId}
+    </select>
+
+
+    <resultMap id="queryListItemsMap" type="com.lyms.platform.permission.model.LisReportModel" >
+             <id property="lisId" column="LIS_ID"/>
+             <result property="title" column="TITLE"/>
+             <result property="type" column="TYPE"/>
+             <result property="vcCardNo" column="VCCARDNO"/>
+             <result property="name" column="NAME"/>
+             <result property="bhnum" column="BHNUM"/>
+             <result property="age" column="AGE"/>
+             <result property="sex" column="SEX"/>
+             <result property="applyTime" column="APPLY_TIME"/>
+             <result property="checkTime" column="CHECK_TIME"/>
+             <result property="publishTime" column="PUBLISH_TIME"/>
+             <result property="applyDoctor" column="APPLY_DOCTOR"/>
+             <result property="applyDept" column="APPLY_DEPT"/>
+             <result property="checker" column="CHECKER"/>
+             <result property="modified" column="MODIFIED"/>
+             <result property="created" column="CREATED"/>
+             <result property="hospitalId" column="HOSPITAL_ID"/>
+             <result property="phone" column="PHONE"/>
+             <collection property="items" column="ITEM_LIS_ID" ofType="com.lyms.platform.permission.model.LisReportItemModel">
+                 <id property="lisId" column="ITEM_LIS_ID"/>
+                 <result property="code" column="CODE"/>
+                 <result property="name" column="ITEM_NAME"/>
+                 <result property="result" column="RESULT"/>
+                 <result property="resultFlag" column="RESULT_FLAG"/>
+                 <result property="ref" column="REF"/>
+                 <result property="resultType" column="RESULT_TYPE"/>
+                 <result property="unit" column="UNIT"/>
+                 <result property="printOrder" column="PRINT_ORDER"/>
+                 <result property="hospitalId" column="HOSPITAL_ID"/>
+             </collection>
+    </resultMap>
 </mapper>
\ No newline at end of file
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java
index 864cd4b..d387bce 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java
@@ -90,8 +90,11 @@ public class HttpClientUtil {
 
     public static void main(String[] args) throws Exception {
 
+        Map<String,String> map = new HashMap<String, String>();
+        map.put("vcCardNo","C40064690");
+        map.put("sortType","1");
         long start = System.currentTimeMillis();
-        String s = doPost("https://area-qhd-api.healthbaby.com.cn:18019/findSyncData", new HashMap<String, String>(), "utf-8");
+        String s = doGet("https://area-qhd-api.healthbaby.com.cn:18019/getLisAndRisData", map, "utf-8","luc805966f6591ff8a51e5186cfee32e58e");
         long end = System.currentTimeMillis();
         System.out.print(end -start);
         System.out.println(s);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
index ff1792e..b57b157 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
@@ -5,10 +5,13 @@ import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.LoginContext;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.facade.LisFacade;
 import com.lyms.platform.operate.web.request.LisReportModelRequest;
+import com.lyms.platform.permission.model.LisReportItemModel;
 import com.lyms.platform.permission.model.LisReportModel;
 import com.lyms.platform.permission.service.LisService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -48,7 +51,12 @@ public class LisController extends BaseController {
             for(LisReportModelRequest lisRequest : models)
             {
                 LisReportModel model = new LisReportModel();
-                model.setItems(lisRequest.getItems());
+                List<LisReportItemModel> items = lisRequest.getItems();
+                if (CollectionUtils.isNotEmpty(items))
+                {
+                    model.setItemJson(JsonUtil.array2JsonString(items));
+                }
+
                 model.setId(lisRequest.getId());
                 model.setVcCardNo(lisRequest.getVcCardNo());
                 model.setHospitalId(lisRequest.getHospitalId());
@@ -74,6 +82,40 @@ public class LisController extends BaseController {
             }
         }
 
+
+
+//        List<LisReportModel> list = new ArrayList<>();
+//        if (models != null && models.size() > 0)
+//        {
+//            for(LisReportModelRequest lisRequest : models)
+//            {
+//                LisReportModel model = new LisReportModel();
+//                model.setItems(lisRequest.getItems());
+//                model.setId(lisRequest.getId());
+//                model.setVcCardNo(lisRequest.getVcCardNo());
+//                model.setHospitalId(lisRequest.getHospitalId());
+//                model.setLisId(lisRequest.getLisId());
+//                model.setAge(lisRequest.getAge());
+//                model.setName(lisRequest.getName());
+//                model.setBhnum(lisRequest.getBhnum());
+//                model.setPhone(lisRequest.getPhone());
+//                model.setSex(lisRequest.getSex());
+//                model.setTitle(lisRequest.getTitle());
+//                model.setType(lisRequest.getType());
+//                model.setChecker(lisRequest.getChecker());
+//                model.setApplyDept(lisRequest.getApplyDept());
+//                model.setApplyDoctor(lisRequest.getApplyDoctor());
+//                model.setApplyTime(DateUtil.parseYMDHMS(lisRequest.getApplyTime()));
+//                model.setPublishTime(DateUtil.parseYMDHMS(lisRequest.getPublishTime()));
+//                model.setModified(DateUtil.parseYMDHMS(lisRequest.getModified()));
+//                model.setCreated(DateUtil.parseYMDHMS(lisRequest.getCreated()));
+//                model.setCheckTime(DateUtil.parseYMDHMS(lisRequest.getCheckTime()));
+//
+//                list.add(model);
+//
+//            }
+//        }
+
         return lisService.saveLisData(list);
     }
 
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 68bdb8d..30e8492 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
@@ -303,7 +303,7 @@ public class LisFacade {
                     if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && StringUtils.isNotEmpty(pat.getHospitalId()))
                     {
 
-                        //获取lis记录中医院的名称
+                        //获取医院的名称
                         String hospitalName = hIdNames.get(pat.getHospitalId());
                         if (!StringUtils.isNotEmpty(hospitalName))
                         {
@@ -347,7 +347,13 @@ public class LisFacade {
                                 query.setLisId(lis.getLisId());
                                 query.setHospitalId(lis.getHospitalId());
                                 //查询lis每项详情
-                                List<LisReportItemModel> items = lisService.queryLisItemByModel(query);
+                                List<LisReportItemModel> items = null;
+                                if (StringUtils.isNotEmpty(lis.getItemJson()))
+                                {
+                                    items = JsonUtil.toList(lis.getItemJson(),LisReportItemModel.class);
+                                }
+
+                                //List<LisReportItemModel> items = lisService.queryLisItemByModel(query);
                                 if (CollectionUtils.isNotEmpty(items))
                                 {
                                     for (LisReportItemModel checkItem : items)
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java
index 2854720..422c11b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java
@@ -5,6 +5,9 @@ package com.lyms.platform.operate.web.utils;
  */
 import java.util.*;
 import java.util.Map.Entry;
+
+import com.lyms.platform.common.pojo.SyncDataModel;
+import com.lyms.platform.common.utils.JsonUtil;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -54,6 +57,8 @@ public class HttpClientUtil {
 
         long start = System.currentTimeMillis();
         String s = doPost("https://area-qhd-api.healthbaby.com.cn:18019/findSyncData", new HashMap<String, String>(), "utf-8");
+
+        List<SyncDataModel> list = JsonUtil.toList(s, SyncDataModel.class);
         long end = System.currentTimeMillis();
         System.out.print(end -start);
         System.out.println(s);