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

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

@@ -134,7 +134,7 @@ public interface TranServiceClient {
      * @return
      */
     @PostMapping("/inquiryInfo/hisInquirysForJz")
-    RespDTO<List<HisInquirysForJzDTO>> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO);
+    RespDTO<HisInquirysForJzDTO> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO);
     
     /**
      * 急诊-添加二次诊断

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

@@ -103,7 +103,7 @@ public class TranServiceHystrix implements TranServiceClient {
     }
     
     @Override
-	public RespDTO<List<HisInquirysForJzDTO>> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO) {
+	public RespDTO<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO) {
     	log.error("【hystrix】调用{}异常", "hisInquirysForJz");
 		return null;
 	}

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

@@ -1,11 +1,7 @@
 package com.diagbot.dto;
 
-import java.util.Date;
 import java.util.List;
 
-import com.diagbot.entity.InquiryDetail;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -21,122 +17,17 @@ import lombok.Setter;
 @Setter
 public class HisInquirysForJzDTO{
 	
-    /**
-     * 问诊记录id
-     */
-	@ApiModelProperty(value="问诊记录id")
-    private Long inquiryId;
-	
-	/**
-     * 医生id
-     */
-	@ApiModelProperty(value="医生id")
-    private Long doctorId;
-	
-    /**
-     * 医生姓名
-     */
-	@ApiModelProperty(value="医生姓名")
-    private String doctorName;
-	
-	/**
-	 * 就诊日期
-	 */
-	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-	@ApiModelProperty(value="就诊日期")
-	private Date inquiryDate;
-	
 	/**
-	 * 就诊时间
+	 * 总条数
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@ApiModelProperty(value="就诊时间")
-	private Date inquiryTime;
-	
-    /**
-     * 诊断
-     */
-	@ApiModelProperty(value="诊断")
-    private String diagnose;
-	
-	/**
-     * 二次诊断的医生id
-     */
-	@ApiModelProperty(value="二次诊断的医生id")
-    private Long doctorIdSecond;
-	
-    /**
-     * 二次诊断的医生姓名
-     */
-	@ApiModelProperty(value="二次诊断的医生姓名")
-    private String doctorNameSecond;
+	@ApiModelProperty(value="总条数")
+	private Long total;
 	
 	/**
-	 * 二次诊断的就诊时间
+	 * 问诊记录列表
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@ApiModelProperty(value="二次诊断的就诊时间")
-	private Date inquiryTimeSecond;
-	
-    /**
-     * 二次诊断的诊断
-     */
-	@ApiModelProperty(value="二次诊断的诊断")
-    private String diagnoseSecond;
-	
-    /**
-     * 门诊号
-     */
-	@ApiModelProperty(value="门诊号")
-    private String inquiryCode;
-	
-    /**
-     * 医院科室id
-     */
-	@ApiModelProperty(value="医院科室id")
-    private Long hospitalDeptId;
-	
-    /**
-     * 医院科室名称
-     */
-	@ApiModelProperty(value="医院科室名称")
-    private String hospitalDeptName;
-	
-	/**
-     * 病人id
-     */
-	@ApiModelProperty(value="病人id")
-    private Long patientId;
-	
-	/**
-     * 病人姓名
-     */
-	@ApiModelProperty(value="病人姓名")
-    private String patientName;
-	
-    /**
-     * 病人性别
-     */
-	@ApiModelProperty(value="病人性别")
-    private String patientSex;
-	
-    /**
-     * 病人年龄
-     */
-	@ApiModelProperty(value="病人年龄")
-    private Integer patientAge;
-	
-    /**
-     * 病人证件号码
-     */
-	@ApiModelProperty(value="病人证件号码")
-    private String patientIdNo;
-    
-	/**
-     * 病历明细
-     */
-	@ApiModelProperty(value="病历明细")
-	private List<InquiryDetail> detailList;
+	@ApiModelProperty(value="问诊记录列表")
+	private List<HisInquirysForJzDetailDTO> inquiryList;
 	
 	
 }

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

