feature: 药房客户端下载

src/main/java/com/ywt/mg/domain/models/ConstantDef.java

@@ -120,4 +120,15 @@ public class ConstantDef {
      * 南方医科大学南方医院白云分院药房
      */
     public static final int NFBY_PHARMACY_ID = 11;
+
+
+    /**
+     * 对应ywt_drug库pharmacy表id=1的广州医科大学附属第三医院生殖药房的药房ID
+     */
+    public static final int GS_PHARMACY_ID = 1;
+
+    /**
+     * 对应ywt_drug库pharmacy表id=20的广三药房ID
+     */
+    public static final int GUANGSAN_ID = 20;
 }

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

@@ -0,0 +1,27 @@
+package com.ywt.mg.domain.models.enums;
+
+/**
+ * 处方单推送给国控进度
+ */
+public enum SinopharmEnum {
+    NOT_PUSHED("未推送", 0),
+    DRUG_MATCHING("药品匹配信息", 1),
+    CONFIRM_ORDER("处方单确认", 2),
+    Failure("推送失败", 4);
+
+    private final String displayName;
+    private final int value;
+
+    SinopharmEnum(String displayName, int value) {
+        this.displayName = displayName;
+        this.value = value;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public int getValue() {
+        return value;
+    }
+}

src/main/java/com/ywt/mg/params/pharamcy/PharamcyDownloadPresRequest.java

@@ -0,0 +1,195 @@
+package com.ywt.mg.params.pharamcy;
+
+public class PharamcyDownloadPresRequest {
+
+
+    private String doctorName;
+    private String deptName;
+    private String patientName;
+    private int pharmacyId;
+    private int adminId;
+    private String createTimeStart;
+    private String createTimeEnd;
+    private String payTimeStart;
+    private String payTimeEnd;
+    private String refundTimeStart;
+    private String refundTimeEnd;
+    private String paymentStatus;
+    private String status;
+    private String preBizNo;
+    private String bizNo3th;
+    private String source;
+    private String receiveStatus;
+    private String selectPharmacyId;
+    private String patientNo;
+    private String orderNo;
+    private String paymentChannel;
+
+    public String getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(String doctorName) {
+        this.doctorName = doctorName;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getPatientName() {
+        return patientName;
+    }
+
+    public void setPatientName(String patientName) {
+        this.patientName = patientName;
+    }
+
+    public int getPharmacyId() {
+        return pharmacyId;
+    }
+
+    public void setPharmacyId(int pharmacyId) {
+        this.pharmacyId = pharmacyId;
+    }
+
+    public int getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(int adminId) {
+        this.adminId = adminId;
+    }
+
+    public String getCreateTimeStart() {
+        return createTimeStart;
+    }
+
+    public void setCreateTimeStart(String createTimeStart) {
+        this.createTimeStart = createTimeStart;
+    }
+
+    public String getCreateTimeEnd() {
+        return createTimeEnd;
+    }
+
+    public void setCreateTimeEnd(String createTimeEnd) {
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    public String getPayTimeStart() {
+        return payTimeStart;
+    }
+
+    public void setPayTimeStart(String payTimeStart) {
+        this.payTimeStart = payTimeStart;
+    }
+
+    public String getPayTimeEnd() {
+        return payTimeEnd;
+    }
+
+    public void setPayTimeEnd(String payTimeEnd) {
+        this.payTimeEnd = payTimeEnd;
+    }
+
+    public String getRefundTimeStart() {
+        return refundTimeStart;
+    }
+
+    public void setRefundTimeStart(String refundTimeStart) {
+        this.refundTimeStart = refundTimeStart;
+    }
+
+    public String getRefundTimeEnd() {
+        return refundTimeEnd;
+    }
+
+    public void setRefundTimeEnd(String refundTimeEnd) {
+        this.refundTimeEnd = refundTimeEnd;
+    }
+
+    public String getPaymentStatus() {
+        return paymentStatus;
+    }
+
+    public void setPaymentStatus(String paymentStatus) {
+        this.paymentStatus = paymentStatus;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getPreBizNo() {
+        return preBizNo;
+    }
+
+    public void setPreBizNo(String preBizNo) {
+        this.preBizNo = preBizNo;
+    }
+
+    public String getBizNo3th() {
+        return bizNo3th;
+    }
+
+    public void setBizNo3th(String bizNo3th) {
+        this.bizNo3th = bizNo3th;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getReceiveStatus() {
+        return receiveStatus;
+    }
+
+    public void setReceiveStatus(String receiveStatus) {
+        this.receiveStatus = receiveStatus;
+    }
+
+    public String getSelectPharmacyId() {
+        return selectPharmacyId;
+    }
+
+    public void setSelectPharmacyId(String selectPharmacyId) {
+        this.selectPharmacyId = selectPharmacyId;
+    }
+
+    public String getPatientNo() {
+        return patientNo;
+    }
+
+    public void setPatientNo(String patientNo) {
+        this.patientNo = patientNo;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getPaymentChannel() {
+        return paymentChannel;
+    }
+
+    public void setPaymentChannel(String paymentChannel) {
+        this.paymentChannel = paymentChannel;
+    }
+}

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

@@ -62,49 +62,49 @@ public class NatOrderService {
         // 只显示未删除和支付成功的记录
         String whereSql = " ( 1=1 and deleted = 0 and payment_status = 2 )";
 
-        String paymentCode = request.getPaymentCode().trim();
+        String paymentCode = Checker.getStringValue(request.getPaymentCode());
         if (!Checker.isNull(paymentCode)) {
             whereSql += " and ( payment_code = ?)";
             paramList.add(paymentCode);
         }
 
-        String patientName = request.getPatientName().trim();
+        String patientName =  Checker.getStringValue(request.getPatientName());
         if (!Checker.isNull(patientName)) {
             whereSql += " and ( patient_name like ?)";
             paramList.add(patientName + "%");
         }
 
-        String idCard = request.getIdCard().trim();
+        String idCard = Checker.getStringValue(request.getIdCard());
         if (!Checker.isNull(idCard)) {
             whereSql += " and ( id_card = ?)";
             paramList.add(idCard);
         }
 
-        String mobile = request.getMobile().trim();
+        String mobile = Checker.getStringValue(request.getMobile());
         if (!Checker.isNull(mobile)) {
             whereSql += " and ( mobile like ?)";
             paramList.add(mobile + "%");
         }
 
-        String orderNo = request.getOrderNo().trim();
+        String orderNo = Checker.getStringValue(request.getOrderNo());
         if (!Checker.isNull(orderNo)) {
             whereSql += " and ( order_no like ?)";
             paramList.add(orderNo + "%");
         }
 
-        String vaccineCode = request.getVaccineCode().trim();
+        String vaccineCode = Checker.getStringValue(request.getVaccineCode());
         if (!Checker.isNull(vaccineCode)) {
             whereSql += " and ( vaccine_code like ?)";
             paramList.add(vaccineCode + "%");
         }
 
-        String paymentStatus = request.getPaymentStatus().trim();
+        String paymentStatus = Checker.getStringValue(request.getPaymentStatus());
         if (!Checker.isNull(paymentStatus)) {
             whereSql += " and ( payment_status = ?)";
             paramList.add(Integer.parseInt(paymentStatus));
         }
 
-        String orderStatus = request.getOrderStatus().trim();
+        String orderStatus = Checker.getStringValue(request.getOrderStatus());
         if (!Checker.isNull(orderStatus)) {
             int orderStatusInt = Integer.parseInt(orderStatus);
             whereSql += " and ( (status & ?) = ? and status < ? ) ";
@@ -150,16 +150,16 @@ public class NatOrderService {
             logger.error("NatOrderService#queryNatOrderListCommon(transactionId={} ):\n {} ", transactionId, e.getMessage(), e);
         }
 
-        String paymentStartTime = request.getPaymentStartTime().trim();
-        String paymentEndTime = request.getPaymentEndTime().trim();
+        String paymentStartTime = Checker.getStringValue(request.getPaymentStartTime());
+        String paymentEndTime = Checker.getStringValue(request.getPaymentEndTime());
         Map<String, Object> map = sqlHelper.timeQuerySql(whereSql, paramList, "pay_time", paymentStartTime, paymentEndTime);
 
-        String refundStartTime = request.getRefundStartTime().trim();
-        String refundEndTime = request.getRefundEndTime().trim();
+        String refundStartTime =  Checker.getStringValue(request.getRefundStartTime());
+        String refundEndTime =  Checker.getStringValue(request.getRefundEndTime());
         map = sqlHelper.timeQuerySql(map, "refund_time", refundStartTime, refundEndTime);
 
-        String confirmStartTime = request.getConfirmStartTime().trim();
-        String confirmEndTime = request.getConfirmEndTime().trim();
+        String confirmStartTime =  Checker.getStringValue(request.getConfirmStartTime());
+        String confirmEndTime =  Checker.getStringValue(request.getConfirmEndTime());
         map = sqlHelper.timeQuerySql(map, "confirm_time", confirmStartTime, confirmEndTime, FormatUtil.FORMAT_DATE_SECOND);
         return map;
     }

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

@@ -0,0 +1,305 @@
+package com.ywt.mg.services;
+
+import com.ywt.mg.configs.ParameterConfigurer;
+import com.ywt.mg.core.utils.Checker;
+import com.ywt.mg.domain.models.ConstantDef;
+import com.ywt.mg.domain.models.enums.PrescriptionInfoStatusEnum;
+import com.ywt.mg.domain.models.enums.RefundStatusEnum;
+import com.ywt.mg.domain.models.enums.SinopharmEnum;
+import com.ywt.mg.domain.ywtDrugEntities.Pharmacy;
+import com.ywt.mg.domain.ywtDrugEntities.PrescriptionInfo;
+import com.ywt.mg.params.pharamcy.PharamcyDownloadPresRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Service
+public class PharamacyService {
+
+    private static final Logger logger = LoggerFactory.getLogger(PharamacyService.class);
+
+    @Autowired
+    private AuthService authService;
+
+    @Autowired
+    private PharmacyCacheService pharmacyCacheService;
+
+    @Autowired
+    private JdbcTemplate ywtDrugJdbcTemplate;
+
+    @Autowired
+    private ParameterConfigurer parameterConfigurer;
+
+
+    private static final String KEY_WHERE_SQL = "whereSql";
+
+    private static final String KEY_PARAM_LIST = "paramList";
+    private static final String INJECTIONS_MAP = "injectionsMap";
+
+
+
+
+    public List<PrescriptionInfo> downloadPrescriptionlist(PharamcyDownloadPresRequest request) {
+        Map<String, Object> map = buildQueryPrescriptionListSQLParam(request);
+        String whereSql = (String) map.get(KEY_WHERE_SQL);
+        List<Object> paramList = (List<Object>) map.get(KEY_PARAM_LIST);
+        // 分页查找
+        // 拼凑sql语句
+        String sqlBuilder = "select *,biz_no_3th as bizNo3th from prescription_info where " + whereSql + " order by create_on desc";
+        return ywtDrugJdbcTemplate.query(sqlBuilder, paramList.toArray(), new BeanPropertyRowMapper<>(PrescriptionInfo.class));
+    }
+
+    private Map<String, Object> buildQueryPrescriptionListSQLParam(PharamcyDownloadPresRequest request) {
+        List<Object> paramList = new ArrayList<>();
+        String whereSql = " ( 1=1 )";
+
+        String doctorname = request.getDoctorName();
+        if (!Checker.isNull(doctorname)) {
+            whereSql += " and ( doctor_name like ?)";
+            paramList.add("%" + doctorname + "%");
+        }
+
+        String patientname = request.getPatientName();
+        if (!Checker.isNull(patientname)) {
+            whereSql += " and ( patient_name like ?)";
+            paramList.add("%" + patientname + "%");
+        }
+        String deptname = request.getDeptName();
+        if (!Checker.isNull(deptname)) {
+            whereSql += " and ( dept like ?)";
+            paramList.add("%" + deptname + "%");
+        }
+
+        whereSql += " and (deleted = 0 or deleted is null) ";
+
+        List<Pharmacy> pharmacyList = pharmacyCacheService.getPharmacyList();
+
+        String selectPharmacyId = Checker.getStringValue(request.getSelectPharmacyId());
+        if (!Checker.isNull(selectPharmacyId)) {
+            whereSql += " and pharmacy_id = ? ";
+            paramList.add(Integer.parseInt(selectPharmacyId));
+        } else {
+
+            // todo: 多药房数据查询
+            whereSql += " and (pharmacy_id = ?";
+            paramList.add(request.getPharmacyId());
+            for (Pharmacy pharmacy : pharmacyList) {
+                if (!Checker.isNone(pharmacy) && pharmacy.getTreeCode().startsWith(request.getPharmacyId() + "|")) {
+                    whereSql += " or pharmacy_id = ?";
+                    paramList.add(pharmacy.getId());
+                }
+            }
+            whereSql += "  ) ";
+        }
+
+        // todo: v4.3.6 广三生殖药房可以看到所有的订单，而其他子药房看不到'待支付'的订单 (所以这里需要针对不是"生殖药房"的子药房进行过滤)， parentId != -1 表示是子药房， leader = 0，表示除"生殖药房"的子药房
+        Pharmacy pharmacy = pharmacyList.stream().filter(p -> Checker.getIntegerValue(p.getId()) == request.getPharmacyId()).findFirst().orElse(null);
+        if (!Checker.isNone(pharmacy) && Checker.getIntegerValue(pharmacy.getParentId()) != -1 && Checker.getIntegerValue(pharmacy.getLeader()) == 0) {
+            whereSql += " and ( status != ? ) ";
+            paramList.add(PrescriptionInfoStatusEnum.WaitForPayment.getValue());
+        }
+
+        // 添加测试账号过滤
+        String testAdminIds = parameterConfigurer.getTestAdminIds();
+        String testDoctorIds = parameterConfigurer.getTestDoctorIds();
+        String adminStr = "," + request.getAdminId() + ",";
+        String testAdminIdsStr = "," + testAdminIds + ",";
+
+        // 不是测试账号
+        if (!(testAdminIdsStr.contains(adminStr))) {
+            String[] testDoctorIdsArr = testDoctorIds.split(",");
+            if (!Checker.isNone(testDoctorIdsArr)) {
+                StringBuilder sqlSub = new StringBuilder();
+                for (String doctorId : testDoctorIdsArr) {
+                    sqlSub.append("doctor_id != ").append(doctorId).append(" and ");
+                }
+                String sqlSubStr = sqlSub.substring(0, sqlSub.lastIndexOf("and"));
+                whereSql += String.format(" and ((%s) or doctor_id is null)", sqlSubStr);
+            }
+        }
+
+        /**
+         * 1-待支付; 2-配送中/待取药; 3-已完成
+         * 4-已退费; 5-已过期; 10-退费中
+         */
+        if (!Checker.isNone(request.getStatus())) {
+            int statusInt = Integer.parseInt(request.getStatus());
+            int pharmacyIdInt = authService.getCurrentPharmacyId();
+            int selectPharmacyIdInt = Checker.isNone(selectPharmacyId) ? 0 : Integer.parseInt(selectPharmacyId);
+            // todo: 这是暂时的做法，后续需要优化
+            boolean bl = pharmacyIdInt == ConstantDef.GS_PHARMACY_ID || pharmacyIdInt == ConstantDef.GUANGSAN_ID || pharmacyIdInt == 1 || pharmacyIdInt == 4 || pharmacyIdInt == 5 || pharmacyIdInt == 12 || pharmacyIdInt == 13 || pharmacyIdInt == 14
+                    || request.getPharmacyId() == ConstantDef.GS_PHARMACY_ID || request.getPharmacyId() == ConstantDef.GUANGSAN_ID ||request.getPharmacyId() == 1 || request.getPharmacyId() == 4 || request.getPharmacyId() == 5 || request.getPharmacyId() == 12 || request.getPharmacyId() == 13 || request.getPharmacyId() == 14
+                    || selectPharmacyIdInt == ConstantDef.GS_PHARMACY_ID || selectPharmacyIdInt == ConstantDef.GUANGSAN_ID || selectPharmacyIdInt == 1 || selectPharmacyIdInt == 4 || selectPharmacyIdInt == 5 || selectPharmacyIdInt == 12 || selectPharmacyIdInt == 13 || selectPharmacyIdInt == 14;
+            if (bl) {
+                // 退费中
+                if (statusInt == 10) {
+                    whereSql += " and ( refund_status = ?  ) ";
+                    paramList.add(RefundStatusEnum.PENDING.getValue());
+                } else {
+                    whereSql += " and ( status = ? and (refund_status != ? or refund_status is null) ) ";
+                    paramList.add(Integer.parseInt(request.getStatus()));
+                    paramList.add(RefundStatusEnum.PENDING.getValue());
+                }
+            } else if (authService.getCurrentPharmacyId() == ConstantDef.GK_PHARMACY_ID) {
+                // 国控大药房状态：1-待支付、2-待取药、3-已退费、4-已过期
+                switch (statusInt) {
+                    case 2:
+                        whereSql += " and ( status = 2 or status = 3) ";
+                        break;
+                    case 3:
+                        whereSql += " and ( status = 4) ";
+                        break;
+                    case 4:
+                        whereSql += " and ( status = 5) ";
+                        break;
+                    default:
+                        whereSql += " and ( status = ?) ";
+                        paramList.add(statusInt);
+                        break;
+                }
+            }
+        }
+
+        if (!Checker.isNone(request.getPaymentStatus())) {
+            whereSql += " and ( payment_status = ? ) ";
+            paramList.add(Integer.parseInt(request.getPaymentStatus()));
+        }
+
+        if (!Checker.isNone(request.getPreBizNo())) {
+            whereSql += " and ( pre_biz_no like ? ) ";
+            paramList.add("%" + request.getPreBizNo().trim() + "%");
+        }
+        if (!Checker.isNone(request.getBizNo3th())) {
+            whereSql += " and ( biz_no_3th like ? ) ";
+            paramList.add("%" + request.getBizNo3th().trim() + "%");
+        }
+        if (!Checker.isNone(request.getOrderNo())) {
+            whereSql += " and ( order_no like ? ) ";
+            paramList.add("%" + request.getOrderNo().trim() + "%");
+        }
+
+        if (!Checker.isNone(request.getPaymentChannel())) {
+            whereSql += " and ( payment_channel = ? ) ";
+            paramList.add(Integer.parseInt(request.getPaymentChannel()));
+        }
+
+        String Format_Date = "yyyy-MM-dd";
+        SimpleDateFormat format = new SimpleDateFormat(Format_Date);
+        String createTimeEnd = request.getCreateTimeEnd();
+        String createTimeStart = request.getCreateTimeStart();
+        String payTimeEnd = request.getPayTimeEnd();
+        String payTimeStart = request.getPayTimeStart();
+        String refundTimeEnd = request.getRefundTimeEnd();
+        String refundTimeStart = request.getRefundTimeStart();
+
+        try {
+            // 创建时间
+            if (!Checker.isNull(createTimeEnd)) {
+                whereSql += " and ( create_on < ?)";
+                Date date = format.parse(createTimeEnd);
+                //把日期往后增加一天.整数往后推,负数往前移动
+                Calendar calendar = new GregorianCalendar();
+                calendar.setTime(date);
+                calendar.add(Calendar.DATE, 1);
+                //这个时间就是日期往后推一天的结果
+                date = calendar.getTime();
+
+                paramList.add(date);
+            }
+
+
+
+            if (!Checker.isNull(createTimeStart)) {
+                whereSql += " and ( create_on >= ?)";
+                Date date = format.parse(createTimeStart);
+                paramList.add(date);
+            }
+
+            // 支付时间
+            if (!Checker.isNull(payTimeEnd)) {
+                whereSql += " and ( pay_time < ?)";
+                Date date = format.parse(payTimeEnd);
+                //把日期往后增加一天.整数往后推,负数往前移动
+                Calendar calendar = new GregorianCalendar();
+                calendar.setTime(date);
+                calendar.add(Calendar.DATE, 1);
+                //这个时间就是日期往后推一天的结果
+                date = calendar.getTime();
+
+                paramList.add(date);
+            }
+
+            if (!Checker.isNull(payTimeStart)) {
+                whereSql += " and ( pay_time >= ?)";
+                Date date = format.parse(payTimeStart);
+                paramList.add(date);
+            }
+
+
+            // 退费时间搜索
+            if (!Checker.isNull(refundTimeEnd)) {
+                whereSql += " and (refund_time < ?)";
+                Date date = format.parse(refundTimeEnd);
+                //把日期往后增加一天.整数往后推,负数往前移动
+                Calendar calendar = new GregorianCalendar();
+                calendar.setTime(date);
+                calendar.add(Calendar.DATE, 1);
+                //这个时间就是日期往后推一天的结果
+                date = calendar.getTime();
+
+                paramList.add(date);
+            }
+
+            if (!Checker.isNull(refundTimeStart)) {
+                whereSql += " and ( refund_time >= ?)";
+                Date date = format.parse(refundTimeStart);
+                paramList.add(date);
+            }
+
+            if (!Checker.isNull(request.getSource())) {
+                whereSql += " and ( source = ?)";
+                paramList.add(Integer.parseInt(request.getSource()));
+            }
+            if (!Checker.isNull(request.getReceiveStatus())) {
+                int receiveStatusInt = Integer.parseInt(request.getReceiveStatus());
+                // receiveStatus: 1-成功，2-失败
+                if (receiveStatusInt == 1) {
+                    whereSql += " and ( sinopharm & ? = ?)";
+                    paramList.add(SinopharmEnum.CONFIRM_ORDER.getValue());
+                    paramList.add(SinopharmEnum.CONFIRM_ORDER.getValue());
+                } else {
+                    whereSql += " and ( sinopharm & ? = ?)";
+                    paramList.add(SinopharmEnum.Failure.getValue());
+                    paramList.add(SinopharmEnum.Failure.getValue());
+                }
+            }
+
+            if (!Checker.isNull(selectPharmacyId)) {
+                whereSql += " and pharmacy_id = ? ";
+                paramList.add(Integer.parseInt(selectPharmacyId));
+            }
+
+
+            if (!Checker.isNull(request.getPatientNo())) {
+                whereSql += " and patient_no = ? ";
+                paramList.add(request.getPatientNo().trim());
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        // logger.info("buildQueryPrescriptionListSQLParam(): whereSql = " + whereSql);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("whereSql", whereSql);
+        map.put("paramList", paramList);
+        return map;
+    }
+}

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

@@ -830,7 +830,8 @@ public class PrescriptionServices {
                 Map<Integer, Pharmacy> ma = pharmacyCacheService.getPharmacyMap();
                 for (PrescriptionDrugView d : list) {
                     String orderNo = Checker.getStringValue(d.getOrderNo());
-                    String drugName = Checker.getStringValue(d.getDrugSpec());
+                    String drugName = Checker.getStringValue(d.getDrugName());
+                    String spec = Checker.getStringValue(d.getDrugSpec());
                     String quan = Checker.getStringValue(d.getQuantity() + "");
                     String price = FormatUtil.intShrink100ToStr(d.getPrice());
                     String total = FormatUtil.intShrink100ToStr(d.getTotal());
@@ -844,7 +845,8 @@ public class PrescriptionServices {
                     }
                     map.getStringListSafely(col0).add(orderNo);
                     map.getStringListSafely(col1).add(drugName);
-                    map.getStringListSafely(col2).add(quan);
+                    map.getStringListSafely(col2).add(spec);
+                    map.getStringListSafely(col3).add(quan);
                     map.getStringListSafely(col4).add(price);
                     map.getStringListSafely(col5).add(total);
                     map.getStringListSafely(col6).add(payTime);

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

@@ -44,15 +44,10 @@ public class NatOrderController {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录
-        int  hospital = authService.getCurrentHospitalId();
-        request.setHospitalId(hospital);
-//        if(request.getHosp() > 0){
-//            hospital = authService.getCurrentHospitalId();
-//            request.setHospitalId(hospital);
-//        }
+
         int downloadRecordId = idGenerator.genDownloadRecordId();
-        String name = "核酸检测";
-        String fileName = "核酸检测";
+        String name = "核酸检测缴费";
+        String fileName = "核酸检测缴费";
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
         String paramUrl = "/natOrder/downloadNatOrderList";
         String paramJson = JsonSerializer.toJson(request);

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

@@ -36,6 +36,7 @@ import jxl.write.*;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -308,7 +309,7 @@ public class OfflineController {
     }
 */
     @RequestMapping({"/downloadOfflineList"})
-    public BaseResponse downloadOfflineList(DownloadOfflineListNewRequest request) {
+    public BaseResponse downloadOfflineList(@RequestBody DownloadOfflineListNewRequest request) {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
         request.setCurrentAdminId(currentAdminId);
         // 插入记录

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

@@ -71,15 +71,10 @@ public class PrescriptionController {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
 //        request.setCurrentAdminId(currentAdminId);
         // 插入记录
-        int  hospital = authService.getCurrentHospitalId();
-//        request.setHospitalId(hospital);
-//        if(request.getHosp() > 0){
-//            hospital = authService.getCurrentHospitalId();
-//            request.setHospitalId(hospital);
-//        }
+
         int downloadRecordId = idGenerator.genDownloadRecordId();
-        String name = "处方列表";
-        String fileName = "处方列表";
+        String name = "处方列表(药品)";
+        String fileName = "处方列表(药品)";
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
         String paramUrl = "/prescription/downloadPrescriptionDrugList";
         String paramJson = JsonSerializer.toJson(request);

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

@@ -50,8 +50,8 @@ public class HospNatOrderController {
 //            request.setHospitalId(hospital);
 //        }
         int downloadRecordId = idGenerator.genDownloadRecordId();
-        String name = "核酸检测";
-        String fileName = "核酸检测记录";
+        String name = "核酸检测缴费";
+        String fileName = "核酸检测缴费";
         String excelSuffixFormat = ConstantDef.EXCEL_SUFFIX_FORMAT;
         String paramUrl = "/hosp/natOrder/downloadNatOrderList";
         String paramJson = JsonSerializer.toJson(request);

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

@@ -14,6 +14,7 @@ import com.ywt.mg.web.controllers.OfflineController;
 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;
 
@@ -38,7 +39,7 @@ public class HospOfflineController {
 
 
     @RequestMapping({"/downloadOfflineList"})
-    public BaseResponse downloadOfflineList(DownloadOfflineListNewRequest request) {
+    public BaseResponse downloadOfflineList(@RequestBody DownloadOfflineListNewRequest request) {
         int currentAdminId = Checker.getIntegerValue(authService.getCurrentAdminId());
         request.setCurrentAdminId(currentAdminId);
         // 插入记录