最近一次其他史修改

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

@@ -0,0 +1,30 @@
+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;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2019/01/14 45:00
+ */
+@ApiModel(value="获取最近一次其他史信息接口出参")
+@Getter
+@Setter
+public class GetLastOtherDTO {
+	
+	/**
+	 * 内容JSON字符串
+	 */
+	@ApiModelProperty(value="内容JSON字符串")
+	private String dataJson;
+	
+	private List<InquiryDetail> detailList;
+	
+}

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

@@ -8,13 +8,13 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.diagbot.enums.IsDeleteEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetInquiryDetailDTO;
+import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.SaveInquiryDTO;
@@ -24,6 +24,7 @@ import com.diagbot.entity.HospitalInfo;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.entity.PatientInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.SexTypeEnum;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -153,7 +154,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @param getLastOtherVO
      * @return
      */
-    public String getLastOther(GetLastOtherVO getLastOtherVO) {
+    public GetLastOtherDTO getLastOther(GetLastOtherVO getLastOtherVO) {
+    	GetLastOtherDTO getLastOtherDTO = new GetLastOtherDTO();
+    	
         HospitalInfo hospitalInfo = hospitalInfoFacade.getHospitalByCode(getLastOtherVO.getHospitalCode());
         PatientInfo patientInfo = patientInfoFacade.getPatientByCode(getLastOtherVO.getHospitalCode(), getLastOtherVO.getPatientCode());
 
@@ -164,10 +167,14 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         InquiryInfo inquiryInfo = baseMapper.getPatientLast(map);
 
         if (inquiryInfo != null) {
-        	return inquiryInfo.getDataJson();
-        }else{
-        	return null;
+        	getLastOtherDTO.setDataJson(inquiryInfo.getDataJson());
+        	
+        	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()));
         }
+        
+        return getLastOtherDTO;
     }
 
     /**

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetInquiryDetailDTO;
+import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
@@ -59,7 +60,7 @@ public class InquiryInfoController {
     @ApiOperation(value = "获取最近一次其他史信息[by:rengb]")
     @PostMapping("/getLastOther")
     @SysLogger("getLastOther")
-    public RespDTO<String> getLastOther(@Valid @RequestBody GetLastOtherVO getLastOtherVO) {
+    public RespDTO<GetLastOtherDTO> getLastOther(@Valid @RequestBody GetLastOtherVO getLastOtherVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getLastOther(getLastOtherVO));
     }