feature: 下载优化医院后台接口

src/main/java/com/ywt/mg/domain/models/enums/TerminalEnum.java

@@ -34,7 +34,9 @@ public enum TerminalEnum {
     ORDER_SERVICE_MINI_PROGRAM("下单服务助手小程序", 19),
     NF_HOSPITAL_BY_PATIENT_MINI_PROGRAM("南方医院白云分院小程序", 20),
     NF_HOSPITAL_BY_PATIENT_WX_OFFICIAL("南方医院白云分院公众号", 21),
-    NF_HOSPITAL_BY_DOCTOR_WX_OFFICIAL("南方医院白云分院医生版公众号", 22);
+    NF_HOSPITAL_BY_DOCTOR_WX_OFFICIAL("南方医院白云分院医生版公众号", 22),
+    NF_HOSPITAL_BY_PATIENT_MINI_PROGRAM_ZFB("南方医科大学南方医院白云分院支付宝小程序", 24),
+    NF_HOSPITAL_TH_PATIENT_MINI_PROGRAM_ZFB("南方医院太和分院支付宝小程序", 25);
 
     private final String displayName;
 

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

@@ -89,7 +89,7 @@ public class AuthService {
         int enterpriseId = WebAppContext.current().getEnterpriseId();
 //        return enterpriseId > 0 ? enterpriseId : 1;
         return enterpriseId ;
-    } 
+    }
 
 
     public Hospital getCurrentHospitalByCache() {

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

@@ -301,9 +301,9 @@ public class DepositService {
                 map.getStringListSafely(col6).add(p.getPatientMobile());
                 map.getStringListSafely(col7).add(p.getCardNo());
                 map.getStringListSafely(col8).add(amount);
-                map.getStringListSafely(col9).add(terminal);
-                map.getStringListSafely(col10).add(paymentChannel);
-                map.getStringListSafely(col11).add(paymentStatus);
+                map.getStringListSafely(col9).add(paymentChannel);
+                map.getStringListSafely(col10).add(paymentStatus);
+                map.getStringListSafely(col11).add(paymentTime);
             } else {
                 // "订单号", "支付流水号", "交易流水号", "医院", "患者姓名", "手机号", "诊疗卡号", "支付金额", "支付方式", "同步状态", "支付时间"
                 map.getStringListSafely(col0).add(p.getOrderNo());
@@ -315,9 +315,9 @@ public class DepositService {
                 map.getStringListSafely(col6).add(p.getPatientMobile());
                 map.getStringListSafely(col7).add(p.getCardNo());
                 map.getStringListSafely(col8).add(amount);
-                map.getStringListSafely(col9).add(terminal);
-                map.getStringListSafely(col10).add(paymentChannel);
-                map.getStringListSafely(col11).add(paymentStatus);
+                map.getStringListSafely(col9).add(paymentChannel);
+                map.getStringListSafely(col10).add(paymentStatus);
+                map.getStringListSafely(col11).add(paymentTime);
 //                    String[] bodyStr = new String[]{p.getOrderNo(), p.getPaymentNo(), transactionId, hospitalName, terminal, p.getPatientName(),
 //                            p.getPatientMobile(), p.getCardNo(), amount, paymentChannel, paymentStatus, paymentTime};
             }

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

@@ -100,10 +100,11 @@ public class DownloadRecordService {
         map.put("pharmacyId", pharmacyId);
         String paramMd5 = StringHelper.md5(JsonSerializer.toJson(map));
         // todo: 判断是否有同样的下载
-        DownloadRecord record = downloadRecordRepository.findCreatingLeastOne(currentAdminId, paramMd5, paramUrl);
-        if (!Checker.isNone(record)) {
-            return record;
-        }
+//        DownloadRecord record = downloadRecordRepository.findCreatingLeastOne(currentAdminId, paramMd5, paramUrl);
+//        if (!Checker.isNone(record)) {
+//            return record;
+//        }
+        DownloadRecord record;
         record = new DownloadRecord();
         record.setId(id);
         record.setName(name);
@@ -187,7 +188,7 @@ public class DownloadRecordService {
         int adminId = request.getAdminId();
         if (adminId > 0) {
             whereSql += " and ( admin_id = ?)";
-            paramList.add(hospitalId);
+            paramList.add(adminId);
         }
         int status = Checker.getIntegerValue(request.getStatus());
         if(status == 1){
@@ -217,7 +218,7 @@ public class DownloadRecordService {
 //        calendar.add(calendar.DATE, 1);
 
 
-        String startTime = DateUtil.getPastDate(70);
+        String startTime = DateUtil.getPastDate(7);
         if (!Checker.isNull(startTime)) {
             whereSql += " and ( create_time >= ?)";
             Date date = format.parse(startTime);

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

@@ -70,7 +70,7 @@ public class MealOrderService {
         // 分页查找
         StringBuilder sqlBuilder = new StringBuilder();
         // 拼凑sql语句
-        sqlBuilder.append("select * from user_meal_order_view where ")
+        sqlBuilder.append("select * from nutrimeal.user_meal_order_view where ")
                 .append(whereSql)
                 .append("order by create_time desc");
         return jdbcTemplate.query(sqlBuilder.toString(), paramList.toArray(), new BeanPropertyRowMapper<>(UserMealOrderView.class));

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

@@ -33,7 +33,7 @@ public class OrderDishService {
      */
     public int getAllDishCostPriceSumByOrderIds(String orderIds) {
         StringBuilder sqlBuilder = new StringBuilder();
-        sqlBuilder.append("select sum(dish_cost_price * count) from order_dish where order_id in (")
+        sqlBuilder.append("select sum(dish_cost_price * count) from nutrimeal.order_dish where order_id in (")
                 .append(orderIds)
                 .append(") and deleted = 0 and dish_cost_price is not null;");
         Integer dishCostPriceSum = jdbcTemplate.queryForObject(sqlBuilder.toString(), Integer.class);

src/main/java/com/ywt/mg/web/common/ExcelDownloadSrv.java

@@ -404,7 +404,7 @@ public class ExcelDownloadSrv {
         ba = new ByteArrayOutputStream();
         WritableWorkbook workbook = null;
         try {
-            File file = new File(path);
+//            File file = new File(path);
             // 创建写工作簿对象
              workbook = Workbook.createWorkbook(ba);
             // 工作表

src/main/java/com/ywt/mg/web/controllers/CheckUpOrderController.java

@@ -15,6 +15,7 @@ import com.ywt.mg.web.BaseResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -39,7 +40,7 @@ public class CheckUpOrderController {
 
 
     @RequestMapping({"/downloadCheckUpOrderList"})
-    public BaseResponse downloadDepositList(QueryCheckUpOrderListRequest request) {
+    public BaseResponse downloadDepositList(@RequestBody QueryCheckUpOrderListRequest request) {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录

src/main/java/com/ywt/mg/web/controllers/DepositController.java

@@ -15,6 +15,7 @@ import com.ywt.mg.web.BaseResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -42,7 +43,7 @@ public class DepositController {
 
 
     @RequestMapping({"/downloadDepositList"})
-    public BaseResponse downloadDepositList(QueryDepositListRequest request) {
+    public BaseResponse downloadDepositList(@RequestBody QueryDepositListRequest request) {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录

src/main/java/com/ywt/mg/web/controllers/DownloadRecordController.java

@@ -40,6 +40,8 @@ public class DownloadRecordController {
     @MGRight(menuCode = {"/downloadRecord/queryDownloadRecordList"}, type = MGRightTypeDef.Menu | MGRightTypeDef.Logined)
     BaseResponse queryDownloadRecordList(@Validated @RequestBody QueryDownloadRecordListRequest request) throws Exception {
         request.setHospitalId(-1);
+        int adminId = authService.getCurrentAdminId();
+        request.setAdminId(adminId);
          return downloadRecordService.queryDownloadRecordList(request);
     }
 

src/main/java/com/ywt/mg/web/controllers/MealOrderController.java

@@ -1,6 +1,7 @@
 package com.ywt.mg.web.controllers;
 
 
+import com.ywt.mg.core.MGRight;
 import com.ywt.mg.core.exceptions.AppMessageException;
 import com.ywt.mg.core.utils.Checker;
 import com.ywt.mg.core.utils.StringHelper;
@@ -15,6 +16,7 @@ import com.ywt.mg.web.BaseResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,6 +25,7 @@ import java.net.URLDecoder;
 
 @RequestMapping({"/mealOrder"})
 @RestController("/mealOrder")
+@MGRight
 public class MealOrderController {
 
     private final Logger logger = LoggerFactory.getLogger(MealOrderController.class);
@@ -42,7 +45,7 @@ public class MealOrderController {
 
 
     @RequestMapping({"/downloadMealOrderList"})
-    public BaseResponse downloadMealOrderList(MealOrderListRequest request) {
+    public BaseResponse downloadMealOrderList(@RequestBody MealOrderListRequest request) {
 //        int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录
@@ -55,7 +58,7 @@ public class MealOrderController {
         String name = "公司后台-订单管理-订餐订单列表列表";
         String fileName = "订餐订单列表";
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
-        String paramUrl = "/mealOrder/downloadMealOrderListNew";
+        String paramUrl = "/mealOrder/downloadMealOrderList";
         String paramJson = JsonSerializer.toJson(request);
         downloadRecordService.getOrInsertDownloadRecord(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
         Thread t = new Thread() {

src/main/java/com/ywt/mg/web/controllers/RegisteredOrderController.java

@@ -12,6 +12,7 @@ import com.ywt.mg.web.BaseResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -37,7 +38,7 @@ public class RegisteredOrderController {
 
 
     @RequestMapping({"/downloadRegisteredOrderList"})
-    public BaseResponse downloadDepositList(RegisteredOrderListRequest request) {
+    public BaseResponse downloadDepositList(@RequestBody RegisteredOrderListRequest request) {
 //        int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录

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

@@ -13,6 +13,7 @@ import com.ywt.mg.web.BaseResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -37,7 +38,7 @@ public class HospCheckUpOrderController {
 
 
     @RequestMapping({"/downloadCheckUpOrderList"})
-    public BaseResponse downloadDepositList(QueryCheckUpOrderListRequest request) {
+    public BaseResponse downloadDepositList(@RequestBody QueryCheckUpOrderListRequest request) {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录
@@ -52,7 +53,7 @@ public class HospCheckUpOrderController {
         String name = "医院后台-订单管理-体检缴费";
         String fileName = "体检缴费列表";
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
-        String paramUrl = "/checkUp/downloadCheckUpOrderList";
+        String paramUrl = "/hosp/checkUp/downloadCheckUpOrderList";
         String paramJson = JsonSerializer.toJson(request);
         downloadRecordService.getOrInsertDownloadRecord(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
         Thread t = new Thread() {

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

@@ -14,6 +14,7 @@ import com.ywt.mg.web.controllers.DepositController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -42,7 +43,7 @@ public class HospDepositController {
 
 
     @RequestMapping({"/downloadDepositList"})
-    public BaseResponse downloadDepositList(QueryDepositListRequest request) {
+    public BaseResponse downloadDepositList(@RequestBody QueryDepositListRequest request) {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录
@@ -56,7 +57,7 @@ public class HospDepositController {
         String name = "医院后台-订单管理-住院押金";
         String fileName = "押金缴费记录";
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
-        String paramUrl = "/deposit/downloadDepositList";
+        String paramUrl = "/hosp/deposit/downloadDepositList";
         String paramJson = JsonSerializer.toJson(request);
         downloadRecordService.getOrInsertDownloadRecord(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
         Thread t = new Thread() {

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

@@ -39,6 +39,8 @@ public class HospDownloadRecordController {
     BaseResponse queryDownloadRecordList(@Validated @RequestBody QueryDownloadRecordListRequest request) throws Exception {
         int hospitalId = authService.getCurrentHospitalId();
         request.setHospitalId(hospitalId);
+        int adminId = authService.getCurrentAdminId();
+        request.setAdminId(adminId);
         return downloadRecordService.queryDownloadRecordList(request);
     }
 

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

@@ -1,6 +1,7 @@
 package com.ywt.mg.web.controllers.hospital;
 
 
+import com.ywt.mg.core.MGRight;
 import com.ywt.mg.core.exceptions.AppMessageException;
 import com.ywt.mg.core.utils.Checker;
 import com.ywt.mg.core.utils.StringHelper;
@@ -16,6 +17,7 @@ import com.ywt.mg.web.controllers.MealOrderController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,6 +25,7 @@ import java.net.URLDecoder;
 
 @RequestMapping({"/hosp/mealOrder"})
 @RestController("/hosp/mealOrder")
+@MGRight
 public class HospMealOrderController {
 
     private final Logger logger = LoggerFactory.getLogger(MealOrderController.class);
@@ -42,7 +45,7 @@ public class HospMealOrderController {
 
 
     @RequestMapping({"/downloadMealOrderList"})
-    public BaseResponse downloadMealOrderList(MealOrderListRequest request) {
+    public BaseResponse downloadMealOrderList(@RequestBody MealOrderListRequest request) {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录
@@ -56,7 +59,7 @@ public class HospMealOrderController {
         String name = "医院后台-订单管理-订餐订单列表列表";
         String fileName = "订餐订单列表";
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
-        String paramUrl = "/mealOrder/downloadMealOrderListNew";
+        String paramUrl = "/hosp/mealOrder/downloadMealOrderList";
         String paramJson = JsonSerializer.toJson(request);
         downloadRecordService.getOrInsertDownloadRecord(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
         Thread t = new Thread() {

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

@@ -50,7 +50,7 @@ public class HospOutpatientOrderController {
         String name = "医院后台-订单管理-门诊缴费订单列表";
         String fileName = "门诊缴费记录";
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
-        String paramUrl = "/outpatient/downloadOutPatientOrderList";
+        String paramUrl = "/hosp/outpatient/downloadOutPatientOrderList";
         String paramJson = JsonSerializer.toJson(request);
         downloadRecordService.getOrInsertDownloadRecord(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
         Thread t = new Thread() {

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

@@ -14,6 +14,7 @@ import com.ywt.mg.web.controllers.RegisteredOrderController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -39,7 +40,7 @@ public class HospRegisteredOrderController {
 
 
     @RequestMapping({"/downloadRegisteredOrderList"})
-    public BaseResponse downloadDepositList(RegisteredOrderListRequest request) {
+    public BaseResponse downloadDepositList(@RequestBody RegisteredOrderListRequest request) {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录
@@ -52,7 +53,7 @@ public class HospRegisteredOrderController {
         String name = "医院后台-订单管理-挂号订单";
         String fileName = "挂号订单记录";
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
-        String paramUrl = "/registeredOrder/downloadRegisteredOrderList";
+        String paramUrl = "/hosp/registeredOrder/downloadRegisteredOrderList";
         String paramJson = JsonSerializer.toJson(request);
         downloadRecordService.getOrInsertDownloadRecord(downloadRecordId, name, fileName + excelSuffixFormat, paramUrl, paramJson);
         Thread t = new Thread() {