代码修改

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

@@ -3902,7 +3902,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
@@ -3950,24 +3950,36 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        type = "专家咨询";
                    }
                }
                String payType = "";
                if(m.get("medicalState")==null){
                }else {
                    if(m.get("medicalState").equals("1")) {
                        payType = "医保";
                    }else {
                        payType = "自费";
                    }
                }
                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);
                addCell(ws, i, 3, type.toString()!=null?type.toString():n);
                addCell(ws, i, 3, type);
                addCell(ws, i, 4, m.get("ctime")!=null?m.get("ctime").toString():n);
                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!=null?payy:n);
                addCell(ws, i, 9, status.toString()!=null?status.toString():n);
                addCell(ws, i, 8, m.get("icd10Name")!=null?m.get("icd10Name").toString():n);
                addCell(ws, i, 9, payType);
                addCell(ws, i, 10, payy!=null?payy:n);
                addCell(ws, i, 11, status!=null?status:n);
                i++;
            }
            wwb.write();
            wwb.close();
        } catch (IOException e) {
            e.printStackTrace();
            if (wwb != null) wwb.close();
            wwb.close();
            throw e;
        }
    }

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -4568,6 +4568,8 @@ public class ImService {
                "\ta.register_date AS \"rtime\",\n" +
                "\ta.end_time AS \"etime\",\n" +
                "\ta.description AS \"des\",\n" +
                " a.icd10_name as \"icd10Name\"," +
                " a.medical_state as \"medicalState\"  ," +
                "\tb. STATUS AS \"pay\",\n" +
                "\ta. STATUS AS \"STATUS\"\n" +
                "FROM\n" +