Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

aipt-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月27日 下午3:36:14
@@ -20,19 +19,19 @@ import java.util.List;
 @Component
 public class DisclaimerInformationFacade extends DisclaimerInformationServiceImpl {
 
-	/**
-	 * 
-	 * @return
-	 */
-	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+    /**
+     * @return
+     */
+    public List<DisclaimerInformationDTO> getDisclaimerInformation() {
 
-		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
-		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-				.orderByAsc("order_no");
-		List<DisclaimerInformation> data = list(disclaimerInformation);
-		// getDisclaimerInformationAll();
-		List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
-		return datas;
-	}
+        QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
+        disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("STATUS", StatusEnum.Enable.getKey())
+                .orderByAsc("order_no");
+        List<DisclaimerInformation> data = list(disclaimerInformation);
+        // getDisclaimerInformationAll();
+        List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
+        return datas;
+    }
 
 }

aipt-service/src/main/java/com/diagbot/facade/DiseaseIcdFacade.java

@@ -46,7 +46,10 @@ public class DiseaseIcdFacade {
         List<DiseaseIcdDTO> res = new ArrayList<>();
 
         List<String> disNames
-                = getDiseaseIcdsList.data.stream().map(g -> g.getConceptDisName()).distinct().collect(Collectors.toList());
+                = getDiseaseIcdsList.data.stream()
+                .map(g -> g.getConceptDisName())
+                .distinct()
+                .collect(Collectors.toList());
         if (ListUtil.isEmpty(disNames)) {
             return res;
         }
@@ -59,7 +62,8 @@ public class DiseaseIcdFacade {
         List<Concept> conceptDisNames = conceptFacade.list(queryWrapper);
 
         Map<String, Long> map
-                = conceptDisNames.stream().collect(Collectors.toMap(c -> c.getLibName(), c -> c.getId()));
+                = conceptDisNames.stream()
+                .collect(Collectors.toMap(c -> c.getLibName(), c -> c.getId()));
         if (null != map) {
             DiseaseIcdDTO diseaseIcdDTO = null;
             for (GetDiseaseIcdDTO getDiseaseIcdDTO : getDiseaseIcdsList.data) {

aipt-service/src/main/java/com/diagbot/facade/EvaluationFacade.java

@@ -2,13 +2,11 @@ package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSONObject;
 import com.diagbot.dto.EvaluationDTO;
-import com.diagbot.service.EvaluationService;
 import com.diagbot.service.impl.EvaluationServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.EvaluationDiseaseNameVO;
 import com.diagbot.vo.SearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -17,32 +15,29 @@ import java.util.Map;
 @Component
 public class EvaluationFacade extends EvaluationServiceImpl {
 
-	@Autowired
-	PushFacade pushFacade;
-	@Autowired
-	@Qualifier("evaluationServiceImpl")
-	EvaluationService evaluationService;
+    @Autowired
+    PushFacade pushFacade;
 
-	/**
-	 * 获取管理与评估模板接口
-	 *
-	 * @param searchVo
-	 * @return
-	 */
-	public List<EvaluationDTO> getEvaluationModule(SearchVo searchVo) {
+    /**
+     * 获取管理与评估模板接口
+     *
+     * @param searchVo
+     * @return
+     */
+    public List<EvaluationDTO> getEvaluationModule(SearchVo searchVo) {
 
-		EvaluationDiseaseNameVO evaluationdiseaseNameVO = new EvaluationDiseaseNameVO();
-		BeanUtil.copyProperties(searchVo, evaluationdiseaseNameVO);
-		List<EvaluationDTO> evaluationList = evaluationService.getEvaluationModule(evaluationdiseaseNameVO);
+        EvaluationDiseaseNameVO evaluationdiseaseNameVO = new EvaluationDiseaseNameVO();
+        BeanUtil.copyProperties(searchVo, evaluationdiseaseNameVO);
+        List<EvaluationDTO> evaluationList = this.getEvaluationModule(evaluationdiseaseNameVO);
 
-		Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVo);
-		for (String key : jsonobject.keySet()) {
-			for (EvaluationDTO evaluadata : evaluationList) {
-				if (key.equals(evaluadata.getRegionName())) {
-					evaluadata.setData(jsonobject.get(key));
-				}
-			}
-		}
-		return evaluationList;
-	}
+        Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVo);
+        for (String key : jsonobject.keySet()) {
+            for (EvaluationDTO evaluadata : evaluationList) {
+                if (key.equals(evaluadata.getRegionName())) {
+                    evaluadata.setData(jsonobject.get(key));
+                }
+            }
+        }
+        return evaluationList;
+    }
 }

aipt-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java

@@ -16,7 +16,6 @@ import java.util.Map;
 @Component
 public class IndexConfigFacade extends IndexConfigServiceImpl {
 
-
     public List<IndexConfigDTO> getIndexConfig(String diseaseName) {
         Map<String, Object> indexConfigMap = new HashMap<>();
         indexConfigMap.put("diseaseName", diseaseName);

aipt-service/src/main/java/com/diagbot/facade/IndexDataFacade.java

@@ -1,15 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.IndexConfigAndDataDTO;
 import com.diagbot.dto.IndexConfigDTO;
@@ -26,9 +16,17 @@ import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.IndexDataVO;
 import com.diagbot.vo.IndexDataiIds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- * 
  * @author wangfeng
  * @Description: 指标数据相关接口
  * @date 2019年5月6日 下午8:04:09
@@ -36,108 +34,110 @@ import com.diagbot.vo.IndexDataiIds;
 @Component
 public class IndexDataFacade {
 
-	@Autowired
-	TranServiceClient tranServiceClient;
-	@Autowired
-	IndexConfigFacade indexConfigFacade;
+    @Autowired
+    TranServiceClient tranServiceClient;
+    @Autowired
+    IndexConfigFacade indexConfigFacade;
 
-	/**
-	 * 获取指标数据接口
-	 * @param indexDataFindVO
-	 * @return 
-	 */
-	public IndexConfigAndDataDTO getIndexDataAll(IndexDataFindVO indexDataFindVO) {
+    /**
+     * 获取指标数据接口
+     *
+     * @param indexDataFindVO
+     * @return
+     */
+    public IndexConfigAndDataDTO getIndexDataAll(IndexDataFindVO indexDataFindVO) {
 
-		Map<String, Object> indexDataMap = new HashMap<>();
-		indexDataMap.put("diseaseName", indexDataFindVO.getDiseaseName());
-		indexDataMap.put("patientId", indexDataFindVO.getPatientId());
-		indexDataMap.put("startTime", indexDataFindVO.getStartTime());
-		indexDataMap.put("endTime", indexDataFindVO.getEndTime());
-		List<Long> ids = new ArrayList<Long>();
-		// 获取所有需要记录的指标项
-		List<IndexConfigDTO> indexConfigdata = indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName());
-		for (IndexConfigDTO indexconfig : indexConfigdata) {
-			ids.add(indexconfig.getUniqueId());
-		}
-		IndexDataiIds indexDataiIds= new IndexDataiIds();
-		BeanUtil.copyProperties(indexDataFindVO,indexDataiIds);
-		indexDataiIds.setIds(ids);
-		// 获取慢病指标数据
-		RespDTO<List<IndexDataDTO>> dataAll = tranServiceClient.getIndexDatas(indexDataiIds);
-		 if (dataAll == null || !"0".equals(dataAll.code)) {
-	            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-	                    "获取指标数据失败");
-	        }
-		List<IndexDataDTO> data = dataAll.data;
-		List<IndexDTO> list = new ArrayList<IndexDTO>();
-		// 根据公表名分组
-    	//Map<String, List<IndexDataDTO>> dataMap =datas.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
-		 // 根据公表名分组
+        Map<String, Object> indexDataMap = new HashMap<>();
+        indexDataMap.put("diseaseName", indexDataFindVO.getDiseaseName());
+        indexDataMap.put("patientId", indexDataFindVO.getPatientId());
+        indexDataMap.put("startTime", indexDataFindVO.getStartTime());
+        indexDataMap.put("endTime", indexDataFindVO.getEndTime());
+        List<Long> ids = new ArrayList<Long>();
+        // 获取所有需要记录的指标项
+        List<IndexConfigDTO> indexConfigdata = indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName());
+        for (IndexConfigDTO indexconfig : indexConfigdata) {
+            ids.add(indexconfig.getUniqueId());
+        }
+        IndexDataiIds indexDataiIds = new IndexDataiIds();
+        BeanUtil.copyProperties(indexDataFindVO, indexDataiIds);
+        indexDataiIds.setIds(ids);
+        // 获取慢病指标数据
+        RespDTO<List<IndexDataDTO>> dataAll = tranServiceClient.getIndexDatas(indexDataiIds);
+        if (dataAll == null || !"0".equals(dataAll.code)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "获取指标数据失败");
+        }
+        List<IndexDataDTO> data = dataAll.data;
+        List<IndexDTO> list = new ArrayList<IndexDTO>();
+        // 根据公表名分组
+        //Map<String, List<IndexDataDTO>> dataMap =datas.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
+        // 根据公表名分组
         Map<String, List<IndexDataDTO>> dataMap = data.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
-		for (String key : dataMap.keySet()) {
-			IndexDTO itemIndexDTO = new IndexDTO();
-			itemIndexDTO.setItemName(key);
-			List<String> indexUnits = new ArrayList<String>();
-			List<String> indexValues = new ArrayList<String>();
-			List<Integer> isAbnormals = new ArrayList<Integer>();
-			List<Date> creatTimes = new ArrayList<Date>();
-			List<IndexDataDTO> indexDatas = dataMap.get(key);
-			for (IndexDataDTO indexDataDTO : indexDatas) {
-				indexUnits.add(indexDataDTO.getIndexUnit());
-				indexValues.add(indexDataDTO.getIndexValue());
-				isAbnormals.add(indexDataDTO.getIsAbnormal());
-				creatTimes.add(indexDataDTO.getCreatTime());
-			}
+        for (String key : dataMap.keySet()) {
+            IndexDTO itemIndexDTO = new IndexDTO();
+            itemIndexDTO.setItemName(key);
+            List<String> indexUnits = new ArrayList<String>();
+            List<String> indexValues = new ArrayList<String>();
+            List<Integer> isAbnormals = new ArrayList<Integer>();
+            List<Date> creatTimes = new ArrayList<Date>();
+            List<IndexDataDTO> indexDatas = dataMap.get(key);
+            for (IndexDataDTO indexDataDTO : indexDatas) {
+                indexUnits.add(indexDataDTO.getIndexUnit());
+                indexValues.add(indexDataDTO.getIndexValue());
+                isAbnormals.add(indexDataDTO.getIsAbnormal());
+                creatTimes.add(indexDataDTO.getCreatTime());
+            }
+
+            itemIndexDTO.setIndexUnit(indexUnits);
+            itemIndexDTO.setIndexValue(indexValues);
+            itemIndexDTO.setIsAbnormal(isAbnormals);
+            itemIndexDTO.setCreatTime(creatTimes);
+            list.add(itemIndexDTO);
 
-			itemIndexDTO.setIndexUnit(indexUnits);
-			itemIndexDTO.setIndexValue(indexValues);
-			itemIndexDTO.setIsAbnormal(isAbnormals);
-			itemIndexDTO.setCreatTime(creatTimes);
-			list.add(itemIndexDTO);
+        }
+        IndexConfigAndDataDTO indexsData = new IndexConfigAndDataDTO();
+        indexsData.setIndexConfigData(indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName()));
+        indexsData.setIndexData(list);
+        return indexsData;
 
-		}
-		IndexConfigAndDataDTO indexsData = new IndexConfigAndDataDTO();
-		indexsData.setIndexConfigData(indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName()));
-		indexsData.setIndexData(list);
-		return indexsData;
+    }
 