@@ -0,0 +1,140 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.diagbot.entity.InquiryDetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:56
+ */
+@Getter
+@Setter
+public class HisInquirysForJzDetailDTO{
+	
+    /**
+     * 问诊记录id
+     */
+	@ApiModelProperty(value="问诊记录id")
+    private Long inquiryId;
+	
+	/**
+     * 医生id
+     */
+	@ApiModelProperty(value="医生id")
+    private Long doctorId;
+	
+    /**
+     * 医生姓名
+     */
+	@ApiModelProperty(value="医生姓名")
+    private String doctorName;
+	
+	/**
+	 * 就诊日期
+	 */
+	@ApiModelProperty(value="就诊日期")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date inquiryDate;
+	
+	/**
+	 * 就诊时间
+	 */
+	@ApiModelProperty(value="就诊时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date inquiryTime;
+	
+    /**
+     * 诊断
+     */
+	@ApiModelProperty(value="诊断")
+    private String diagnose;
+	
+	/**
+     * 二次诊断的医生id
+     */
+	@ApiModelProperty(value="二次诊断的医生id")
+    private Long doctorIdSecond;
+	
+    /**
+     * 二次诊断的医生姓名
+     */
+	@ApiModelProperty(value="二次诊断的医生姓名")
+    private String doctorNameSecond;
+	
+	/**
+	 * 二次诊断的就诊时间
+	 */
+	@ApiModelProperty(value="二次诊断的就诊时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date inquiryTimeSecond;
+	
+    /**
+     * 二次诊断的诊断
+     */
+	@ApiModelProperty(value="二次诊断的诊断")
+    private String diagnoseSecond;
+	
+    /**
+     * 门诊号
+     */
+	@ApiModelProperty(value="门诊号")
+    private String inquiryCode;
+	
+    /**
+     * 医院科室id
+     */
+	@ApiModelProperty(value="医院科室id")
+    private Long hospitalDeptId;
+	
+    /**
+     * 医院科室名称
+     */
+	@ApiModelProperty(value="医院科室名称")
+    private String hospitalDeptName;
+	
+	/**
+     * 病人id
+     */
+	@ApiModelProperty(value="病人id")
+    private Long patientId;
+	
+	/**
+     * 病人姓名
+     */
+	@ApiModelProperty(value="病人姓名")
+    private String patientName;
+	
+    /**
+     * 病人性别
+     */
+	@ApiModelProperty(value="病人性别")
+    private String patientSex;
+	
+    /**
+     * 病人年龄
+     */
+	@ApiModelProperty(value="病人年龄")
+    private Integer patientAge;
+	
+    /**
+     * 病人证件号码
+     */
+	@ApiModelProperty(value="病人证件号码")
+    private String patientIdNo;
+    
+	/**
+     * 病历明细
+     */
+	@ApiModelProperty(value="病历明细")
+	private List<InquiryDetail> detailList;
+	
+	
+}

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

@@ -379,8 +379,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @param hisInquirysForJzVO
      * @return
      */
-    public List<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
-    	RespDTO<List<HisInquirysForJzDTO>> res = tranServiceClient.hisInquirysForJz(hisInquirysForJzVO);
+    public HisInquirysForJzDTO hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
+    	RespDTO<HisInquirysForJzDTO> res = tranServiceClient.hisInquirysForJz(hisInquirysForJzVO);
     	RespDTOUtil.respNGDeal(res, "获取急诊历史病历列表失败");
     	return res.data;
     }

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

@@ -46,14 +46,14 @@ import springfox.documentation.annotations.ApiIgnore;
  */
 @RestController
 @RequestMapping("/inquiryInfo")
-@Api(value = "问诊记录API", tags = { "知识库标准化-问诊记录API" })
+@Api(value = "问诊记录API", tags = { "ICSS三期/知识库标准化-问诊记录API" })
 @SuppressWarnings("unchecked")
 public class InquiryInfoController {
 
     @Autowired
     private InquiryInfoFacade inquiryInfoFacade;
 
-    @ApiOperation(value = "知识库标准化-问诊记录保存[by:rengb]")
+    @ApiOperation(value = "ICSS三期/知识库标准化-问诊记录保存[by:rengb]")
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
     @Transactional
@@ -82,10 +82,10 @@ public class InquiryInfoController {
         return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
     }
     
-    @ApiOperation(value = "急诊-历史病历列表[by:rengb]")
+    @ApiOperation(value = "ICSS三期-急诊-历史病历列表[by:rengb]")
     @PostMapping("/hisInquirysForJz")
     @SysLogger("hisInquirysForJz")
-    public RespDTO<List<HisInquirysForJzDTO>> hisInquirysForJz(@Valid @RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
+    public RespDTO<HisInquirysForJzDTO> hisInquirysForJz(@Valid @RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
         return RespDTO.onSuc(inquiryInfoFacade.hisInquirysForJz(hisInquirysForJzVO));
     }
 
@@ -118,14 +118,14 @@ public class InquiryInfoController {
         return RespDTO.onSuc(inquiryInfoFacade.getEvaluationScales(getEvaluationScalesVO));
     }
     
-    @ApiOperation(value = "急诊-添加二次诊断[by:rengb]")
+    @ApiOperation(value = "ICSS三期-急诊-添加二次诊断[by:rengb]")
     @PostMapping("/addDiagnoseSecond")
     @SysLogger("addDiagnoseSecond")
     public RespDTO<Boolean> addDiagnoseSecond(@Valid @RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO) {
         return RespDTO.onSuc(inquiryInfoFacade.addDiagnoseSecond(addDiagnoseSecondVO));
     }
     
-    @ApiOperation(value = "急诊-导出病历[by:rengb]")
+    @ApiOperation(value = "ICSS三期-急诊-导出病历[by:rengb]")
     @PostMapping("/exportInquirys")
     public void exportInquirys(HttpServletResponse response,@Valid @RequestBody ExportInquirysVO exportInquirysVO){
     	inquiryInfoFacade.exportInquirys(response,exportInquirysVO);

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

@@ -28,7 +28,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/retrieval")
-@Api(value = "页面检索API", tags = { "知识库标准化-页面检索API" })
+@Api(value = "页面检索API", tags = { "ICSS三期/知识库标准化-页面检索API" })
 @SuppressWarnings("unchecked")
 public class RetrievalController {
     @Autowired

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

@@ -1,12 +1,7 @@
 package com.diagbot.dto;
 
-import java.util.Date;
 import java.util.List;
 
-import com.diagbot.entity.InquiryDetail;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import io.swagger.annotations.ApiModel;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,108 +10,19 @@ import lombok.Setter;
  * @author: rengb
  * @time: 2018/11/19 18:56
  */
-@ApiModel(value="急诊-历史病历列表接口出参")
 @Getter
 @Setter
 public class HisInquirysForJzDTO{
 	
-    /**
-     * 问诊记录id
-     */
-    private Long inquiryId;
-	
-	/**
-     * 医生id
-     */
-    private Long doctorId;
-	
-    /**
-     * 医生姓名
-     */
-    private String doctorName;
-	
-	/**
-	 * 就诊日期
-	 */
-	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-	private Date inquiryDate;
-	
 	/**
-	 * 就诊时间
+	 * 总条数
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	private Date inquiryTime;
-	
-    /**
-     * 诊断
-     */
-    private String diagnose;
-	
-	/**
-     * 二次诊断的医生id
-     */
-    private Long doctorIdSecond;
-	
-    /**
-     * 二次诊断的医生姓名
-     */
-    private String doctorNameSecond;
+	private Long total;
 	
 	/**
-	 * 二次诊断的就诊时间
+	 * 问诊记录列表
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	private Date inquiryTimeSecond;
-	
-    /**
-     * 二次诊断的诊断
-     */
-    private String diagnoseSecond;
-	
-    /**
-     * 门诊号
-     */
-    private String inquiryCode;
-	
-    /**
-     * 医院科室id
-     */
-    private Long hospitalDeptId;
-	
-    /**
-     * 医院科室名称
-     */
-    private String hospitalDeptName;
-	
-	/**
-     * 病人id
-     */
-    private Long patientId;
-	
-	/**
-     * 病人姓名
-     */
-    private String patientName;
-	
-    /**
-     * 病人性别
-     */
-    private String patientSex;
-	
-    /**
-     * 病人年龄
-     */
-    private Integer patientAge;
-	
-    /**
-     * 病人证件号码
-     */
-    private String patientIdNo;
-    
-	/**
-     * 病历明细
-     */
-	private List<InquiryDetail> detailList;
+	private List<HisInquirysForJzDetailDTO> inquiryList;
 	
 	
 }

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

@@ -0,0 +1,120 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.diagbot.entity.InquiryDetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:56
+ */
+@Getter
+@Setter
+public class HisInquirysForJzDetailDTO{
+	
+    /**
+     * 问诊记录id
+     */
+    private Long inquiryId;
+	
+	/**
+     * 医生id
+     */
+    private Long doctorId;
+	
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+	
+	/**
+	 * 就诊日期
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date inquiryDate;
+	
+	/**
+	 * 就诊时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date inquiryTime;
+	
+    /**
+     * 诊断
+     */
+    private String diagnose;
+	
+	/**
+     * 二次诊断的医生id
+     */
+    private Long doctorIdSecond;
+	
+    /**
+     * 二次诊断的医生姓名
+     */
+    private String doctorNameSecond;
+	
+	/**
+	 * 二次诊断的就诊时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date inquiryTimeSecond;
+	
+    /**
+     * 二次诊断的诊断
+     */
+    private String diagnoseSecond;
+	
+    /**
+     * 门诊号
+     */
+    private String inquiryCode;
+	
+    /**
+     * 医院科室id
+     */
+    private Long hospitalDeptId;
+	
+    /**
+     * 医院科室名称
+     */
+    private String hospitalDeptName;
+	
+	/**
+     * 病人id
+     */
+    private Long patientId;
+	
+	/**
+     * 病人姓名
+     */
+    private String patientName;
+	
+    /**
+     * 病人性别
+     */
+    private String patientSex;
+	
+    /**
+     * 病人年龄
+     */
+    private Integer patientAge;
+	
+    /**
+     * 病人证件号码
+     */
+    private String patientIdNo;
+    
+	/**
+     * 病历明细
+     */
+	private List<InquiryDetail> detailList;
+	
+	
+}

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

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetExportInquirysDTO;
 import com.diagbot.dto.HisInquirysForJzDTO;
+import com.diagbot.dto.HisInquirysForJzDetailDTO;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.entity.PatientInfo;
@@ -110,18 +111,20 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
      * @param hisInquirysForJzVO
      * @return
      */
-    public List<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
-    	IPage<HisInquirysForJzDTO> ipage = this.baseMapper.hisInquirysForJz(hisInquirysForJzVO);
-    	List<HisInquirysForJzDTO> hisInquirysForJzDTOList = ipage.getRecords();
+    public HisInquirysForJzDTO hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO){
+    	HisInquirysForJzDTO hisInquirysForJzDTO = new HisInquirysForJzDTO();
     	
-    	if(ListUtil.isNotEmpty(hisInquirysForJzDTOList)){
-            List<Long> patientIdList = hisInquirysForJzDTOList.stream().map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
-            List<Long> inquiryIdList = hisInquirysForJzDTOList.stream().map(i -> i.getInquiryId()).distinct().collect(Collectors.toList());
+    	IPage<HisInquirysForJzDetailDTO> ipage = this.baseMapper.hisInquirysForJz(hisInquirysForJzVO);
+    	List<HisInquirysForJzDetailDTO> inquiryList = ipage.getRecords();
+    	
+    	if(ListUtil.isNotEmpty(inquiryList)){
+            List<Long> patientIdList = inquiryList.stream().map(i -> i.getPatientId()).distinct().collect(Collectors.toList());
+            List<Long> inquiryIdList = inquiryList.stream().map(i -> i.getInquiryId()).distinct().collect(Collectors.toList());
 
             Map<Long, PatientInfo> patientInfoMap = patientInfoFacade.patientInfoMapByIds(patientIdList);
             Map<Long, List<InquiryDetail>> inquiryDetailListMap = inquiryDetailFacade.getDetailsByInquryIds(inquiryIdList);
         	
-            hisInquirysForJzDTOList.forEach(i -> {
+            inquiryList.forEach(i -> {
                 PatientInfo patientInfo = patientInfoMap.get(i.getPatientId());
                 if (patientInfo != null) {
                     i.setPatientName(patientInfo.getName());
@@ -137,7 +140,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
             });
     	}
     	
-    	return hisInquirysForJzDTOList;
+    	hisInquirysForJzDTO.setInquiryList(inquiryList);
+    	hisInquirysForJzDTO.setTotal(ipage.getTotal());
+    	
+    	return hisInquirysForJzDTO;
     }
     
     

tran-service/src/main/java/com/diagbot/mapper/InquiryInfoMapper.java

@@ -1,10 +1,10 @@
 package com.diagbot.mapper;
 
-import com.diagbot.dto.HisInquirysForJzDTO;
-import com.diagbot.entity.InquiryInfo;
-import com.diagbot.vo.HisInquirysForJzVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.HisInquirysForJzDetailDTO;
+import com.diagbot.entity.InquiryInfo;
+import com.diagbot.vo.HisInquirysForJzVO;
 
 /**
  * <p>
@@ -16,6 +16,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  */
 public interface InquiryInfoMapper extends BaseMapper<InquiryInfo> {
 	
-	IPage<HisInquirysForJzDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO);
+	IPage<HisInquirysForJzDetailDTO> hisInquirysForJz(HisInquirysForJzVO hisInquirysForJzVO);
 
 }

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

@@ -4,7 +4,6 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import io.swagger.annotations.ApiModel;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,7 +12,6 @@ import lombok.Setter;
  * @author: rengb
  * @time: 2018/11/19 18:58
  */
-@ApiModel(value="急诊-历史病历列表接口传参")
 @SuppressWarnings({ "rawtypes", "serial" })
 @Getter
 @Setter

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

@@ -59,7 +59,7 @@ public class InquiryInfoController {
 	 @PostMapping("/hisInquirysForJz")
 	 @SysLogger("hisInquirysForJz")
 	 @ApiIgnore
-	 public RespDTO<List<HisInquirysForJzDTO>> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
+	 public RespDTO<HisInquirysForJzDTO> hisInquirysForJz(@RequestBody HisInquirysForJzVO hisInquirysForJzVO) {
 		 return RespDTO.onSuc(inquiryInfoFacade.hisInquirysForJz(hisInquirysForJzVO));
 	 }
 	 

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

@@ -21,7 +21,7 @@
         <result column="remark" property="remark" />
     </resultMap>
     
-    <select id="hisInquirysForJz" resultType="com.diagbot.dto.HisInquirysForJzDTO">
+    <select id="hisInquirysForJz" resultType="com.diagbot.dto.HisInquirysForJzDetailDTO">
     	SELECT
 		a.id AS inquiryId,
 		a.doctor_id AS doctorId,