修改部分代码

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -3319,7 +3319,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    "\tp.pay_time AS \"pay_time\",\n" +
                    "\tp.real_order AS \"realOrder\",\n" +
                    "\to.patient_name AS \"patientName\",\n" +
                    "\tA.infoName,\n" +
                    "\tA.infoName as \"infoName\",\n" +
                    "\tp.create_time AS \"create_time\",\n" +
                    "\te.oneself_pickup_flg AS \"oneself_pickup_flg\",\n" +
                    "\tp. STATUS AS \"STATUS\"\n" +
@@ -3329,7 +3329,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    "JOIN (\n" +
                    "\tSELECT\n" +
                    "\t\ti.prescription_id,\n" +
                    "\t\tWM_CONCAT(i.drug_name) AS \"infoName\"\n" +
                    "\t\tWM_CONCAT(i.drug_name) AS infoName " +
                    "\tFROM\n" +
                    "\t\twlyy_prescription_info i\n" +
                    "\tGROUP BY\n" +
@@ -3661,7 +3661,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                }
                addCell(ws, i, 0, m.get("time")!=null?m.get("time").toString():n);
                addCell(ws, i, 0, m.get("createTime")!=null?m.get("createTime").toString():n);
                addCell(ws, i, 1, m.get("realOrder")!=null?m.get("realOrder").toString():n);
                addCell(ws, i, 2, m.get("patientName")!=null?m.get("patientName").toString():n);
                addCell(ws, i, 3, m.get("NAME")!=null?m.get("NAME").toString():n);
@@ -3768,7 +3768,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            WritableSheet ws;
            ws = wwb.createSheet("sheet", 1);
            String[] header = {"序号","充值时间","商户订单号","医院订单号","患者姓名","证件号码","就诊卡号","手机号码","金额","业务类型","咨询方式"};
            String[] header = {"序号","充值时间","商户订单号","医院订单号","患者姓名","证件号码","就诊卡号","手机号码","金额","业务类型","咨询方式","状态"};
            int k = 0;
            for (String h : header) {
                addCell(ws, 0, k, h);//表名，行，列，header

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -2064,7 +2064,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                "\tt.description AS \"description\",\n" +
                "\tt.pay_type AS \"payType\",\n" +
                "\tt.pay_price AS \"payPrice\",\n" +
                "\tt.pay_time AS \"payTime\",\n" +
                "\tt.create_time AS \"payTime\",\n" +
                "\tt.upload_status AS \"uploadStatus\",\n" +
                "\tt.create_time AS \"createTime\",\n" +
                "\tt.remark AS \"remark\",\n" +

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -2087,7 +2087,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.pushYkCardCharge)
    @ApiOperation(value = "导出眼科通充值记录", notes = "")
    public void pushYkCardCharge(@ApiParam(name = "startTime", value = "开始时间")
    public Envelop pushYkCardCharge(@ApiParam(name = "startTime", value = "开始时间")
                                       @RequestParam(value = "startTime", required = false)String startTime,
                                       @ApiParam(name = "endTime", value = "结束时间")
                                       @RequestParam(value = "endTime", required = false)String endTime,
@@ -2121,8 +2121,9 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            OutputStream os = response.getOutputStream();
            prescriptionService.pushYktCardChargeWrite(os, list);
            return success(expressages);
        }catch (Exception e) {
            e.printStackTrace();
            return failedMixEnvelopException(e);
        }
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -810,7 +810,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.pushListWrite)
    @ApiOperation(value = "订单导出", notes = "订单导出")
    public void pushListWrite(@ApiParam(name = "status", value = "流程状态，多状态用‘,’分割")
    public Envelop pushListWrite(@ApiParam(name = "status", value = "流程状态，多状态用‘,’分割")
                              @RequestParam(value = "status", required = false) String status,
                              @ApiParam(name = "oneselfPickupFlg", value = "是否自取 1是 0否")
                              @RequestParam(value = "oneselfPickupFlg", required = false) String oneselfPickupFlg,
@@ -823,23 +823,23 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                              @ApiParam(name = "endTime", value = "结束时间,yyyy-MM-dd")
                              @RequestParam(value = "endTime", required = false) String endTime,
                              HttpServletResponse response) throws Exception {
        try {
        try{
            MixEnvelop expressages = prescriptionService.findExpressageList2(status, oneselfPickupFlg, nameKey, startTime, endTime, 1, 10000, wxId, patientName);
            List<Map<String, Object>> list = expressages.getDetailModelList();
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("pushDataList.xls"));
            OutputStream os = response.getOutputStream();
            prescriptionService.pushListWrite(os, list);
         OutputStream os = response.getOutputStream();
         prescriptionService.pushListWrite(os, list);
            return success(expressages);
        }catch (Exception e) {
            e.printStackTrace();
            return failedMixEnvelopException(e);
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.searchRecordWrite)
    @ApiOperation(value = "咨询记录导出", notes = "咨询记录导出")
    public void searchRecordWrite(@ApiParam(name = "doctor", value = "医生id")
    public Envelop searchRecordWrite(@ApiParam(name = "doctor", value = "医生id")
                                         @RequestParam(value = "doctor",required = false) String doctor,
                                     @ApiParam(name = "title", value = "咨询标题关键字")
                                         @RequestParam(value = "title",required = false) String title,
@@ -856,15 +856,17 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                     @ApiParam(name = "end_time", value = "结束时间 YYYY-MM-DD HH:MM:SS")
                                         @RequestParam(value = "end_time",required = false) String end_time,
            HttpServletResponse response) throws Exception {
        try {
        try{
            MixEnvelop expressages = imService.recordByDoctor(doctor, id, type, status, title, start_time, end_time, patient);//
            List<Map<String, Object>> list = expressages.getDetailModelList();
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("searchRecordWrite.xls"));
            OutputStream os = response.getOutputStream();
            prescriptionService.searchRecordWrite(os, list);
            return success(expressages);
        }catch (Exception e) {
            e.printStackTrace();
            return failedMixEnvelopException(e);
        }
    }