-	}
+    /**
+     * 保存指标数据接口
+     *
+     * @param indexDataSaveVO
+     * @return
+     */
+    public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
+        boolean res = false;
+        if (null != indexDataSaveVO && ListUtil.isNotEmpty(indexDataSaveVO.getIndexData())) {
+            // 获取所有需要记录的指标项
+            List<IndexConfigDTO> data = indexConfigFacade.getIndexConfig("");
+            // 遍历数据进行保存
+            List<IndexDataVO> indexDataList = new ArrayList<IndexDataVO>();
+            //过滤化验数据
+            List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
+            for (IndexConfigDTO configData : data) {
+                for (IndexDataVO indexDataNew : indexDatas) {
+                    if (configData.getIndexUnique().equals(indexDataNew.getIndexUnique())) {
+                        IndexDataAllVO indexData = new IndexDataAllVO();
+                        indexData.setIndexId(configData.getUniqueId());
+                        indexData.setIndexUnique(configData.getIndexUnique());
+                        indexData.setCreatTime(indexDataNew.getCreatTime());
+                        indexData.setIndexUnit(indexDataNew.getIndexUnit());
+                        indexData.setIndexValue(indexDataNew.getIndexValue());
+                        indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
+                        indexDataList.add(indexData);
+                    }
+                }
+            }
+            indexDataSaveVO.setIndexData(indexDataList);
+            RespDTO<Boolean> resData = tranServiceClient.saveIndexDatas(indexDataSaveVO);
+            RespDTOUtil.respNGDeal(resData, resData.msg);
+            res = resData.data;
+        }
 
