检验检查的查询时间范围添加时分秒

src/main/java/thyyxxk/wxservice_server/controller/InspectionsController.java

@@ -30,33 +30,41 @@ public class InspectionsController {
     }
 
     @PostMapping("/checkExamIndex")
-    public ResultVo<List<ExamIndexResponse>> checkExamIndex(@RequestBody ReportIndexInquiry inquiry) {
-        return ResultVoUtil.success(service.checkExamIndex(inquiry));
+    public ResultVo<List<ExamIndexResponse>> checkExamIndex(@RequestBody ReportIndexInquiry request) {
+        request.setReqStartTime(request.getReqStartTime() + " 00:00:00");
+        request.setReqEndTime(request.getReqEndTime() + " 23:59:59");
+        return ResultVoUtil.success(service.checkExamIndex(request));
     }
 
     @PostMapping("/checkExamDetail")
-    public ResultVo<ExamDetailResponse> checkExamDetail(@RequestBody ReportDetailInquiry param) {
-        return ResultVoUtil.success(service.checkExamDetail(param));
+    public ResultVo<ExamDetailResponse> checkExamDetail(@RequestBody ReportDetailInquiry request) {
+        return ResultVoUtil.success(service.checkExamDetail(request));
     }
 
     @PostMapping("/checkTestIndex")
-    public ResultVo<List<TestReport>> checkTestIndex(@RequestBody ReportIndexInquiry inquiry) {
-        return ResultVoUtil.success(service.checkTestIndex(inquiry));
+    public ResultVo<List<TestReport>> checkTestIndex(@RequestBody ReportIndexInquiry request) {
+        request.setReqStartTime(request.getReqStartTime() + " 00:00:00");
+        request.setReqEndTime(request.getReqEndTime() + " 23:59:59");
+        return ResultVoUtil.success(service.checkTestIndex(request));
     }
 
     @PostMapping("/checkTestDetail")
-    public ResultVo<TestReport> checkTestDetail(@RequestBody ReportDetailInquiry param) {
-        return ResultVoUtil.success(service.checkTestDetail(param));
+    public ResultVo<TestReport> checkTestDetail(@RequestBody ReportDetailInquiry request) {
+        return ResultVoUtil.success(service.checkTestDetail(request));
     }
 
     @PostMapping("/checkPathologyIndex")
     public ResultVo<List<PathologyIndex>> checkPathologyIndex(@RequestBody ReportIndexInquiry request) {
+        request.setReqStartTime(request.getReqStartTime() + " 00:00:00");
+        request.setReqEndTime(request.getReqEndTime() + " 23:59:59");
         return ResultVoUtil.success(service.checkPathologyIndex(request));
     }
 
     @PostMapping("/checkElectroIndex")
-    public ResultVo<List<ElectroIndex>> checkElectroIndex(@RequestBody ReportIndexInquiry inquiry) {
-        return ResultVoUtil.success(service.checkElectroIndex(inquiry));
+    public ResultVo<List<ElectroIndex>> checkElectroIndex(@RequestBody ReportIndexInquiry request) {
+        request.setReqStartTime(request.getReqStartTime() + " 00:00:00");
+        request.setReqEndTime(request.getReqEndTime() + " 23:59:59");
+        return ResultVoUtil.success(service.checkElectroIndex(request));
     }
 
     @PostMapping("/fetchReportImage")

src/main/java/thyyxxk/wxservice_server/factory/pathology/PathologyService.java

@@ -25,7 +25,6 @@ public class PathologyService {
     }
 
     public List<PathologyIndex> queryOutpatientPathologyIndex(ReportIndexInquiry request) {
-        expandTimeRange(request);
         String url = StrUtil.format(URL, request.getReqStartTime(),
                 request.getReqEndTime(), request.getSocialNo());
         List<PathologyIndex> pathologyIndexList = new ArrayList<>();
@@ -35,7 +34,7 @@ public class PathologyService {
         }
         int code = response.getIntValue("code");
         if (code != 1) {
-            throw new BizException(response.getString("message"));
+            throw new BizException("病理查询系统接口出错：" + response.getString("message"));
         }
         JSONArray rows = response.getJSONArray("data");
         if (null != rows && !rows.isEmpty()) {
@@ -47,10 +46,4 @@ public class PathologyService {
         }
         return pathologyIndexList;
     }
-
-    private void expandTimeRange(ReportIndexInquiry inquiry) {
-        inquiry.setReqStartTime(inquiry.getReqStartTime() + " 00:00:00");
-        inquiry.setReqEndTime(inquiry.getReqEndTime() + " 23:59:59");
-    }
-
 }

src/main/java/thyyxxk/wxservice_server/service/InspectionsService.java

@@ -55,69 +55,68 @@ public class InspectionsService {
         this.electroService = electroService;
     }
 
-    public List<ExamIndexResponse> checkExamIndex(ReportIndexInquiry inquiry) {
-        inquiry.setOpenid(TokenUtil.getInstance().getUserOpenid());
-        int exist = dao.selectPatIdAndOpenidMatchCount(inquiry.getPatientId(), inquiry.getOpenid());
+    public List<ExamIndexResponse> checkExamIndex(ReportIndexInquiry request) {
+        request.setOpenid(TokenUtil.getInstance().getUserOpenid());
+        int exist = dao.selectPatIdAndOpenidMatchCount(request.getPatientId(), request.getOpenid());
         if (exist == 0) {
             throw new BizException(ExceptionEnum.TOKEN_ERROR);
         }
-        healthCardService.reportHisData(inquiry.getPatientId(), "0101082", null ,null);
+        healthCardService.reportHisData(request.getPatientId(), "0101082", null ,null);
         List<ExamIndexRequest> requestList = new ArrayList<>();
         requestList.add(new ExamIndexRequest.Builder()
-                .patientNumType("OutPatient").patientNum(inquiry.getPatientId())
-                .startDate(inquiry.getReqStartTime()).endDate(inquiry.getReqEndTime()).build());
+                .patientNumType("OutPatient").patientNum(request.getPatientId())
+                .startDate(request.getReqStartTime()).endDate(request.getReqEndTime()).build());
 
-        ResultVo<List<Map<String, String>>> response = thmzService.getParentIdByPatientId(inquiry.getPatientId());
+        ResultVo<List<Map<String, String>>> response = thmzService.getParentIdByPatientId(request.getPatientId());
         if (response.getCode() == ExceptionEnum.SUCCESS.getCode()) {
             List<Map<String, String>> list = response.getData();
             String patientId = list.get(0).get("parentPatientId");
             requestList.add(new ExamIndexRequest.Builder()
                     .patientNumType("OutPatient").patientNum(patientId)
-                    .startDate(inquiry.getReqStartTime()).endDate(inquiry.getReqEndTime()).build());
+                    .startDate(request.getReqStartTime()).endDate(request.getReqEndTime()).build());
         }
-        final String tjNo = dao.selectTjNo(inquiry.getPatientId());
+        final String tjNo = dao.selectTjNo(request.getPatientId());
         if (StringUtil.notBlank(tjNo)) {
             requestList.add(new ExamIndexRequest.Builder()
                     .patientNumType("Pis").patientNum(tjNo)
-                    .startDate(inquiry.getReqStartTime()).endDate(inquiry.getReqEndTime()).build());
+                    .startDate(request.getReqStartTime()).endDate(request.getReqEndTime()).build());
         }
-        List<String> inpatientNos = inpatientService.getInpatientNoByPatientId(inquiry.getPatientId());
+        List<String> inpatientNos = inpatientService.getInpatientNoByPatientId(request.getPatientId());
         for (String inpatientNo : inpatientNos) {
             requestList.add(new ExamIndexRequest.Builder()
                     .patientNumType("InPatient").patientNum(inpatientNo)
-                    .startDate(inquiry.getReqStartTime()).endDate(inquiry.getReqEndTime()).build());
+                    .startDate(request.getReqStartTime()).endDate(request.getReqEndTime()).build());
         }
 
         List<ExamIndexResponse> list = new ArrayList<>();
-        for (ExamIndexRequest request : requestList) {
-            list.addAll(examReportService.queryExamIndex(request));
+        for (ExamIndexRequest requestItem : requestList) {
+            list.addAll(examReportService.queryExamIndex(requestItem));
         }
         list.removeIf(item -> Objects.equals(item.getPatientNumType(), "3"));
         list.sort(Comparator.comparing(ExamIndexResponse::getTrscDate).reversed());
         return list;
     }
 
-    public ExamDetailResponse checkExamDetail(ReportDetailInquiry param) {
-        if (StringUtil.isBlank(param.getReportId())) {
+    public ExamDetailResponse checkExamDetail(ReportDetailInquiry request) {
+        if (StringUtil.isBlank(request.getReportId())) {
             throw new BizException("报告ID不能为空！");
         }
-        param.setOpenid(TokenUtil.getInstance().getUserOpenid());
-        int exist = dao.selectPatIdAndOpenidMatchCount(param.getPatientId(), param.getOpenid());
+        request.setOpenid(TokenUtil.getInstance().getUserOpenid());
+        int exist = dao.selectPatIdAndOpenidMatchCount(request.getPatientId(), request.getOpenid());
         if (exist == 0) {
             throw new BizException(ExceptionEnum.TOKEN_ERROR);
         }
-        ExamDetailResponse response = examReportService.queryExamDetail(param.getReportId());
-        response.setPics(examReportService.queryExamPic(param.getReportId()));
+        ExamDetailResponse response = examReportService.queryExamDetail(request.getReportId());
+        response.setPics(examReportService.queryExamPic(request.getReportId()));
         return response;
     }
 
-    public List<TestReport> checkTestIndex(ReportIndexInquiry inquiry) {
-        inquiry.setReqEndTime(inquiry.getReqEndTime() + " 23:59:59");
-        List<TestReport> list = dao.selectTestReportIndex(inquiry);
-        List<String> inpatientNos = inpatientService.getInpatientNoByPatientId(inquiry.getPatientId());
+    public List<TestReport> checkTestIndex(ReportIndexInquiry request) {
+        List<TestReport> list = dao.selectTestReportIndex(request);
+        List<String> inpatientNos = inpatientService.getInpatientNoByPatientId(request.getPatientId());
         for (String inpatientNo : inpatientNos) {
-            inquiry.setPatientId(inpatientNo);
-            list.addAll(dao.selectTestReportIndex(inquiry));
+            request.setPatientId(inpatientNo);
+            list.addAll(dao.selectTestReportIndex(request));
         }
         return list;
     }