|
@@ -9,6 +9,7 @@ import com.diagbot.entity.Client;
|
|
|
import com.diagbot.entity.InquiryDetail;
|
|
|
import com.diagbot.entity.InquiryInfo;
|
|
|
import com.diagbot.entity.JSONResponseBean;
|
|
|
+import com.diagbot.entity.Option;
|
|
|
import com.diagbot.entity.Request;
|
|
|
import com.diagbot.entity.Response;
|
|
|
import com.diagbot.enums.IdTypeEnum;
|
|
@@ -32,6 +33,7 @@ import com.diagbot.vo.InquiryPatInquiryVO;
|
|
|
import com.diagbot.vo.InquiryPatVO;
|
|
|
import com.diagbot.vo.SaveInquiryDetailVO;
|
|
|
import com.diagbot.vo.SaveInquiryVO;
|
|
|
+import com.diagbot.web.GetInquiryDetailDTO;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -190,17 +192,29 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
|
|
|
return this.getPatInquiryList(inquiryPatInquiryVO);
|
|
|
}
|
|
|
|
|
|
- public List<InquiryDTO> getInquirysByMech(InquiryMechVO inquiryMechVO){
|
|
|
+ public List<InquiryDTO> getInquirysByMech(InquiryMechVO inquiryMechVO) {
|
|
|
return this.getInquirysByMechId(inquiryMechVO);
|
|
|
}
|
|
|
|
|
|
- public List<InquiryDetail> getDetail(InquiryDetailVO inquiryDetailVO) {
|
|
|
+ public List<GetInquiryDetailDTO> getDetail(InquiryDetailVO inquiryDetailVO) {
|
|
|
List<InquiryDetail> list = inquiryDetailFacade.list(new QueryWrapper<InquiryDetail>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("inquiry_id", inquiryDetailVO.getId())
|
|
|
.orderByAsc("id")
|
|
|
);
|
|
|
- return list;
|
|
|
+
|
|
|
+ List<GetInquiryDetailDTO> resList = new ArrayList<>();
|
|
|
+ if (ListUtil.isNotEmpty(list)) {
|
|
|
+ for (InquiryDetail inquiryDetail : list) {
|
|
|
+ GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
|
|
|
+ BeanUtil.copyProperties(inquiryDetail, getInquiryDetailDTO);
|
|
|
+ if (StringUtil.isNotBlank(inquiryDetail.getRemark())) {
|
|
|
+ getInquiryDetailDTO.setOptions(GsonUtil.toList(inquiryDetail.getRemark(), Option.class));
|
|
|
+ }
|
|
|
+ resList.add(getInquiryDetailDTO);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return resList;
|
|
|
}
|
|
|
|
|
|
|