-	/**
-	 * 保存指标数据接口
-	 * @param indexDataSaveVO
-	 * @return
-	 */
-	public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
-		boolean res = false;
-		if (null != indexDataSaveVO && ListUtil.isNotEmpty(indexDataSaveVO.getIndexData())) {
-			// 获取所有需要记录的指标项
-			List<IndexConfigDTO> data = indexConfigFacade.getIndexConfig("");
-			// 遍历数据进行保存
-			List<IndexDataVO> indexDataList = new ArrayList<IndexDataVO>();
-			//过滤化验数据
-			List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
-			for (IndexConfigDTO configData : data) {
-				for (IndexDataVO indexDataNew : indexDatas) {
-					if (configData.getIndexUnique().equals(indexDataNew.getIndexUnique())) {
-						IndexDataAllVO indexData = new IndexDataAllVO();
-						indexData.setIndexId(configData.getUniqueId());
-						indexData.setIndexUnique(configData.getIndexUnique());
-						indexData.setCreatTime(indexDataNew.getCreatTime());
-						indexData.setIndexUnit(indexDataNew.getIndexUnit());
-						indexData.setIndexValue(indexDataNew.getIndexValue());
-						indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
-						indexDataList.add(indexData);
-					}
-				}
-			}
-			indexDataSaveVO.setIndexData(indexDataList);
-	        RespDTO<Boolean> resData = tranServiceClient.saveIndexDatas(indexDataSaveVO);
-	        RespDTOUtil.respNGDeal(resData, resData.msg);
-	        res = resData.data;
-		}
-		
-		return res;
-	}
+        return res;
+    }
 
 }

aipt-service/src/main/java/com/diagbot/facade/RelationFacade.java

@@ -1,13 +0,0 @@
-package com.diagbot.facade;
-
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/5/9 13:39
- */
-@Component
-public class RelationFacade {
-
-}

icss-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -11,6 +11,10 @@ import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.LisConfigDTO;
+import com.diagbot.dto.LisDataDTO;
+import com.diagbot.dto.LisRetrieveListAllDTO;
+import com.diagbot.dto.PacsDataDTO;
+import com.diagbot.dto.PacsRetrieveListAllDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TranFieldInfoDTO;
@@ -20,7 +24,11 @@ import com.diagbot.entity.PatientInfo;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.HospitalInfoVO;
+import com.diagbot.vo.LisArgumentsVO;
+import com.diagbot.vo.LisGroupNameVO;
 import com.diagbot.vo.LisHospitalCodeVO;
+import com.diagbot.vo.PacsArgumentsVO;
+import com.diagbot.vo.PacsCheckItemVO;
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 import com.diagbot.vo.TranFieldInfoVO;
@@ -177,4 +185,16 @@ public interface TranServiceClient {
      */
     @PostMapping("/pacsConfig/getPacsConfigByUniqueNameAndHosCode")
     RespDTO<Map<String, List<String>>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO);
+    
+    @PostMapping("/lisDockingImports/lisDockingImports")
+    public RespDTO<LisRetrieveListAllDTO> getLisDatas(LisArgumentsVO lisArgumentsVO);
+
+    @PostMapping("/lisDockingImports/getByGroupNameLisData")
+	public RespDTO<LisDataDTO> getByGroupNameLisData(LisGroupNameVO lisGroupNameVO);
+
+    @PostMapping("/lisDockingImports/pacsDockingImport")
+	RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO);
+
+    @PostMapping("/lisDockingImports/getByCheckItemPacsData")
+	RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO);
 }

