修改部分代码

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

@@ -3604,66 +3604,63 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            String n = " ";
            for (Map<String, Object> m : ls) {
                Object create_time = m.get("create_time");
                String createTime = "";
                if (create_time == null){
                    createTime += "否";
                if (m.get("create_time") == null) {
                     createTime = "否";
                }else {
                    createTime += "是";
                    createTime = "是";
                }
                Integer oneself_pickup_flg = (Integer) m.get("oneself_pickup_flg");
                String opf = "";
                if(oneself_pickup_flg == null) {
                    opf += " ";
                }else if (oneself_pickup_flg == 1) {
                if (m.get("oneself_pickup_flg") == null) {
                    opf = null;
                }else if (Integer.parseInt(m.get("oneself_pickup_flg").toString()) == 1){
                    opf += "自取";
                }else if (oneself_pickup_flg == 2) {
                }else if (Integer.parseInt(m.get("oneself_pickup_flg").toString()) == 2){
                    opf += "快递配送";
                }else {
                    opf += "其他";
                }
                Integer statuss = (Integer) m.get("STATUS");
                String status = "";
                if(statuss == null) {
                    status += " ";
                }else if (statuss == -4) {
                    status += "已作废";
                }else if (statuss == -3) {
                    status += "支付过期取消";
                }else if (statuss == -2) {
                    status += "患者自己取消";
                }else if (statuss == -1) {
                    status += "医生取消";
                }else if (statuss == 0) {
                    status += "候诊中";
                }else if (statuss == 10) {
                    status += "诊断中";
                }else if (statuss == 11) {
                    status += "药师审核失败 / 调整中";
                }else if (statuss == 12) {
                    status += "药师审核完成";
                }else if (statuss == 13) {
                    status += "开方失败/调整中";
                }else if (statuss == 20) {
                    status += "诊断完成/开方成功/待支付";
                }else if (statuss == 30) {
                    status += "支付成功/等待配药";
                }else if (statuss == 31) {
                    status += "配药成功/等待取药";
                }else if (statuss == 32) {
                    status += "配送中";
                }else if (statuss == 100) {
                    status += "已完成/未评价";
                }else if (statuss == 101) {
                    status += "已完成/已经评价";
                }else {
                    status += " ";
                if (m.get("STATUS") == null) {
                    status = null;
                }else{
                    if (Integer.parseInt(m.get("STATUS").toString()) == -4) {
                        status += "已作废";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == -3) {
                        status += "支付过期取消";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == -2) {
                        status += "患者自己取消";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == -1) {
                        status += "医生取消";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 0) {
                        status += "候诊中";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 10) {
                        status += "诊断中";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 11) {
                        status += "药师审核失败 / 调整中";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 12) {
                        status += "药师审核完成";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 13) {
                        status += "开方失败/调整中";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 20) {
                        status += "诊断完成/开方成功/待支付";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 30) {
                        status += "支付成功/等待配药";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 31) {
                        status += "配药成功/等待取药";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 32) {
                        status += "配送中";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 100) {
                        status += "已完成/未评价";
                    }else if (Integer.parseInt(m.get("STATUS").toString()) == 101) {
                        status += "已完成/已经评价";
                    }else {
                        status = null;
                    }
                }
                addCell(ws, i, 0, m.get("time")!=null?m.get("time").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);
@@ -3705,45 +3702,45 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            int i = 1;
            String n = " ";
            for (Map<String, Object> m : list) {
                Object statuss = m.get("STATUS");
                String status = "";
                if (statuss == null){
                    status += " ";
                }else if (statuss.equals("1")){
                    status += "候诊中";
                }else if (statuss.equals("2")){
                    status += "就诊中";
                }else if (statuss.equals("3")){
                    status += "结束";
                }else {
                    status += "取消";
                if(m.get("STATUS") == null){
                    status = null;
                }else{
                    if (m.get("STATUS").equals("1")){
                        status += "候诊中";
                    }else if (m.get("STATUS").equals("2")){
                        status += "就诊中";
                    }else if (m.get("STATUS").equals("3")){
                        status += "结束";
                    }else {
                        status += "取消";
                    }
                }
                Integer pay = (Integer) m.get("pay");
                String payy = "";
                if(pay == null){
                    payy = "";
                }
                else if (pay >= 20) {
                    payy += "是";
                }else if (pay < 20){
                    payy += "否";
                if (m.get("pay") == null) {
                    payy = null;
                }else {
                    if (Integer.parseInt(m.get("pay").toString()) >= 20) {
                        payy += "是";
                    }else if (Integer.parseInt(m.get("pay").toString()) < 20){
                        payy += "否";
                    }
                }
                Object type = m.get("type");
                if (type == null) {
                    type = " ";
                String type = "";
                if (m.get("type") == null) {
                }else {
                    if(type.equals("1")) {
                    if(m.get("type").equals("1")) {
                        type = "在线复诊";
                    }else if (type.equals("2")) {
                    }else if (m.get("type").equals("2")) {
                        type = "协同门诊";
                    }else if (type.equals("3")) {
                    }else if (m.get("type").equals("3")) {
                        type = "专家咨询";
                    }
                }
                addCell(ws, i, 0, m.get("pname")!=null?m.get("pname").toString():n);
                addCell(ws, i, 1, m.get("dname")!=null?m.get("dname").toString():n);
                addCell(ws, i, 2, m.get("dept")!=null?m.get("dept").toString():n);
@@ -3752,7 +3749,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                addCell(ws, i, 5, m.get("rtime")!=null?m.get("rtime").toString():n);
                addCell(ws, i, 6, m.get("etime")!=null?m.get("etime").toString():n);
                addCell(ws, i, 7, m.get("des")!=null?m.get("des").toString():n);
                addCell(ws, i, 8, payy.toString()!=null?payy.toString():n);
                addCell(ws, i, 8, payy!=null?payy:n);
                addCell(ws, i, 9, status.toString()!=null?status.toString():n);
                i++;
            }

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 Envelop pushYkCardCharge(@ApiParam(name = "startTime", value = "开始时间")
    public void pushYkCardCharge(@ApiParam(name = "startTime", value = "开始时间")
                                       @RequestParam(value = "startTime", required = false)String startTime,
                                       @ApiParam(name = "endTime", value = "结束时间")
                                       @RequestParam(value = "endTime", required = false)String endTime,
@@ -2121,9 +2121,8 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            OutputStream os = response.getOutputStream();
            prescriptionService.pushYktCardChargeWrite(os, list);
            return success(expressages);
        }catch (Exception e) {
            return failedMixEnvelopException(e);
            e.printStackTrace();
        }
    }

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

@@ -823,12 +823,17 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                              @ApiParam(name = "endTime", value = "结束时间,yyyy-MM-dd")
                              @RequestParam(value = "endTime", required = false) String endTime,
                              HttpServletResponse response) throws Exception {
        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);
        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);
        }catch (Exception e) {
            e.printStackTrace();
        }
    }
@@ -851,12 +856,16 @@ 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 {
            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);
        }catch (Exception e) {
            e.printStackTrace();
        }
    }