feature: 医院后台线下就诊下载

src/main/java/com/ywt/mg/params/offline/DownloadOfflineListNewRequest.java

@@ -53,6 +53,14 @@ public class DownloadOfflineListNewRequest implements Serializable {
     @ApiModelProperty(value = "来源")
     private String source;
 
+
+    @ApiModelProperty(value = "支付时间查询截止时间(医院后台)")
+    private String createEndTime;
+
+    @ApiModelProperty(value = "支付时间查询开始时间(医院后台)")
+    private String createStartTime;
+
+
     // 当用 异步 执行时，没法从 WebAppContext 里面获取 adminId
     private int currentAdminId;
 
@@ -167,4 +175,20 @@ public class DownloadOfflineListNewRequest implements Serializable {
     public void setCurrentAdminId(int currentAdminId) {
         this.currentAdminId = currentAdminId;
     }
+
+    public String getCreateEndTime() {
+        return createEndTime;
+    }
+
+    public void setCreateEndTime(String createEndTime) {
+        this.createEndTime = createEndTime;
+    }
+
+    public String getCreateStartTime() {
+        return createStartTime;
+    }
+
+    public void setCreateStartTime(String createStartTime) {
+        this.createStartTime = createStartTime;
+    }
 }

src/main/java/com/ywt/mg/services/DepositService.java

@@ -292,7 +292,7 @@ public class DepositService {
             }
             ;
 
-            if (hosp > 1) {
+            if (hosp > 0) {
 //                        bodyStr = new String[]{p.getOrderNo(), p.getPaymentNo(), transactionId, terminal, p.getPatientName(),
 //                                p.getPatientMobile(), p.getCardNo(), amount, paymentChannel, paymentStatus, paymentTime};
                 map.getStringListSafely(col0).add(p.getOrderNo());

src/main/java/com/ywt/mg/services/OfflineNewService.java

@@ -192,6 +192,28 @@ public class OfflineNewService {
                 date = calendar.getTime();
                 paramList.add(date);
             }
+
+            String createTimeEnd = Checker.getStringValue(request.getCreateEndTime());
+            if (!Checker.isNull(payTimeEnd)) {
+                whereSql += " and ( pay_time < ?)";
+                Date date = format.parse(createTimeEnd);
+
+                //把日期往后增加一天.整数往后推,负数往前移动
+                Calendar calendar = new GregorianCalendar();
+                calendar.setTime(date);
+                calendar.add(Calendar.DATE, 1);
+                //这个时间就是日期往后推一天的结果
+                date = calendar.getTime();
+                paramList.add(date);
+            }
+            String createTimeStart = request.getCreateStartTime();
+            if (!Checker.isNull(createTimeStart)) {
+                whereSql += " and ( pay_time >= ?)";
+                Date date = format.parse(createTimeStart);
+                paramList.add(date);
+            }
+
+
             String refundTimeStart = request.getRefundTimeStart();
             if (!Checker.isNull(refundTimeStart)) {
                 whereSql += " and ( refund_time >= ?)";

src/main/java/com/ywt/mg/web/controllers/hospital/HospMealOrderController.java

@@ -61,7 +61,7 @@ public class HospMealOrderController {
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
         String paramUrl = "/hosp/mealOrder/downloadMealOrderList";
         String paramJson = JsonSerializer.toJson(request);
-        downloadRecordService.getOrInsertDownloadRecord(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
+        downloadRecordService.getOrInsertDownloadRecordByHosp(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
         Thread t = new Thread() {
             @Override
             public void run() {

src/main/java/com/ywt/mg/web/controllers/hospital/HospNatOrderController.java

@@ -55,7 +55,7 @@ public class HospNatOrderController {
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
         String paramUrl = "/hosp/natOrder/downloadNatOrderList";
         String paramJson = JsonSerializer.toJson(request);
-        downloadRecordService.getOrInsertDownloadRecord(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
+        downloadRecordService.getOrInsertDownloadRecordByHosp(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
         Thread t = new Thread() {
             @Override
             public void run() {