icss-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -12,6 +12,10 @@ import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.LisConfigDTO;
+import com.diagbot.dto.LisDataDTO;
+import com.diagbot.dto.LisRetrieveListAllDTO;
+import com.diagbot.dto.PacsDataDTO;
+import com.diagbot.dto.PacsRetrieveListAllDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TranFieldInfoDTO;
@@ -21,7 +25,11 @@ import com.diagbot.entity.PatientInfo;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.HospitalInfoVO;
+import com.diagbot.vo.LisArgumentsVO;
+import com.diagbot.vo.LisGroupNameVO;
 import com.diagbot.vo.LisHospitalCodeVO;
+import com.diagbot.vo.PacsArgumentsVO;
+import com.diagbot.vo.PacsCheckItemVO;
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 import com.diagbot.vo.TranFieldInfoVO;
@@ -180,4 +188,28 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getPacsConfigByUniqueNameAndHosCode");
         return null;
     }
+
+	@Override
+	public RespDTO<LisRetrieveListAllDTO> getLisDatas(LisArgumentsVO lisArgumentsVO) {
+		log.error("【hystrix】调用{}异常", "getLisDatas");
+		return null;
+	}
+
+	@Override
+	public RespDTO<LisDataDTO> getByGroupNameLisData(LisGroupNameVO lisGroupNameVO) {
+		log.error("【hystrix】调用{}异常", "getByGroupNameLisData");
+		return null;
+	}
+
+	@Override
+	public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+		log.error("【hystrix】调用{}异常", "pacsDockingImports");
+		return null;
+	}
+
+	@Override
+	public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+		log.error("【hystrix】调用{}异常", "getByCheckItemPacsDatas");
+		return null;
+	}
 }

icss-service/src/main/java/com/diagbot/dto/LisDataDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import com.diagbot.vo.LisExcelWrapperVO;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class LisDataDTO {
+	
+	private String hospitalCode;
+	private String groupName;
+	private List<LisExcelWrapperVO>  lisExcelWrapper;
+
+}

icss-service/src/main/java/com/diagbot/dto/LisRetrieveDTO.java

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午1:56:46
+ */
+@Setter
+@Getter
+public class LisRetrieveDTO {
+	
+	private String specimenType;//标本类型
+	private String groupName;//组名称
+	private String inspectDoctor;//送检医生
+	private Date inspectTime;//送检时间
+	private Date reportTime;//报告时间
+}

icss-service/src/main/java/com/diagbot/dto/LisRetrieveListAllDTO.java

@@ -0,0 +1,45 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:01:51
+ */
+@Setter
+@Getter
+public class LisRetrieveListAllDTO {
+	
+	private String patientNum;//门诊号
+	/**
+     * 患者姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+    
+    /**
+     * 年龄
+     */
+    private Integer agr;
+    /**
+     * 送检开始时间
+     */
+    private String startTime;
+    
+    /**
+     * 送检结束时间
+     */
+    private String endTime;
+    
+	private List<LisRetrieveDTO>  lisRetrieveData;
+
+}

icss-service/src/main/java/com/diagbot/dto/PacsDataDTO.java

@@ -0,0 +1,21 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午4:42:01
+ */
+@Setter
+@Getter
+public class PacsDataDTO {
+
+	private String hospitalCode;
+	private String checkItem;// 检查项目;
+	private List<PacsResultDTO>  pacsResultDTO;
+}

icss-service/src/main/java/com/diagbot/dto/PacsResultDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午4:43:38
+ */
+@Setter
+@Getter
+public class PacsResultDTO {
+
+	private String checkItem;// 检查项目
+	private String imagingResults;//影像所见
+	private String imagingDiagnose;//影像诊断
+}

icss-service/src/main/java/com/diagbot/dto/PacsRetrieveDTO.java

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午4:26:21
+ */
+@Setter
+@Getter
+public class PacsRetrieveDTO {
+
+	private String applicationNum;// 申请单号;
+	private String applicationDate;// 申请时间
+	private String checkItem;// 检查项目
+	private String CheckNum;// 检查号
+	private Integer type;// 类型
+	private String name;// 患者姓名
+	private Date inspectTime;// 送检时间
+	private Date reportTime;// 报告时间
+}

icss-service/src/main/java/com/diagbot/dto/PacsRetrieveListAllDTO.java

@@ -0,0 +1,44 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:53:44
+ */
+@Setter
+@Getter
+public class PacsRetrieveListAllDTO {
+
+	private String patientNum;//门诊号
+	/**
+     * 患者姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+    
+    /**
+     * 年龄
+     */
+    private Integer agr;
+    /**
+     * 送检开始时间
+     */
+    private String startTime;
+    
+    /**
+     * 送检结束时间
+     */
+    private String endTime;
+    
+	private List<PacsRetrieveDTO>  pacsRetrieveData;
+}

