眼科医院v2.0.5

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

@@ -3947,7 +3947,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
@@ -3961,9 +3961,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                if(m.get("STATUS") == null){
                    status = null;
                }else{
                    if (m.get("STATUS").equals("1")){
                    if (m.get("STATUS").equals("0")){
                        status += "候诊中";
                    }else if (m.get("STATUS").equals("2")){
                    }else if (m.get("STATUS").equals("1") || m.get("STATUS").equals("2")){
                        status += "就诊中";
                    }else if (m.get("STATUS").equals("3")){
                        status += "结束";
@@ -4007,6 +4007,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                addCell(ws, i, 8, payy!=null?payy:n);
                addCell(ws, i, 9, status.toString()!=null?status.toString():n);
                addCell(ws, i, 10, m.get("scbgjtOrgName")!=null?m.get("scbgjtOrgName").toString():n);
                addCell(ws, i, 11, m.get("icd10Name")!=null?m.get("icd10Name").toString():n);
                i++;
            }
            wwb.write();

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

@@ -4080,16 +4080,16 @@ public class ImService {
                "op.description AS \"symptoms\",";
        if ("xm_ykyy_wx".equals(wxId)) {
            if (flag) {
                sql = sql + "date_format(op.create_time,'%Y-%m-%d %H:%i:%S' )  AS \"czrq\",";
                sql = sql + "date_format(op.register_date,'%Y-%m-%d %H:%i:%S' )  AS \"czrq\",";
                sql = sql + "date_format(op.end_time,'%Y-%m-%d %H:%i:%S' )  AS \"endTime\", ";
                sql = sql + "date_format(d.birthday,'%Y-%m-%d' )  AS \"birthday\",";
            } else {
                sql = sql + "to_char(op.create_time,'YYYY-MM-DD hh24:mi:ss')  AS \"czrq\",";
                sql = sql + "to_char(op.register_date,'YYYY-MM-DD hh24:mi:ss')  AS \"czrq\",";
                sql = sql + "to_char(op.end_time,'YYYY-MM-DD hh24:mi:ss')  AS \"endTime\",";
                sql = sql + "to_char(d.birthday,'YYYY-MM-DD')  AS \"birthday\",";
            }
        } else {
            sql = sql + "date_format(op.create_time,'%Y-%m-%d %H:%i:%S' )  AS \"czrq\",";
            sql = sql + "date_format(op.register_date,'%Y-%m-%d %H:%i:%S' )  AS \"czrq\",";
            sql = sql + "date_format(op.end_time,'%Y-%m-%d %H:%i:%S' )  AS \"endTime\",";
            sql = sql + "date_format(d.birthday,'%Y-%m-%d' )  AS \"birthday\",";
        }
@@ -4383,6 +4383,7 @@ public class ImService {
                        "\ta.description AS \"des\",\n" +
                        "\tb. STATUS AS \"pay\",\n" +
                        "\ta. STATUS AS \"STATUS\",\n" +
                        "\ta.icd10_name as \"icd10Name\"," +
                        "\ta. scbgjt_org_code AS \"scbgjtOrgCode\",\n" +
                        "\ta. scbgjt_org_name AS \"scbgjtOrgName\"\n" +
                        "FROM\n" +