111

src/main/java/com/ekexiu/project/msconsole/department/DepartmentDao.java

@@ -14,6 +14,7 @@ import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.UnEquals;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
@@ -48,5 +49,5 @@ public interface DepartmentDao {
    @Nullable
    @SelectOne
    Department queryByName(Connection con,String hospital, String name) throws SQLException;
    Department queryByName(Connection con, @Nullable Boolean active, String hospital, String name, @Nullable @UnEquals String id) throws SQLException;
}

src/main/java/com/ekexiu/project/msconsole/department/DepartmentService.java

@@ -77,8 +77,8 @@ public class DepartmentService {
    @Path("/checkName")
    @Get
    public Department queryByName(@JdbcConn Connection con, @LoginUser SessionUser user, String name) throws SQLException {
        return departmentDao.queryByName(con, user.getId(), name);
    public Department queryByName(@JdbcConn Connection con,@Nullable Boolean active, @LoginUser SessionUser user, String name,String id) throws SQLException {
        return departmentDao.queryByName(con,active, user.getId(), name,id);
    }
    @Path("/name")

src/main/java/com/ekexiu/project/msconsole/doctor/DoctorDao.java

@@ -15,6 +15,7 @@ import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.annotation.dao.param.UnEquals;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
@@ -50,5 +51,5 @@ public interface DoctorDao {
    @Nullable
    @SelectOne
    Doctor queryByAccount(Connection con, String account) throws SQLException;
    Doctor queryByAccount(Connection con, @Nullable Boolean active, String account, @Nullable @UnEquals String id) throws SQLException;
}

src/main/java/com/ekexiu/project/msconsole/doctor/DoctorService.java

@@ -92,8 +92,8 @@ public class DoctorService {
    @Get
    @Path("/check")
    public SessionDoctor queryByAccount(@JdbcConn Connection con,String account)throws SQLException {
        return makeSessionDoctor(doctorDao.queryByAccount(con, account));
    public SessionDoctor queryByAccount(@JdbcConn Connection con,@Nullable Boolean active, String account,@Nullable String id)throws SQLException {
        return makeSessionDoctor(doctorDao.queryByAccount(con,active,account,id));
    }
    private static SessionDoctor makeSessionDoctor(Doctor doctor) {