icss-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -80,6 +80,10 @@ public class HospitalInfo implements Serializable {
      * 排序号
      */
     private Integer orderNo;
+    /**
+     * 导入方式
+     */
+    private Integer importWay;
 
     /**
      * 备注
@@ -170,7 +174,16 @@ public class HospitalInfo implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
-    public String getRemark() {
+    
+    public Integer getImportWay() {
+		return importWay;
+	}
+
+	public void setImportWay(Integer importWay) {
+		this.importWay = importWay;
+	}
+
+	public String getRemark() {
         return remark;
     }
 

icss-service/src/main/java/com/diagbot/facade/DockingImportFacade.java

@@ -0,0 +1,60 @@
+package com.diagbot.facade;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.LisDataDTO;
+import com.diagbot.dto.LisRetrieveListAllDTO;
+import com.diagbot.dto.PacsDataDTO;
+import com.diagbot.dto.PacsRetrieveListAllDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.LisArgumentsVO;
+import com.diagbot.vo.LisGroupNameVO;
+import com.diagbot.vo.PacsArgumentsVO;
+import com.diagbot.vo.PacsCheckItemVO;
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 上午11:09:20
+ */
+@Component
+public class DockingImportFacade {
+	
+	@Autowired
+	TranServiceClient tranServiceClient;
+	
+	/**
+     * 
+     * @param lisHospitalCodeVO
+     * @return
+     */
+	public LisRetrieveListAllDTO lisDockingImport(LisArgumentsVO lisArgumentsVO) {
+		RespDTO<LisRetrieveListAllDTO> lisDataVOList = tranServiceClient.getLisDatas(lisArgumentsVO);
+		RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
+		return lisDataVOList.data;
+	}
+
+	public LisDataDTO getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
+		RespDTO<LisDataDTO> lisDataVOList = tranServiceClient.getByGroupNameLisData(lisGroupNameVO);
+		RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
+		return lisDataVOList.data;
+	}
+
+	public PacsRetrieveListAllDTO pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+		RespDTO<PacsRetrieveListAllDTO> lisDataVOList = tranServiceClient.pacsDockingImports(pacsArgumentsVO);
+		RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
+		return lisDataVOList.data;
+	}
+
+	public PacsDataDTO getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+		RespDTO<PacsDataDTO> lisDataVOList = tranServiceClient.getByCheckItemPacsDatas(pacsGroupNameVO);
+		RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
+		return lisDataVOList.data;
+	}
+
+}

icss-service/src/main/java/com/diagbot/vo/LisArgumentsVO.java

@@ -0,0 +1,42 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 上午11:11:23
+ */
+@Setter
+@Getter
+public class LisArgumentsVO {
+
+	/**
+	 * 医院编码
+	 */
+	String hospitalCode;	
+	/**
+     * 病人id
+     */
+    private Long patientId;
+
+    /**
+     * 就诊号
+     */
+    private String inquiryCode;
+    
+    /**
+     * 送检开始时间
+     */
+    private String startTime;
+    
+    /**
+     * 送检结束时间
+     */
+    private String endTime;
+}

icss-service/src/main/java/com/diagbot/vo/LisGroupNameVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:11:52
+ */
+@Setter
+@Getter
+public class LisGroupNameVO {
+
+	private String groupName;//组名称
+}

icss-service/src/main/java/com/diagbot/vo/PacsArgumentsVO.java

@@ -0,0 +1,39 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:50:23
+ */
+@Setter
+@Getter
+public class PacsArgumentsVO {
+
+	/**
+	 * 医院编码
+	 */
+	String hospitalCode;	
+	/**
+     * 病人id
+     */
+    private Long patientId;
+
+    /**
+     * 就诊号
+     */
+    private String inquiryCode;
+    
+    /**
+     * 送检开始时间
+     */
+    private String startTime;
+    
+    /**
+     * 送检结束时间
+     */
+    private String endTime;
+}

icss-service/src/main/java/com/diagbot/vo/PacsCheckItemVO.java

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:52:43
+ */
+@Setter
+@Getter
+public class PacsCheckItemVO {
+	private String checkItem;//组名称
+}

icss-service/src/main/java/com/diagbot/web/DockingImportController.java

@@ -0,0 +1,69 @@
+package com.diagbot.web;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.LisDataDTO;
+import com.diagbot.dto.LisRetrieveListAllDTO;
+import com.diagbot.dto.PacsDataDTO;
+import com.diagbot.dto.PacsRetrieveListAllDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DockingImportFacade;
+import com.diagbot.vo.LisArgumentsVO;
+import com.diagbot.vo.LisGroupNameVO;
+import com.diagbot.vo.PacsArgumentsVO;
+import com.diagbot.vo.PacsCheckItemVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 上午11:06:55
+ */
+@RestController
+@RequestMapping("/dockingImport")
+@Api(value = "对接导入API[by:wangfeng]", tags = { "WF——对接导入API" })
+@SuppressWarnings("unchecked")
+public class DockingImportController {
+
+	@Autowired
+	DockingImportFacade dockingImportFacade;
+	
+
+    @ApiOperation(value = "导入化验数据检索:[by:wangfeng]", notes = "导入化验数据检索")
+    @PostMapping("/lisDockingImports")
+    @SysLogger("lisDockingImports")
+    public RespDTO<LisRetrieveListAllDTO> lisDockingImports(LisArgumentsVO lisArgumentsVO) {
+        return RespDTO.onSuc(dockingImportFacade.lisDockingImport(lisArgumentsVO));
+    }
+    
+    @ApiOperation(value = "根据组名称获取化验数据:[by:wangfeng]", notes = "根据组名称获取化验数据")
+    @PostMapping("/getByGroupNameLisData")
+    @SysLogger("getByGroupNameLisData")
+    public RespDTO<LisDataDTO> getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
+        return RespDTO.onSuc(dockingImportFacade.getByGroupNameLisDatas(lisGroupNameVO));
+    } 
+    
+    @ApiOperation(value = "导入辅件数据检索:[by:wangfeng]", notes = "导入辅件数据检索")
+    @PostMapping("/pacsDockingImport")
+    @SysLogger("pacsDockingImport")
+    public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+        return RespDTO.onSuc(dockingImportFacade.pacsDockingImports(pacsArgumentsVO));
+    }
+    
+    @ApiOperation(value = "根据组名称获取辅件数据:[by:wangfeng]", notes = "根据组名称获取辅件数据")
+    @PostMapping("/getByCheckItemPacsData")
+    @SysLogger("getByCheckItemPacsData")
+    public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+        return RespDTO.onSuc(dockingImportFacade.getByCheckItemPacsDatas(pacsGroupNameVO));
+    } 
+    
+}

