心理健康评审

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

@@ -21,4 +21,10 @@ public class SaveInquiryDTO {
     @ApiModelProperty(value = "纳里返回的url")
     private String body;
 
+    private String response;
+
+    private String request;
+
+    private String requestBodys;
+
 }

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

@@ -4,19 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.InquiryDTO;
 import com.diagbot.dto.InquiryPatDTO;
-import com.diagbot.entity.Client;
+import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
-import com.diagbot.entity.JSONResponseBean;
-import com.diagbot.entity.Request;
-import com.diagbot.entity.Response;
 import com.diagbot.enums.IdTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.HttpUtils;
 import com.diagbot.util.IdCard;
 import com.diagbot.util.IntegerUtil;
@@ -26,18 +22,14 @@ import com.diagbot.vo.InquiryDetailVO;
 import com.diagbot.vo.InquiryPatInquiryVO;
 import com.diagbot.vo.InquiryPatVO;
 import com.diagbot.vo.SaveInquiryVO;
-import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:
@@ -65,10 +57,19 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     @Value("${nali.appSecret}")
     private String appSecret;
 
-    public void saveInquiry(SaveInquiryVO saveInquiryVO) {
+    public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO) {
         if (StringUtil.isBlank(saveInquiryVO.getHospitalCode())) {
             saveInquiryVO.setHospitalCode("朗通通用");
         }
+
+        SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
+//        List<String> naliRetList = getUrl(saveInquiryVO);
+//        String retUrl = naliRetList.get(0);
+//        saveInquiryDTO.setBody(retUrl);
+//        saveInquiryDTO.setResponse(naliRetList.get(1));
+//        saveInquiryDTO.setRequest(naliRetList.get(2));
+//        saveInquiryDTO.setRequestBodys(naliRetList.get(3));
+
         Date now = DateUtil.now();
         InquiryInfo inquiryInfo = null;
         // 如果是身份证，获取性别和年龄
@@ -139,6 +140,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         hospitalVO.setHospitalCode(saveInquiryVO.getHospitalCode());
         // 保存记录表
         optInfoFacade.saveOptOnfo(hospitalVO, "2");
+
+        return saveInquiryDTO;
     }
 
 

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

@@ -41,7 +41,7 @@ public class InquiryInfoController {
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
     @Transactional
-    public RespDTO<Boolean> saveInquiry(@RequestBody SaveInquiryVO saveInquiryVO) {
+    public RespDTO<SaveInquiryDTO> saveInquiry(@RequestBody SaveInquiryVO saveInquiryVO) {
         inquiryInfoFacade.saveInquiry(saveInquiryVO);
         return RespDTO.onSuc(true);
     }