Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyOutpatientDO.java

@@ -164,6 +164,8 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
     */
    private String diseaseImg;
    private String hasRemind; // 1是已提醒
    /**
     * 创建时间
     */
@@ -325,6 +327,15 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    private String scbgjtOrgName;
    @Column(name = "has_remind")
    public String getHasRemind() {
        return hasRemind;
    }
    public void setHasRemind(String hasRemind) {
        this.hasRemind = hasRemind;
    }
    @Column(name = "scbgjt_org_code")
    public String getScbgjtOrgCode() {
        return scbgjtOrgCode;

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

@@ -160,16 +160,16 @@ public class DoctorConsultStatisticsEndpoint extends EnvelopRestEndpoint {
			if("org".equals(aggField)) {
				selectSql += fromPart;
			} else if("dept".equals(aggField)) {
				selectSql += ",dh.dept_code AS \"deptCode\",dh.dept_name AS \"deptName\" ";
				selectSql += ",op.dept AS \"deptCode\",op.dept_name AS \"deptName\" ";
				selectSql += fromPart;
				if(StringUtils.isBlank(orgId)) {
					throw new ServiceException("参数未传");
				}
				filterSql += " AND op.scbgjt_org_code = '" + orgId + "' ";
				groupSql += " ,dh.dept_code, dh.dept_name ";
				groupSql += " ,op.dept, op.dept_name ";
			} else if("doctor".equals(aggField)) {
				selectSql += ",dh.dept_code AS \"deptCode\"," +
						"dh.dept_name AS \"deptName\"," +
				selectSql += ",op.dept AS \"deptCode\"," +
						"op.dept_name AS \"deptName\"," +
						"op.doctor AS \"doctor\"," +
						"op.doctor_name AS \"doctorName\"," +
						"dh.doctor_duty_name AS \"doctorDutyName\", " +
@@ -180,7 +180,7 @@ public class DoctorConsultStatisticsEndpoint extends EnvelopRestEndpoint {
					throw new ServiceException("参数未传");
				}
				filterSql += " AND op.scbgjt_org_code ='"+orgId+"' AND dh.dept_code='" + deptId + "' ";
				groupSql += ",dh.dept_code,dh.dept_name,op.doctor,op.doctor_name,dh.doctor_duty_name,dh.org_code,dh.org_name ";
				groupSql += ",op.dept,op.dept_name,op.doctor,op.doctor_name,dh.doctor_duty_name,dh.org_code,dh.org_name ";
			}
			if(StringUtils.isNotBlank(mediaType)) {