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

# Conflicts:
#	icss-service/src/main/java/com/diagbot/client/TranServiceClient.java
#	icss-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

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

@@ -8,14 +8,12 @@ import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.TranFieldInfoDTO;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.vo.HospitalInfoVO;
 import com.diagbot.vo.LisHospitalCodeVO;
 import com.diagbot.vo.PatientInfoVO;
-import com.diagbot.vo.TranFieldInfoVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,11 +27,10 @@ import java.util.List;
  */
 @FeignClient(value = "tran-service", fallback = TranServiceHystrix.class)
 public interface TranServiceClient {
-//    @PostMapping(value = "/web/doc/algorithm/neural")
-//    Response<ResponseData> bayesPageData(@RequestBody SearchData searchData);
 
     /**
      * 获取医生信息
+     *
      * @param doctorInfoVo
      * @return
      */
@@ -42,6 +39,7 @@ public interface TranServiceClient {
 
     /**
      * 获取科室信息
+     *
      * @param hospitalDeptInfoVO
      * @return
      */
@@ -50,6 +48,7 @@ public interface TranServiceClient {
 
     /**
      * 获取医院信息
+     *
      * @param hospitalInfoVO
      * @return
      */
@@ -65,19 +64,22 @@ public interface TranServiceClient {
 
     /**
      * 获取患者信息
+     *
      * @param patientInfoVO
      * @return
      */
     @PostMapping("/patientInfo/getPatientInfo")
-    RespDTO<PatientInfoDTO> getPatientInfo( @RequestBody PatientInfoVO patientInfoVO);
-    
+    RespDTO<PatientInfoDTO> getPatientInfo(@RequestBody PatientInfoVO patientInfoVO);
+
     /**
      * 获取页面顶部病人医生科室信息
+     *
      * @param getTopPatientInfoVO
      * @return
      */
     @PostMapping("/patientInfo/getTopPatientInfo")
-    RespDTO<GetTopPatientInfoDTO> getTopPatientInfo( @RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
+    RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
+
 
     /**
      * 根据uuid获取相关信息

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

@@ -48,11 +48,12 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getHospitalDeptInfo");
         return null;
     }
+
     @Override
-	public RespDTO<List<LisConfigDTO>> getLisConfigByhospitalId(LisHospitalCodeVO lisHospitalCodeVO) {
-		log.error("【hystrix】调用{}异常", "getLisConfigByhospitalId");
-		return null;
-	}
+    public RespDTO<List<LisConfigDTO>> getLisConfigByhospitalId(LisHospitalCodeVO lisHospitalCodeVO) {
+        log.error("【hystrix】调用{}异常", "getLisConfigByhospitalId");
+        return null;
+    }
 
     @Override
     public RespDTO<PatientInfoDTO> getPatientInfo(PatientInfoVO patientInfoVO) {
@@ -60,11 +61,11 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
-	@Override
-	public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(GetTopPatientInfoVO getTopPatientInfoVO) {
-		log.error("【hystrix】调用{}异常", "getTopPatientInfo");
-		return null;
-	}
+    @Override
+    public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(GetTopPatientInfoVO getTopPatientInfoVO) {
+        log.error("【hystrix】调用{}异常", "getTopPatientInfo");
+        return null;
+    }
 
     @Override
     public RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(TranFieldInfoVO tranFieldInfoVO) {

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

@@ -36,7 +36,8 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
         HospitalDeptInfoVO hospitalDeptInfoVO = new HospitalDeptInfoVO();
         BeanUtil.copyProperties(deptInfoVO,hospitalDeptInfoVO);
         RespDTO<HospitalDeptInfoDTO> hospitalDeptInfoDTORespDTO = tranServiceClient.getHospitalDeptInfo(hospitalDeptInfoVO);
-        if (hospitalDeptInfoDTORespDTO == null || !"0".equals(hospitalDeptInfoDTORespDTO.code)) {
+        if (hospitalDeptInfoDTORespDTO == null
+                || !CommonErrorCode.OK.getCode().equals(hospitalDeptInfoDTORespDTO.code)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取科室信息失败");
         }

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

@@ -29,7 +29,8 @@ public class DoctorInfoFacade extends DoctorInfoServiceImpl {
      */
     public List<DoctorInfoDTO> getDoctorInfo(DoctorInfoVO doctorInfoVo) {
         RespDTO<List<DoctorInfoDTO>> doctorInfoDTOList = tranServiceClient.getDoctorInfo(doctorInfoVo);
-        if (doctorInfoDTOList == null || !"0".equals(doctorInfoDTOList.code)) {
+        if (doctorInfoDTOList == null
+                || !CommonErrorCode.OK.getCode().equals(doctorInfoDTOList.code)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取医生信息失败");
         }

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

@@ -35,7 +35,8 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
      */
     public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
         RespDTO<List<HospitalInfoDTO>> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
-        if (hospitalInfoDTOList == null || !"0".equals(hospitalInfoDTOList.code)) {
+        if (hospitalInfoDTOList == null
+                || !CommonErrorCode.OK.getCode().equals(hospitalInfoDTOList.code)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取医院信息失败");
         }

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

@@ -1,13 +1,15 @@
 package com.diagbot.facade;
 
-import com.diagbot.dto.LisConfigDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.LisExcelResVO;
-import com.diagbot.vo.LisExcelWrapperVO;
-import com.diagbot.vo.LitAssayVO;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -20,14 +22,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.LisConfigDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.LisExcelResVO;
+import com.diagbot.vo.LisExcelWrapperVO;
+import com.diagbot.vo.LisHospitalCodeVO;
+import com.diagbot.vo.LitAssayVO;
 
 /**
  * @author wangfeng
@@ -37,10 +41,12 @@ import java.util.stream.Collectors;
 @Component
 public class LisExcelResFacade {
 
+	/*@Autowired
+	LisConfigFacade lisConfigFacade;*/
 	@Autowired
-	LisConfigFacade lisConfigFacade;
+	TranServiceClient tranServiceClient;
 
-	public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, String hospitalCode, HttpServletRequest request) {
+	public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
 
 		List<String> messages = new ArrayList<>();
 		List<LisExcelWrapperVO> lisExcelWrapperList = new ArrayList<>();
@@ -105,7 +111,7 @@ public class LisExcelResFacade {
 
 									lisExcelWrapper.setMealName(mealName);
 									lisExcelWrapper.setItemName(itemName);
-									// lisExcelWrapper.setUniqueName(uniqueName);
+									//  lisExcelWrapper.setUniqueName(uniqueName);
 									lisExcelWrapper.setUnit(unit);
 									lisExcelWrapper.setValue(value);
 									lisExcelWrapper.setMax(max);
@@ -137,7 +143,13 @@ public class LisExcelResFacade {
 				messages.add("无文件上传！");
 			}
 			//匹配公表名
-			List<LisConfigDTO> litData = lisConfigFacade.getLisConfigByhospitalId(hospitalCode);
+			RespDTO<List<LisConfigDTO>> litDatas = tranServiceClient.getLisConfigByhospitalId(lisHospitalCodeVO);
+			 if (litDatas == null || !"0".equals(litDatas.code)) {
+	                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+	                        "获取匹配公表名信息失败");
+	            }
+	        List<LisConfigDTO> litData = litDatas.data;
+	        //导入的数据跟公表数据进行配对
 			if(litData.size()>0){
 				List<LisExcelWrapperVO> lisExcelWrapperListNew = new ArrayList<>();
 				for (LisExcelWrapperVO lisExcelWrapperNew : lisExcelWrapperList) {
@@ -154,7 +166,7 @@ public class LisExcelResFacade {
 				lisExcelWrapperList = lisExcelWrapperListNew;
 			}
 			
-
+			
 			Map<String, List<LisExcelWrapperVO>> lixExMap = lisExcelWrapperList.stream()
 					.collect(Collectors.groupingBy(LisExcelWrapperVO::getMealName));
 			List<LisExcelResVO> LisExcelReslist = new ArrayList<LisExcelResVO>();
@@ -162,6 +174,7 @@ public class LisExcelResFacade {
 				LisExcelResVO lisExcelResVO = new LisExcelResVO();
 				lisExcelResVO.setMenus(str);
 				lisExcelResVO.setLisExcelItem(lixExMap.get(str));
+				
 				LisExcelReslist.add(lisExcelResVO);
 			}
 

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

@@ -1,9 +1,5 @@
 package com.diagbot.facade;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.GetTopPatientInfoDTO;
@@ -18,6 +14,9 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @Description: 患者业务逻辑
@@ -42,7 +41,8 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
      */
     public PatientInfoDTO getPatientInfo(PatientInfoVO patientInfoVO) {
         RespDTO<PatientInfoDTO> patientInfoDTO = tranServiceClient.getPatientInfo(patientInfoVO);
-        if (patientInfoDTO == null || !"0".equals(patientInfoDTO.code)) {
+        if (patientInfoDTO == null
+                || !CommonErrorCode.OK.getCode().equals(patientInfoDTO.code)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取患者信息失败");
         }
@@ -61,7 +61,7 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "页面顶部病人医生科室信息");
         }
-        
+
         GetTopPatientInfoDTO getTopPatientInfoDTO = respDTO.data;
 
         QueryWrapper<DeptInfo> deptInfoQ = new QueryWrapper<>();

icss-service/src/main/java/com/diagbot/service/impl/LisConfigServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.LisConfig;
-import com.diagbot.mapper.LisConfigMapper;
-import com.diagbot.service.LisConfigService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 套餐字段映射公表 服务实现类
- * </p>
- *
- * @author wangfeng
- * @since 2018-12-25
- */
-@Service
-public class LisConfigServiceImpl extends ServiceImpl<LisConfigMapper, LisConfig> implements LisConfigService {
-
-}

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

@@ -31,6 +31,6 @@ public class LisExcelResController {
     @ApiOperation(value = "导入化验数据:[by:wangfeng]", notes = "导入化验数据")
     @PostMapping(value = "/lisExcelAnalysis", produces="text/html;charset=utf-8")
     public String lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
-        return GsonUtil.toJson(lisExcelResFacade.lisExcelAnalysis(file,lisHospitalCodeVO.getHospitalCode(), request));
+        return GsonUtil.toJson(lisExcelResFacade.lisExcelAnalysis(file,lisHospitalCodeVO, request));
     }
 }

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

@@ -0,0 +1,41 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年2月13日 上午10:37:26
+ */
+@Setter
+@Getter
+public class LisConfigDTO {
+
+	 private Long id;
+	 /**
+     * 医院id
+     */
+    private String hospitalId;
+
+    /**
+     * 套餐名
+     */
+    private String mealName;
+
+    /**
+     * 项目名
+     */
+    private String itemName;
+
+    /**
+     * 公表id
+     */
+    private String uniqueId;
+
+    /**
+     * 公表明
+     */
+    private String uniqueName;
+}

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

@@ -1,12 +1,9 @@
 package com.diagbot.entity;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
 
 /**
  * <p>
@@ -14,10 +11,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author wangfeng
- * @since 2018-12-25
+ * @since 2019-02-13
  */
-@TableName("tran_lis_config")
-public class LisConfig implements Serializable {
+public class TranLisConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -35,12 +31,12 @@ public class LisConfig implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -53,7 +49,7 @@ public class LisConfig implements Serializable {
     private String modifier;
 
     /**
-     * 医院id
+     * 医院编码
      */
     private String hospitalCode;
 
@@ -73,7 +69,7 @@ public class LisConfig implements Serializable {
     private String uniqueId;
 
     /**
-     * 公表明
+     * 公表名
      */
     private String uniqueName;
 
@@ -91,18 +87,18 @@ public class LisConfig implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -157,7 +153,7 @@ public class LisConfig implements Serializable {
 
     @Override
     public String toString() {
-        return "LisConfig{" +
+        return "TranLisConfig{" +
         "id=" + id +
         ", isDeleted=" + isDeleted +
         ", gmtCreate=" + gmtCreate +

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

@@ -1,23 +1,24 @@
 package com.diagbot.facade;
 
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.LisConfigDTO;
-import com.diagbot.entity.LisConfig;
+import com.diagbot.entity.TranLisConfig;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.LisConfigServiceImpl;
+import com.diagbot.service.impl.TranLisConfigServiceImpl;
 import com.diagbot.util.BeanUtil;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
+import com.diagbot.util.GsonUtil;
 /**
  * 
  * @author wangfeng
- * @Description: 化验公表配置
- * @date 2018年12月25日 上午10:57:34
+ * @Description: TODO
+ * @date 2019年2月13日 下午1:34:31
  */
 @Component
-public class LisConfigFacade extends LisConfigServiceImpl {
+public class TranLisConfigFacade extends TranLisConfigServiceImpl{
 
 	/**
 	 * 根据医院编码查询公表映射配置
@@ -25,12 +26,14 @@ public class LisConfigFacade extends LisConfigServiceImpl {
 	 * @param hospitalCode
 	 * @return
 	 */
-	public List<LisConfigDTO> getLisConfigByhospitalId(String hospitalCode) {
+	public List<LisConfigDTO> getLisConfigByhospitalIds(String hospitalCode) {
 
-		QueryWrapper<LisConfig> lisConfig = new QueryWrapper<>();
+		QueryWrapper<TranLisConfig> lisConfig = new QueryWrapper<>();
+	    //System.out.println("hospitalCode==="+hospitalCode);
 		lisConfig.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("hospital_code", hospitalCode);
-		List<LisConfig> data = list(lisConfig);
+		List<TranLisConfig> data = list(lisConfig);
 		List<LisConfigDTO> datas = BeanUtil.listCopyTo(data, LisConfigDTO.class);
+		//System.out.println("json=="+GsonUtil.toJson(datas));
 		return datas;
 	}
-}
+}

icss-service/src/main/java/com/diagbot/mapper/LisConfigMapper.java

@@ -1,6 +1,6 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.LisConfig;
+import com.diagbot.entity.TranLisConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wangfeng
- * @since 2018-12-25
+ * @since 2019-02-13
  */
-public interface LisConfigMapper extends BaseMapper<LisConfig> {
+public interface TranLisConfigMapper extends BaseMapper<TranLisConfig> {
 
 }

icss-service/src/main/java/com/diagbot/service/LisConfigService.java

@@ -1,6 +1,6 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.LisConfig;
+import com.diagbot.entity.TranLisConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wangfeng
- * @since 2018-12-25
+ * @since 2019-02-13
  */
-public interface LisConfigService extends IService<LisConfig> {
+public interface TranLisConfigService extends IService<TranLisConfig> {
 
 }

tran-service/src/main/java/com/diagbot/service/impl/TranLisConfigServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.TranLisConfig;
+import com.diagbot.mapper.TranLisConfigMapper;
+import com.diagbot.service.TranLisConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 套餐字段映射公表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-02-13
+ */
+@Service
+public class TranLisConfigServiceImpl extends ServiceImpl<TranLisConfigMapper, TranLisConfig> implements TranLisConfigService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年2月13日 上午11:38:39
+ */
+@Getter
+@Setter
+public class LisHospitalCodeVO {
+
+	/**
+	 * 医院编码
+	 */
+	String hospitalCode;
+}

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

@@ -0,0 +1,42 @@
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.LisConfigDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.TranLisConfigFacade;
+import com.diagbot.vo.LisHospitalCodeVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 套餐字段映射公表 前端控制器
+ * @date 2019年2月13日 上午11:29:43
+ */
+@RestController
+@RequestMapping("/tranLisConfig")
+@Api(value = "公表映射配置API[by:wangfeng]", tags = { "WF——公表映射配置API" })
+@SuppressWarnings("unchecked")
+public class TranLisConfigController {
+
+	@Autowired
+	TranLisConfigFacade tranLisConfigFacade;
+
+	@ApiOperation(value = "根据医院编码查询公表映射配置:[by:wangfeng]", notes = "根据医院编码查询公表映射配置")
+    @PostMapping("/getLisConfigByhospitalId")
+    @SysLogger("getLisConfigByhospitalId")
+	public  RespDTO<List<LisConfigDTO>> getLisConfigByhospitalId(@RequestBody LisHospitalCodeVO lisHospitalCodeVO) {
+		return RespDTO.onSuc(tranLisConfigFacade.getLisConfigByhospitalIds(lisHospitalCodeVO.getHospitalCode()));
+	}
+
+}

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.SysLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
-        <id column="id" property="id"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="ip" property="ip"/>
-        <result column="sys_type" property="sysType"/>
-        <result column="method" property="method"/>
-        <result column="operation" property="operation"/>
-        <result column="params" property="params"/>
-        <result column="username" property="username"/>
-    </resultMap>
-
-</mapper>

icss-service/src/main/resources/mapper/LisConfigMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.LisConfigMapper">
+<mapper namespace="com.diagbot.mapper.TranLisConfigMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.LisConfig">
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.TranLisConfig">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />