获取所有历史记录支持机器编码

xlcs-service/src/main/java/com/diagbot/dto/HistoryInquiryDTO.java

@@ -1,6 +1,5 @@
 package com.diagbot.dto;
 
-import com.diagbot.vo.SaveInquiryDetailVO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,7 +13,6 @@ import java.util.List;
 @Getter
 @Setter
 public class HistoryInquiryDTO {
-    private List<SaveInquiryDetailVO> detailList;
     private Long id;
     private String anxietyPoint;
     private String anxietyRange;
@@ -24,4 +22,5 @@ public class HistoryInquiryDTO {
     private String depressionRange;
     private String depressionJudge;
     private String depressionAdvise;
+    private List<GetInquiryDetailDTO> detailList;
 }

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

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.HistoryInquiryDTO;
 import com.diagbot.dto.InquiryDTO;
 import com.diagbot.dto.InquiryPatDTO;
@@ -15,6 +16,8 @@ import com.diagbot.entity.Request;
 import com.diagbot.entity.Response;
 import com.diagbot.enums.IdTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.idc.VisibleIdCreater;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
@@ -36,7 +39,6 @@ import com.diagbot.vo.InquiryPatInquiryVO;
 import com.diagbot.vo.InquiryPatVO;
 import com.diagbot.vo.SaveInquiryDetailVO;
 import com.diagbot.vo.SaveInquiryVO;
-import com.diagbot.dto.GetInquiryDetailDTO;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -105,7 +107,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
                 && StringUtil.isNotBlank(saveInquiryVO.getPatName())
                 && !IntegerUtil.isNull(saveInquiryVO.getIdType())
                 && StringUtil.isNotBlank(saveInquiryVO.getIdNum())) {
-            if (sysSetFacade.isCover(saveInquiryVO.getHospitalCode())){
+            if (sysSetFacade.isCover(saveInquiryVO.getHospitalCode())) {
                 String dateStr = DateUtil.formatDate(now);
                 inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -233,12 +235,29 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @return
      */
     public List<HistoryInquiryDTO> getHistoryInquiry(HistoryInquiryVO historyInquiryVO) {
+        //入参验证
+        if (null == historyInquiryVO) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入获取历史记录的参数！");
+        }
+
+        if (StringUtil.isBlank(historyInquiryVO.getHospitalCode())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入医院名称！");
+        }
+
+        if (StringUtil.isBlank(historyInquiryVO.getMachineId())) {
+            if (StringUtil.isBlank(historyInquiryVO.getPatName()) || StringUtil.isBlank(historyInquiryVO.getIdNum())) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入机器ID或者同时输入证件号码和对应的姓名！");
+            }
+        }
+
+        //业务获取
         List<HistoryInquiryDTO> historyInquiryDTOList = Lists.newLinkedList();
         QueryWrapper<InquiryInfo> inquiryInfoQueryWrapper = new QueryWrapper<>();
         inquiryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_code", historyInquiryVO.getHospitalCode())
-                .eq("pat_name", historyInquiryVO.getPatName())
-                .eq("id_num", historyInquiryVO.getIdNum())
+                .eq(StringUtil.isNotBlank(historyInquiryVO.getPatName()), "pat_name", historyInquiryVO.getPatName())
+                .eq(StringUtil.isNotBlank(historyInquiryVO.getIdNum()), "id_num", historyInquiryVO.getIdNum())
+                .eq(StringUtil.isNotBlank(historyInquiryVO.getMachineId()), "machine_id", historyInquiryVO.getMachineId())
                 .orderByAsc("gmt_modified");
         List<InquiryInfo> inquiryInfoList = this.list(inquiryInfoQueryWrapper);
         if (ListUtil.isNotEmpty(inquiryInfoList)) {
@@ -253,17 +272,17 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
                 HistoryInquiryDTO historyInquiryDTO = new HistoryInquiryDTO();
                 BeanUtil.copyProperties(inquiryInfo, historyInquiryDTO);
                 List<InquiryDetail> details = detailMap.get(inquiryInfo.getId());
-                List<SaveInquiryDetailVO> saveInquiryDetailVOList = Lists.newLinkedList();
+                List<GetInquiryDetailDTO> getInquiryDetailDTOList = Lists.newLinkedList();
                 if (ListUtil.isNotEmpty(details)) {
                     for (InquiryDetail inquiryDetail : details) {
-                        SaveInquiryDetailVO saveInquiryDetailVO = new SaveInquiryDetailVO();
-                        BeanUtil.copyProperties(inquiryDetail, saveInquiryDetailVO);
+                        GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
+                        BeanUtil.copyProperties(inquiryDetail, getInquiryDetailDTO);
                         if (StringUtil.isNotBlank(inquiryDetail.getRemark())) {
-                            saveInquiryDetailVO.setOptions(FastJsonUtils.getJsonToList(inquiryDetail.getRemark(), Option.class));
+                            getInquiryDetailDTO.setOptions(GsonUtil.toList(inquiryDetail.getRemark(), Option.class));
                         }
-                        saveInquiryDetailVOList.add(saveInquiryDetailVO);
+                        getInquiryDetailDTOList.add(getInquiryDetailDTO);
                     }
-                    historyInquiryDTO.setDetailList(saveInquiryDetailVOList);
+                    historyInquiryDTO.setDetailList(getInquiryDetailDTOList);
                 }
                 historyInquiryDTOList.add(historyInquiryDTO);
             }

xlcs-service/src/main/java/com/diagbot/vo/HistoryInquiryVO.java

@@ -15,14 +15,21 @@ import javax.validation.constraints.NotBlank;
 @Setter
 public class HistoryInquiryVO {
     @ApiModelProperty(value = "医院名称", required = true)
-    @NotBlank(message = "请输入医院编码")
+//    @NotBlank(message = "请输入医院编码")
     private String hospitalCode;
 
-    @NotBlank(message = "请输入姓名")
-    @ApiModelProperty(value = "姓名", required = true)
+//    @NotBlank(message = "请输入姓名")
+    @ApiModelProperty(value = "姓名")
     private String patName;
 
-    @NotBlank(message = "请输入证件号")
-    @ApiModelProperty(value = "证件号", required = true)
+//    @NotBlank(message = "请输入证件号")
+    @ApiModelProperty(value = "证件号")
     private String idNum;
+
+    /**
+     * 机器ID
+     */
+//    @NotBlank(message = "请输入机器ID")
+    @ApiModelProperty(value = "机器ID")
+    private String machineId;
 }

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

@@ -105,7 +105,8 @@ public class InquiryInfoController {
     @ApiOperation(value = "获取历史记录[by:zhaops]",
             notes = "hospitalCode：医院名称<br>" +
                     "patName：病人姓名<br>" +
-                    "idNum：证件号码<br>")
+                    "idNum：证件号码<br>" +
+                    "machineId：机器ID<br>")
     @PostMapping("/getHistoryInquiry")
     @SysLogger("getHistoryInquiry")
     public RespDTO<List<HistoryInquiryDTO>> getHistoryInquiry(@RequestBody HistoryInquiryVO historyInquiryVO) {