tran-service/src/main/java/com/diagbot/dto/LisDataDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import com.diagbot.vo.LisExcelWrapperVO;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class LisDataDTO {
+	
+	private String hospitalCode;
+	private String groupName;
+	private List<LisExcelWrapperVO>  lisExcelWrapper;
+
+}

tran-service/src/main/java/com/diagbot/dto/LisRetrieveDTO.java

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午1:56:46
+ */
+@Setter
+@Getter
+public class LisRetrieveDTO {
+	
+	private String specimenType;//标本类型
+	private String groupName;//组名称
+	private String inspectDoctor;//送检医生
+	private Date inspectTime;//送检时间
+	private Date reportTime;//报告时间
+}

tran-service/src/main/java/com/diagbot/dto/LisRetrieveListAllDTO.java

@@ -0,0 +1,45 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:01:51
+ */
+@Setter
+@Getter
+public class LisRetrieveListAllDTO {
+	
+	private String patientNum;//门诊号
+	/**
+     * 患者姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+    
+    /**
+     * 年龄
+     */
+    private Integer agr;
+    /**
+     * 送检开始时间
+     */
+    private String startTime;
+    
+    /**
+     * 送检结束时间
+     */
+    private String endTime;
+    
+	private List<LisRetrieveDTO>  lisRetrieveData;
+
+}

tran-service/src/main/java/com/diagbot/dto/PacsDataDTO.java

@@ -0,0 +1,21 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午4:42:01
+ */
+@Setter
+@Getter
+public class PacsDataDTO {
+
+	private String hospitalCode;
+	private String checkItem;// 检查项目;
+	private List<PacsResultDTO>  pacsResultDTO;
+}

tran-service/src/main/java/com/diagbot/dto/PacsResultDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午4:43:38
+ */
+@Setter
+@Getter
+public class PacsResultDTO {
+
+	private String checkItem;// 检查项目
+	private String imagingResults;//影像所见
+	private String imagingDiagnose;//影像诊断
+}

tran-service/src/main/java/com/diagbot/dto/PacsRetrieveDTO.java

@@ -0,0 +1,26 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午4:26:21
+ */
+@Setter
+@Getter
+public class PacsRetrieveDTO {
+
+	private String applicationNum;// 申请单号;
+	private String applicationDate;// 申请时间
+	private String checkItem;// 检查项目
+	private String CheckNum;// 检查号
+	private Integer type;// 类型
+	private String name;// 患者姓名
+	private Date inspectTime;// 送检时间
+	private Date reportTime;// 报告时间
+}

tran-service/src/main/java/com/diagbot/dto/PacsRetrieveListAllDTO.java

@@ -0,0 +1,44 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:53:44
+ */
+@Setter
+@Getter
+public class PacsRetrieveListAllDTO {
+
+	private String patientNum;//门诊号
+	/**
+     * 患者姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+    
+    /**
+     * 年龄
+     */
+    private Integer agr;
+    /**
+     * 送检开始时间
+     */
+    private String startTime;
+    
+    /**
+     * 送检结束时间
+     */
+    private String endTime;
+    
+	private List<PacsRetrieveDTO>  pacsRetrieveData;
+}

