Browse Source

检验报告修改为按日期范围查询

lighter 4 years ago
parent
commit
046255338c

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     </parent>
     <groupId>thyyxxk</groupId>
     <groupId>thyyxxk</groupId>
     <artifactId>wxservice-server</artifactId>
     <artifactId>wxservice-server</artifactId>
-    <version>4.0</version>
+    <version>4.1</version>
     <name>wxservice-server</name>
     <name>wxservice-server</name>
     <description>server for wxservice-web</description>
     <description>server for wxservice-web</description>
 
 

+ 2 - 2
src/main/java/thyyxxk/wxservice_server/pojo/inspections/CheckExamParam.java

@@ -5,6 +5,6 @@ import lombok.Data;
 @Data
 @Data
 public class CheckExamParam {
 public class CheckExamParam {
     private String patientId;
     private String patientId;
-    private Integer year;
-    private Integer month;
+    private String start;
+    private String end;
 }
 }

+ 1 - 12
src/main/java/thyyxxk/wxservice_server/service/InspectionsService.java

@@ -41,10 +41,6 @@ public class InspectionsService {
 
 
     @Async("asyncTask")
     @Async("asyncTask")
     public CompletableFuture<ResultVo<List<ExamIndexResult>>> getExamIndex(CheckExamParam param) {
     public CompletableFuture<ResultVo<List<ExamIndexResult>>> getExamIndex(CheckExamParam param) {
-        final int year = param.getYear();
-        final int month = param.getMonth();
-        final String start = year + "-" + month + "-01";
-        final String end = year + "-" + month + "-" + getMaxDaysOfOneMonth(year, month);
         final String tjNo = dao.selectTjNo(param.getPatientId());
         final String tjNo = dao.selectTjNo(param.getPatientId());
         final String inpatientNo = dao.selectInpatientNo(param.getPatientId());
         final String inpatientNo = dao.selectInpatientNo(param.getPatientId());
         String sendHead1 = "<message><PATIENT_TYPE>0</PATIENT_TYPE><PTNT_NO>" + param.getPatientId() + "</PTNT_NO>";
         String sendHead1 = "<message><PATIENT_TYPE>0</PATIENT_TYPE><PTNT_NO>" + param.getPatientId() + "</PTNT_NO>";
@@ -56,7 +52,7 @@ public class InspectionsService {
         if (null != inpatientNo && !inpatientNo.equals("")) {
         if (null != inpatientNo && !inpatientNo.equals("")) {
             sendHead3 = "<message><PATIENT_TYPE>1</PATIENT_TYPE><PTNT_NO>" + inpatientNo + "</PTNT_NO>";
             sendHead3 = "<message><PATIENT_TYPE>1</PATIENT_TYPE><PTNT_NO>" + inpatientNo + "</PTNT_NO>";
         }
         }
-        String sendEnd = "<START_TIME>" + start + "</START_TIME><END_TIME>" + end + "</END_TIME></message>";
+        String sendEnd = "<START_TIME>" + param.getStart() + "</START_TIME><END_TIME>" + param.getEnd() + "</END_TIME></message>";
         String send1 = sendHead1 + sendEnd;
         String send1 = sendHead1 + sendEnd;
         String xml1 = invokeRemoteMethod("GetLabReportIndex", new Object[]{send1});
         String xml1 = invokeRemoteMethod("GetLabReportIndex", new Object[]{send1});
         List<ExamIndexResult> list1 = analyzeExamIndex(xml1.substring(1, xml1.length() - 1));
         List<ExamIndexResult> list1 = analyzeExamIndex(xml1.substring(1, xml1.length() - 1));
@@ -127,13 +123,6 @@ public class InspectionsService {
         return name.startsWith("新") && name.contains("冠") && name.endsWith("核酸检测");
         return name.startsWith("新") && name.contains("冠") && name.endsWith("核酸检测");
     }
     }
 
 
-    private int getMaxDaysOfOneMonth(int year, int month) {
-        int day = 1;
-        Calendar cal = Calendar.getInstance();
-        cal.set(year, month - 1, day);
-        return cal.getActualMaximum(Calendar.DATE);
-    }
-
     @Async("asyncTask")
     @Async("asyncTask")
     public CompletableFuture<ResultVo<ExamDetailResult>> getExamDetail(String orderId) {
     public CompletableFuture<ResultVo<ExamDetailResult>> getExamDetail(String orderId) {
         if (orderId == null || orderId.trim().equals("") || orderId.trim().equals("undefined")) {
         if (orderId == null || orderId.trim().equals("") || orderId.trim().equals("undefined")) {