历史病历更新

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

@@ -18,6 +18,8 @@ import lombok.Setter;
 @Setter
 public class GetInquiryDetailDTO {
 	
+    private String dataJson;
+	
 	private List<InquiryDetail> inquiryDetailList;
 	
 	

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

@@ -57,11 +57,11 @@ public class HisInquiryDTO{
 	@ApiModelProperty(value="类型：0：结构化 1：文本模式")
     private Integer sign;
 
-    /**
-     * 内容JSON字符串
-     */
-	@ApiModelProperty(value="内容JSON字符串")
-    private String dataJson;
+//    /**
+//     * 内容JSON字符串
+//     */
+//	@ApiModelProperty(value="内容JSON字符串")
+//    private String dataJson;
 	
 	
 	/**

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

@@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
@@ -296,47 +298,35 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @param hisInquirysVO
      * @return
      */
-    public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
-        QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        queryWrapper.eq("hospital_id", hisInquirysVO.getHospitalId());
-        if (hisInquirysVO.getHospitalDeptId() != null) {
-            queryWrapper.eq("hospital_dept_id", hisInquirysVO.getHospitalDeptId());
-        }
-        if (hisInquirysVO.getDoctorId() != null) {
-            queryWrapper.eq("doctor_id", hisInquirysVO.getDoctorId());
-        }
-        if (hisInquirysVO.getPatientId() != null) {
-            queryWrapper.eq("patient_id", hisInquirysVO.getPatientId());
-        }
-        if (hisInquirysVO.getType() != null) {
-            queryWrapper.eq("type", hisInquirysVO.getType());
-        }
-        if (hisInquirysVO.getSign() != null) {
-            queryWrapper.eq("sign", hisInquirysVO.getSign());
-        }
-        if (hisInquirysVO.getStartDate() != null) {
-            queryWrapper.ge("gmt_create", hisInquirysVO.getStartDate());
-        }
-        if (hisInquirysVO.getEndDate() != null) {
-            queryWrapper.le("gmt_create", hisInquirysVO.getEndDate());
-        }
-        if (hisInquirysVO.getOrderType() == 1) {
-            queryWrapper.orderByDesc("gmt_modified");
-        } else if (hisInquirysVO.getOrderType() == 2) {
-            queryWrapper.orderByAsc("gmt_modified");
-        }
-
+    public IPage<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
+    	Page<HisInquiryDTO> hisInquiryDTOPage = new Page<>();
+    	
+        QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
+        inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        inquiryInfoQe.eq("hospital_id", hisInquirysVO.getHospitalId());
+        inquiryInfoQe.eq(hisInquirysVO.getHospitalDeptId() != null, "hospital_dept_id", hisInquirysVO.getHospitalDeptId());
+        inquiryInfoQe.eq(hisInquirysVO.getDoctorId() != null, "doctor_id", hisInquirysVO.getDoctorId());
+        inquiryInfoQe.eq(hisInquirysVO.getPatientId() != null, "patient_id", hisInquirysVO.getPatientId());
+        inquiryInfoQe.eq(hisInquirysVO.getType() != null, "type", hisInquirysVO.getType());
+        inquiryInfoQe.eq(hisInquirysVO.getSign() != null, "sign", hisInquirysVO.getSign());
+        inquiryInfoQe.ge(hisInquirysVO.getStartDate() != null, "gmt_create", hisInquirysVO.getStartDate());
+        inquiryInfoQe.le(hisInquirysVO.getEndDate() != null, "gmt_create", hisInquirysVO.getEndDate());
+        inquiryInfoQe.orderByDesc(hisInquirysVO.getOrderType() == 1,"gmt_modified");
+        inquiryInfoQe.orderByAsc(hisInquirysVO.getOrderType() == 2, "gmt_modified");
+        
         if (hisInquirysVO.getDisType() == 1) {
             Date nowDate = DateUtil.now();
             Date lastDate = DateUtil.addMonth(nowDate, -6);
-            queryWrapper.ge("gmt_create", lastDate);
-            queryWrapper.le("gmt_create", nowDate);
-            queryWrapper.likeRight("diagnose", hisInquirysVO.getDisName());
+            inquiryInfoQe.ge("gmt_create", lastDate);
+            inquiryInfoQe.le("gmt_create", nowDate);
+            inquiryInfoQe.likeRight("diagnose", hisInquirysVO.getDisName());
         }
 
-
-        List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
+        Page<InquiryInfo> inquiryInfoPage = new Page<>(hisInquirysVO.getCurrent(),hisInquirysVO.getSize());
+        IPage<InquiryInfo> iPage = this.page(inquiryInfoPage, inquiryInfoQe);
+    	BeanUtil.copyProperties(iPage, hisInquiryDTOPage);
+        
+        List<InquiryInfo> inquiryInfoList = iPage.getRecords();
         if (inquiryInfoList.size() == 0) {
             return null;
         }
@@ -371,8 +361,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             hisInquiryDTOList.add(hisInquiryDTO);
         });
 
-
-        return hisInquiryDTOList;
+        hisInquiryDTOPage.setRecords(hisInquiryDTOList);
+        return hisInquiryDTOPage;
     }
     
     /**
@@ -450,9 +440,11 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      */
     public GetInquiryDetailDTO getInquiryDetail(GetInquiryDetailVO getInquiryDetailVO) {
         GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
-
+        
+        InquiryInfo inquiryInfo = this.getById(getInquiryDetailVO.getInquiryId());
         List<InquiryDetail> inquiryDetailList = inquiryDetailFacade.getListByInquryId(getInquiryDetailVO.getInquiryId());
-
+        
+        getInquiryDetailDTO.setDataJson(inquiryInfo.getDataJson());
         getInquiryDetailDTO.setInquiryDetailList(inquiryDetailList);
 
         return getInquiryDetailDTO;

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

@@ -23,6 +23,16 @@ import lombok.Setter;
 @Setter
 public class HisInquirysVO {
 	
+    /**
+     * 每页显示条数，默认 10
+     */
+    private long size = 10;
+    
+    /**
+     * 当前页
+     */
+    private long current = 1;
+	
 	/**
      * 医院id
      */

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
@@ -78,7 +79,7 @@ public class InquiryInfoController {
     @ApiOperation(value = "历史病历列表[by:rengb]")
     @PostMapping("/hisInquirys")
     @SysLogger("hisInquirys")
-    public RespDTO<List<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
+    public RespDTO<IPage<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
         return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
     }