化验辅检导入功能

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

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>