tran-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -80,6 +80,10 @@ public class HospitalInfo implements Serializable {
      * 排序号
      */
     private Integer orderNo;
+    /**
+     * 导入方式
+     */
+    private Integer importWay;
 
     /**
      * 备注
@@ -187,7 +191,15 @@ public class HospitalInfo implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public String getRemark() {
+    public Integer getImportWay() {
+		return importWay;
+	}
+
+	public void setImportWay(Integer importWay) {
+		this.importWay = importWay;
+	}
+
+	public String getRemark() {
         return remark;
     }
 

tran-service/src/main/java/com/diagbot/facade/DockingImportFacade.java

@@ -0,0 +1,118 @@
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.diagbot.dto.LisDataDTO;
+import com.diagbot.dto.LisRetrieveDTO;
+import com.diagbot.dto.LisRetrieveListAllDTO;
+import com.diagbot.dto.PacsDataDTO;
+import com.diagbot.dto.PacsResultDTO;
+import com.diagbot.dto.PacsRetrieveDTO;
+import com.diagbot.dto.PacsRetrieveListAllDTO;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.LisArgumentsVO;
+import com.diagbot.vo.LisExcelWrapperVO;
+import com.diagbot.vo.LisGroupNameVO;
+import com.diagbot.vo.PacsArgumentsVO;
+import com.diagbot.vo.PacsCheckItemVO;
+
+@Component
+public class DockingImportFacade {
+
+	public LisRetrieveListAllDTO lisDockingImport(LisArgumentsVO lisArgumentsVO) {
+		// TODO 测试数据
+		LisRetrieveListAllDTO lisRetrieveList = new LisRetrieveListAllDTO();// TODO 测试数据
+		lisRetrieveList.setAgr(24);// TODO 测试数据
+		lisRetrieveList.setName("Tom");// TODO 测试数据
+		lisRetrieveList.setPatientNum("123456");// TODO 测试数据
+		lisRetrieveList.setSex(0);// TODO 测试数据
+		lisRetrieveList.setStartTime("2019-05-01 00:00:00");// TODO 测试数据
+		lisRetrieveList.setEndTime("2019-05-31 00:00:00");// TODO 测试数据
+		List<LisRetrieveDTO> lisRetrieveDTO = new ArrayList<LisRetrieveDTO>();// TODO 测试数据
+		for (int i = 0; i < 10; i++) {// TODO 测试数据
+			LisRetrieveDTO list = new LisRetrieveDTO();
+			list.setGroupName("呼吸道病毒三联检" + i);
+			list.setInspectDoctor("admin" + i);// TODO 测试数据
+			list.setInspectTime(DateUtil.now());// TODO 测试数据
+			list.setReportTime(DateUtil.now());
+			list.setSpecimenType("血清" + i);// TODO 测试数据
+			lisRetrieveDTO.add(list);
+		}
+		lisRetrieveList.setLisRetrieveData(lisRetrieveDTO);// TODO 测试数据
+
+		return lisRetrieveList;// TODO 测试数据
+	}
+
+	public LisDataDTO getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
+		// TODO 測試數據
+		LisDataDTO lisDataDTO = new LisDataDTO();// TODO 测试数据
+		lisDataDTO.setHospitalCode("121365465");// TODO 测试数据
+		lisDataDTO.setGroupName("呼吸道病毒三联检");// TODO 测试数据
+		List<LisExcelWrapperVO> lisExcelWrapper = new ArrayList<LisExcelWrapperVO>();
+		for (int i = 0; i < 10; i++) {// TODO 测试数据
+			LisExcelWrapperVO lisExcelWrapperVO = new LisExcelWrapperVO();
+			lisExcelWrapperVO.setItemName("糖代谢检查" + i);// TODO 测试数据
+			lisExcelWrapperVO.setMax("1" + i);
+			lisExcelWrapperVO.setMealName("-空腹血糖(Glu)" + i);// TODO 测试数据
+			lisExcelWrapperVO.setMin("" + i);// TODO 测试数据
+			lisExcelWrapperVO.setTime("");// TODO 测试数据
+			lisExcelWrapperVO.setType("1");// TODO 测试数据
+			lisExcelWrapperVO.setUniquemealName("-空腹血糖(Glu)" + i);
+			lisExcelWrapperVO.setUniqueName("糖代谢检查" + i);// TODO 测试数据
+			lisExcelWrapperVO.setUnit("mo/l");// TODO 测试数据
+			lisExcelWrapperVO.setValue("15" + i);// TODO 测试数据
+			lisExcelWrapper.add(lisExcelWrapperVO);// TODO 测试数据
+		}
+
+		lisDataDTO.setLisExcelWrapper(lisExcelWrapper);// TODO 测试数据
+		return lisDataDTO;// TODO 测试数据
+	}
+
+	public PacsRetrieveListAllDTO pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+		// TODO 测试数据
+		PacsRetrieveListAllDTO pacsRetrieveList = new PacsRetrieveListAllDTO();// TODO 测试数据
+		pacsRetrieveList.setAgr(24);// TODO 测试数据
+		pacsRetrieveList.setName("Tom");// TODO 测试数据
+		pacsRetrieveList.setPatientNum("123456");// TODO 测试数据
+		pacsRetrieveList.setSex(0);// TODO 测试数据
+		pacsRetrieveList.setStartTime("2019-05-01 00:00:00");// TODO 测试数据
+		pacsRetrieveList.setEndTime("2019-05-31 00:00:00");// TODO 测试数据
+		List<PacsRetrieveDTO> pacsRetrieveDTO = new ArrayList<PacsRetrieveDTO>();// TODO 测试数据
+		for (int i = 0; i < 10; i++) {// TODO 测试数据
+			PacsRetrieveDTO list = new PacsRetrieveDTO();// TODO 测试数据
+			list.setCheckItem("呼吸道病毒三联检" + i);// TODO 测试数据
+			list.setCheckNum("123456" + i);// TODO 测试数据
+			list.setName("心电图" + i);// TODO 测试数据
+			list.setInspectTime(DateUtil.now());// TODO 测试数据
+			list.setReportTime(DateUtil.now());// TODO 测试数据
+			list.setApplicationNum("8888" + i);// TODO 测试数据
+			list.setType(i);// TODO 测试数据
+			pacsRetrieveDTO.add(list);// TODO 测试数据
+		}
+		pacsRetrieveList.setPacsRetrieveData(pacsRetrieveDTO);// TODO 测试数据
+		// TODO 测试数据
+		return pacsRetrieveList;// TODO 测试数据
+	}
+
+	public PacsDataDTO getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+		// TODO 測試數據
+		PacsDataDTO pacsDataDTO = new PacsDataDTO();// TODO 测试数据
+		pacsDataDTO.setHospitalCode("121365465");// TODO 测试数据
+		pacsDataDTO.setCheckItem("心电图");// TODO 测试数据
+		List<PacsResultDTO> pacsExcelWrapper = new ArrayList<PacsResultDTO>();// TODO 测试数据
+		for (int i = 0; i < 10; i++) {// TODO 测试数据
+			PacsResultDTO pacsExcelWrapperVO = new PacsResultDTO();// TODO 测试数据
+			pacsExcelWrapperVO.setCheckItem("胸部正位" + i);// TODO 测试数据
+			pacsExcelWrapperVO.setImagingDiagnose("影像所见" + i);// TODO 测试数据
+			pacsExcelWrapperVO.setImagingResults("影像诊断" + i);// TODO 测试数据
+			pacsExcelWrapper.add(pacsExcelWrapperVO);// TODO 测试数据
+		}
+
+		pacsDataDTO.setPacsResultDTO(pacsExcelWrapper);// TODO 测试数据
+		return pacsDataDTO;// TODO 测试数据
+	}
+
+}

tran-service/src/main/java/com/diagbot/vo/LisArgumentsVO.java

@@ -0,0 +1,42 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 上午11:11:23
+ */
+@Setter
+@Getter
+public class LisArgumentsVO {
+
+	/**
+	 * 医院编码
+	 */
+	String hospitalCode;	
+	/**
+     * 病人id
+     */
+    private Long patientId;
+
+    /**
+     * 就诊号
+     */
+    private String inquiryCode;
+    
+    /**
+     * 送检开始时间
+     */
+    private String startTime;
+    
+    /**
+     * 送检结束时间
+     */
+    private String endTime;
+}

tran-service/src/main/java/com/diagbot/vo/LisDataVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class LisDataVO {
+	
+	private String hospitalCode;
+	private List<LisExcelWrapperVO>  lisExcelWrapper;
+
+}

tran-service/src/main/java/com/diagbot/vo/LisExcelWrapperVO.java

@@ -0,0 +1,36 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Setter
+@Getter
+public class LisExcelWrapperVO {
+
+    private String mealName;
+	
+    private String uniquemealName;
+    
+	private String itemName;
+	
+	private String uniqueName;
+	
+	private String unit;
+	
+	private String value;
+	
+	private String max;
+	
+	private String min;
+	
+	private String time;
+	
+	private String type;
+
+	@Override
+	public String toString() {
+		return "LisExcelWrapper [mealName=" + mealName + ", itemName=" + itemName + ", unit=" + unit + ", value="
+				+ value + "]";
+	}
+}

tran-service/src/main/java/com/diagbot/vo/LisGroupNameVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:11:52
+ */
+@Setter
+@Getter
+public class LisGroupNameVO {
+
+	private String groupName;//组名称
+}

tran-service/src/main/java/com/diagbot/vo/PacsArgumentsVO.java

@@ -0,0 +1,39 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:50:23
+ */
+@Setter
+@Getter
+public class PacsArgumentsVO {
+
+	/**
+	 * 医院编码
+	 */
+	String hospitalCode;	
+	/**
+     * 病人id
+     */
+    private Long patientId;
+
+    /**
+     * 就诊号
+     */
+    private String inquiryCode;
+    
+    /**
+     * 送检开始时间
+     */
+    private String startTime;
+    
+    /**
+     * 送检结束时间
+     */
+    private String endTime;
+}

tran-service/src/main/java/com/diagbot/vo/PacsCheckItemVO.java

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月27日 下午2:52:43
+ */
+@Setter
+@Getter
+public class PacsCheckItemVO {
+	private String checkItem;//组名称
+}

tran-service/src/main/java/com/diagbot/web/DockingImportController.java

@@ -0,0 +1,61 @@
+package com.diagbot.web;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.LisDataDTO;
+import com.diagbot.dto.LisRetrieveListAllDTO;
+import com.diagbot.dto.PacsDataDTO;
+import com.diagbot.dto.PacsRetrieveListAllDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DockingImportFacade;
+import com.diagbot.vo.LisArgumentsVO;
+import com.diagbot.vo.LisGroupNameVO;
+import com.diagbot.vo.PacsArgumentsVO;
+import com.diagbot.vo.PacsCheckItemVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping("/lisDockingImports")
+@Api(value = "化验导入API", tags = { "化验导入API" })
+@SuppressWarnings("unchecked")
+public class DockingImportController {
+	@Autowired
+	DockingImportFacade dockingImportFacade;
+	
+
+    @ApiOperation(value = "导入化验数据检索:[by:wangfeng]", notes = "导入化验数据检索")
+    @PostMapping("/lisDockingImports")
+    @SysLogger("lisDockingImports")
+    public RespDTO<LisRetrieveListAllDTO> lisDockingImports(LisArgumentsVO lisArgumentsVO) {
+        return RespDTO.onSuc(dockingImportFacade.lisDockingImport(lisArgumentsVO));
+    }
+    
+    @ApiOperation(value = "根据组名称获取化验数据:[by:wangfeng]", notes = "根据组名称获取化验数据")
+    @PostMapping("/getByGroupNameLisData")
+    @SysLogger("getByGroupNameLisData")
+    public RespDTO<LisDataDTO> getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
+        return RespDTO.onSuc(dockingImportFacade.getByGroupNameLisDatas(lisGroupNameVO));
+    } 
+    
+    @ApiOperation(value = "导入辅件数据检索:[by:wangfeng]", notes = "导入辅件数据检索")
+    @PostMapping("/pacsDockingImport")
+    @SysLogger("pacsDockingImport")
+    public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+        return RespDTO.onSuc(dockingImportFacade.pacsDockingImports(pacsArgumentsVO));
+    }
+    
+    @ApiOperation(value = "根据组名称获取辅件数据:[by:wangfeng]", notes = "根据组名称获取辅件数据")
+    @PostMapping("/getByCheckItemPacsData")
+    @SysLogger("getByCheckItemPacsData")
+    public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+        return RespDTO.onSuc(dockingImportFacade.getByCheckItemPacsDatas(pacsGroupNameVO));
+    } 
+}

tran-service/src/main/resources/mapper/HospitalInfoMapper.xml

@@ -16,6 +16,7 @@
         <result column="spell" property="spell" />
         <result column="status" property="status" />
         <result column="order_no" property="orderNo" />
+        <result column="import_way" property="importWay" />
         <result column="remark" property="remark" />
     </resultMap>