Browse Source

最近一次其他史修改2

rgb 6 years ago
parent
commit
f3313a312b

+ 5 - 5
icss-service/src/main/java/com/diagbot/dto/GetLastOtherDTO.java

@@ -1,9 +1,5 @@
 package com.diagbot.dto;
 
-import java.util.List;
-
-import com.diagbot.entity.InquiryDetail;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -25,6 +21,10 @@ public class GetLastOtherDTO {
 	@ApiModelProperty(value="内容JSON字符串")
 	private String dataJson;
 	
-	private List<InquiryDetail> detailList;
+	/**
+	 * 问诊明细中的其他史
+	 */
+	@ApiModelProperty(value="问诊明细中的其他史")
+	private String otherStr;
 	
 }

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

@@ -171,9 +171,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         	
         	QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
             inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
-            getLastOtherDTO.setDetailList(inquiryDetailFacade.list(inquiryDetailQe).stream().sorted((a,b)->a.getType()-b.getType()).collect(Collectors.toList()));
+            inquiryDetailQe.eq("type", 3);
+            InquiryDetail inquiryDetail = inquiryDetailFacade.getOne(inquiryDetailQe);
+            if(inquiryDetail!=null){
+            	getLastOtherDTO.setOtherStr(inquiryDetail.getContent());
+            }
         }
-        
         return getLastOtherDTO;
     }