化验检索导入和辅件检索导入

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));
+    } 
+    
+}