修改

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.register_date,'%Y-%m-%d %H:%i:%S' )  AS \"czrq\",";
                sql = sql + "date_format(op.create_time,'%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.register_date,'YYYY-MM-DD hh24:mi:ss')  AS \"czrq\",";
                sql = sql + "to_char(op.create_time,'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.register_date,'%Y-%m-%d %H:%i:%S' )  AS \"czrq\",";
            sql = sql + "date_format(op.create_time,'%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\",";
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultStatisticsEndpoint.java

@@ -158,7 +158,7 @@ public class DoctorConsultStatisticsEndpoint extends EnvelopRestEndpoint {
			String filterSql = " WHERE " +
					" op.scbgjt IS NOT NULL AND op.create_time BETWEEN TO_DATE('"+startTime+"', 'YYYY-MM-DD')" +
					" AND TO_DATE('"+endTime+"', 'YYYY-MM-DD') AND op.scbgjt_org_code IS NOT NULL ";
					" AND TO_DATE('"+endTime+" 23:59:59', 'YYYY-MM-DD HH24:MI:SS') AND op.scbgjt_org_code IS NOT NULL ";
			String groupSql = "GROUP BY " +
					" op.scbgjt_org_code, op.scbgjt_org_name ";
@@ -166,16 +166,16 @@ public class DoctorConsultStatisticsEndpoint extends EnvelopRestEndpoint {
			if("org".equals(aggField)) {
				selectSql += fromPart;
			} else if("dept".equals(aggField)) {
				selectSql += ",op.dept AS \"deptCode\",op.dept_name AS \"deptName\" ";
				selectSql += ",dh.dept_code AS \"deptCode\",dh.dept_name AS \"deptName\" ";
				selectSql += fromPart;
				if(StringUtils.isBlank(orgId)) {
					throw new ServiceException("参数未传");
				}
				filterSql += " AND op.scbgjt_org_code = '" + orgId + "' ";
				groupSql += " ,op.dept, op.dept_name ";
				groupSql += " ,dh.dept_code, dh.dept_name ";
			} else if("doctor".equals(aggField)) {
				selectSql += ",op.dept AS \"deptCode\"," +
						"op.dept_name AS \"deptName\"," +
				selectSql += ",dh.dept_code AS \"deptCode\"," +
						"dh.dept_name AS \"deptName\"," +
						"op.doctor AS \"doctor\"," +
						"op.doctor_name AS \"doctorName\"," +
						"dh.doctor_duty_name AS \"doctorDutyName\", " +
@@ -186,7 +186,7 @@ public class DoctorConsultStatisticsEndpoint extends EnvelopRestEndpoint {
					throw new ServiceException("参数未传");
				}
				filterSql += " AND op.scbgjt_org_code ='"+orgId+"' AND dh.dept_code='" + deptId + "' ";
				groupSql += ",op.dept,op.dept_name,op.doctor,op.doctor_name,dh.doctor_duty_name,dh.org_code,dh.org_name ";
				groupSql += ",dh.dept_code,dh.dept_name,op.doctor,op.doctor_name,dh.doctor_duty_name,dh.org_code,dh.org_name ";
			}
			if(StringUtils.isNotBlank(mediaType)) {
@@ -271,7 +271,7 @@ public class DoctorConsultStatisticsEndpoint extends EnvelopRestEndpoint {
			String filterSql = " WHERE " +
					" op.scbgjt IS NOT NULL AND op.create_time BETWEEN TO_DATE('"+startTime+"', 'YYYY-MM-DD')" +
					" AND TO_DATE('"+endTime+"', 'YYYY-MM-DD') AND op.scbgjt_org_code IS NOT NULL ";
					" AND TO_DATE('"+endTime+" 23:59:59', 'YYYY-MM-DD HH24:MI:SS') AND op.scbgjt_org_code IS NOT NULL ";
			String groupSql = "GROUP BY " +
					" TO_CHAR(op.create_time, 'YYYY-MM-DD'),op.scbgjt_org_code, op.scbgjt_org_name ";
@@ -316,6 +316,8 @@ public class DoctorConsultStatisticsEndpoint extends EnvelopRestEndpoint {
			selectSql += filterSql;
			selectSql += groupSql;
			selectSql += " ORDER BY TO_CHAR(op.create_time, 'YYYY-MM-DD') ASC ";
			List<Map<String, Object>> list = jdbcTemplate.queryForList(selectSql);
			JSONObject result = new JSONObject();