修复检验检查

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/ThyyThirdpartApiApplication.java

@@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @SpringBootApplication
 @ComponentScan("org.thyy.*")
-@MapperScan("org.thyy.thirdpartapi.inspection.dao")
+@MapperScan("org.thyy.thirdpartapi.*.dao")
 public class ThyyThirdpartApiApplication {
     public static void main(String[] args) {
         SpringApplication.run(ThyyThirdpartApiApplication.class, args);

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/hlyy/service/RationalUseDao.java → thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/hlyy/dao/RationalUseDao.java

@@ -1,4 +1,4 @@
-package org.thyy.thirdpartapi.hlyy.service;
+package org.thyy.thirdpartapi.hlyy.dao;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,7 +10,6 @@ import org.thyy.thirdpartapi.data.UserInfo;
 import org.thyy.thirdpartapi.hlyy.dto.*;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface RationalUseDao {

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/hlyy/service/RationalUseService.java

@@ -8,12 +8,14 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.thyy.thirdpartapi.HospConfig;
 import org.thyy.thirdpartapi.data.UserInfo;
 import org.thyy.thirdpartapi.hlyy.RationalUse;
 import org.thyy.thirdpartapi.hlyy.config.Config;
+import org.thyy.thirdpartapi.hlyy.dao.RationalUseDao;
 import org.thyy.thirdpartapi.hlyy.dto.*;
 import org.thyy.thirdpartapi.hlyy.vo.ExaminingParty;
 import org.thyy.utils.exception.BizException;

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/InspectionController.java

@@ -34,7 +34,7 @@ public class InspectionController {
     }
 
     @PostMapping("/queryJyDetail")
-    public ResultVo<JyDetailResponse> queryJyDetail(@RequestBody ReportIndexInquiry request) {
+    public ResultVo<JyDetailResponse> queryJyDetail(@RequestBody ReportDetailInquiry request) {
         JyDetailResponse response = service.queryJyDetail(request);
         return R.ok(response);
     }

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/InspectionInterface.java

@@ -17,7 +17,7 @@ public interface InspectionInterface {
 
     List<JyIndexResponse> queryJyIndex(ReportIndexInquiry request);
 
-    JyDetailResponse queryJyDetail(ReportIndexInquiry request);
+    JyDetailResponse queryJyDetail(ReportDetailInquiry request);
 
     List<JcIndexResponse> queryJcIndex(ReportIndexInquiry request);
 

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/inspectionImpl/ThyyInspectionImpl.java

@@ -14,6 +14,7 @@ import org.thyy.thirdpartapi.inspection.config.InspectionApi;
 import org.thyy.thirdpartapi.inspection.dao.InspectionDao;
 import org.thyy.thirdpartapi.inspection.request.ReportDetailInquiry;
 import org.thyy.thirdpartapi.inspection.request.ReportIndexInquiry;
+import org.thyy.thirdpartapi.inspection.request.jy.JyRequest;
 import org.thyy.thirdpartapi.inspection.response.bl.BlIndexResponse;
 import org.thyy.thirdpartapi.inspection.response.jc.JcIndexResponse;
 import org.thyy.thirdpartapi.inspection.response.jy.*;
@@ -44,14 +45,20 @@ public class ThyyInspectionImpl implements InspectionInterface {
         if (StrUtil.isBlank(apiConfig.getJy())) {
             return new ArrayList<>();
         }
-        JSONObject response = template.postForObject(apiConfig.getJy() + "/self", request, JSONObject.class);
+        JyRequest jyRequest = JyRequest.builder()
+                .patientNumType(request.getPatType())
+                .patientNum(request.getPatNo())
+                .startDate(request.getReqStartTime())
+                .endDate(request.getReqEndTime())
+                .build();
+        JSONObject response = template.postForObject(apiConfig.getJy() + "/self", jyRequest, JSONObject.class);
         JSONObject data = getJyJsonData(response);
         String items = JSON.toJSONString(data.getJSONArray("items"));
         return JSON.parseArray(items, JyIndexResponse.class);
     }
 
     @Override
-    public JyDetailResponse queryJyDetail(ReportIndexInquiry request) {
+    public JyDetailResponse queryJyDetail(ReportDetailInquiry request) {
         if (StrUtil.isBlank(apiConfig.getJy())) {
             return null;
         }

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/request/jy/JyRequest.java

@@ -0,0 +1,14 @@
+package org.thyy.thirdpartapi.inspection.request.jy;
+
+import lombok.Builder;
+import lombok.Data;
+import org.thyy.thirdpartapi.inspection.config.PatientNumType;
+
+@Data
+@Builder
+public class JyRequest {
+    private PatientNumType patientNumType;
+    private String patientNum;
+    private String startDate;
+    private String endDate;
+}