1. 테스트 파일 제거

2. 환자 회원가입 시 ID 값 받아서 환영메시지 노출하는 부분 오류
Ver. 0.0.1
2020-06-30 20:33:08 +09:00 · 2020-06-29 12:41:20 +09:00 · 2020-06-28 03:56:19 +09:00 · 2020-06-25 16:57:40 +09:00 · 2020-06-23 17:52:42 +09:00 · 2020-06-22 20:32:08 +09:00
58 changed files with 2422 additions and 99 deletions
--- a/hospital.zip
+++ b/hospital.zip
--- a/hospital/.classpath
+++ b/hospital/.classpath
@@ -24,7 +24,7 @@
 			<attribute name="owner.project.facets" value="jst.web;#system#"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
--- a/hospital/.settings/org.eclipse.jdt.core.prefs
+++ b/hospital/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,117 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
--- a/hospital/pom.xml
+++ b/hospital/pom.xml
@@ -26,6 +26,24 @@
      <version>4.11</version>
      <scope>test</scope>
    </dependency>
+    <!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
+<dependency>
+    <groupId>org.mariadb.jdbc</groupId>
+    <artifactId>mariadb-java-client</artifactId>
+    <version>2.6.0</version>
+</dependency>
+<dependency>
+        <groupId>taglibs</groupId>
+        <artifactId>standard</artifactId>
+        <version>1.1.2</version>
+    </dependency>
+    <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>jstl</artifactId>
+        <version>1.1.2</version>
+    </dependency>
+
+    
  </dependencies>

  <build>
--- a/hospital/src/main/java/DB/BasicDao.java
+++ b/hospital/src/main/java/DB/BasicDao.java
@@ -0,0 +1,29 @@
+package DB;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class BasicDao {
+    private String driver = "org.mariadb.jdbc.Driver";
+    //private String url = "jdbc:mysql://@110.35.119.108:3307:hospital_DB";
+    private String url="jdbc:mariadb://110.35.119.108:3307/hospital_DB";
+    private String user = "mes";
+    private String password = "Mestkdrhdghldmlth1!";
+    protected Connection conn;
+    protected PreparedStatement psmt;
+    protected ResultSet rs;
+
+    public BasicDao() {
+        try {
+            Class.forName(this.driver);
+            this.conn = DriverManager.getConnection(this.url, this.user, this.password);
+            
+        } catch (SQLException | ClassNotFoundException var2) {
+            var2.printStackTrace();
+        }
+
+    }
+}
--- a/hospital/src/main/java/DB/BoardDao.java
+++ b/hospital/src/main/java/DB/BoardDao.java
@@ -0,0 +1,103 @@
+package DB;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+public class BoardDao extends BasicDao {
+    private final String SELECT_ALL = "SELECT * FROM user_tbl";
+
+    public BoardDao() {
+    }
+
+    public ArrayList<BoardVo> select() {
+        ArrayList list = new ArrayList();
+
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM user_tbl");
+            this.rs = this.psmt.executeQuery();
+
+            while(this.rs.next()) {
+                BoardVo vo = new BoardVo();
+                vo.setu_ID(this.rs.getString("u_ID"));
+                
+                list.add(vo);
+            }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
+
+        return list;
+    }
+
+    public BoardVo select(BoardVo vo) {
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM user_tbl");
+            this.rs = this.psmt.executeQuery();
+            if (this.rs.next()) {
+                vo.setu_ID(this.rs.getString("u_ID"));
+                vo.setWriter(rs.getString("u_name"));
+            }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
+
+        return vo;
+    }
+
+    public int insert(BoardVo vo) {
+        int n = 0;
+
+        try {
+            this.psmt = this.conn.prepareStatement("insert into board values(b_num.nextval,?,?,?,?,0)");
+            this.psmt.setString(1, vo.getWriter());
+            this.psmt.setDate(2, vo.getwDate());
+            this.psmt.setString(3, vo.getTitle());
+            this.psmt.setString(4, vo.getContent());
+            n = this.psmt.executeUpdate();
+        } catch (SQLException var4) {
+            var4.printStackTrace();
+        }
+
+        return n;
+    }
+
+    public int update(BoardVo vo) {
+        int n = 0;
+
+        try {
+            this.psmt = this.conn.prepareStatement("update board set content = ? where boardId = ?");
+            this.psmt.setString(2, vo.getContent());
+            n = this.psmt.executeUpdate();
+        } catch (SQLException var4) {
+            var4.printStackTrace();
+        }
+
+        return n;
+    }
+
+    public int delete(BoardVo vo) {
+        int n = 0;
+
+        try {
+            this.psmt = this.conn.prepareStatement("delete from board where boardId = ?");
+            n = this.psmt.executeUpdate();
+        } catch (SQLException var4) {
+            var4.printStackTrace();
+        }
+
+        return n;
+    }
+
+    public void hitCountUp(int id) {
+        String var2 = "UPDATE board set hit = hit+1 where boardId = ?";
+
+        try {
+            this.psmt = this.conn.prepareStatement("UPDATE board set hit = hit+1 where boardId = ?");
+            this.psmt.setInt(1, id);
+            this.psmt.executeUpdate();
+        } catch (SQLException var4) {
+            var4.printStackTrace();
+        }
+
+    }
+}
--- a/hospital/src/main/java/DB/BoardVo.java
+++ b/hospital/src/main/java/DB/BoardVo.java
@@ -0,0 +1,65 @@
+package DB;
+
+import java.sql.Date;
+
+public class BoardVo {
+    int boardId;
+    String writer;
+    String u_ID;
+    Date wDate;
+    String title;
+    String content;
+    int hit;
+
+    public BoardVo() {
+    }
+
+    public String getWriter() {
+        return this.writer;
+    }
+
+    public void setWriter(String writer) {
+        this.writer = writer;
+    }
+
+    public Date getwDate() {
+        return this.wDate;
+    }
+
+    public void setwDate(Date wDate) {
+        this.wDate = wDate;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return this.content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getHit() {
+        return this.hit;
+    }
+
+    public void setHit(int hit) {
+        this.hit = hit;
+    }
+
+	public String getu_ID() {
+		// TODO Auto-generated method stub
+		return this.u_ID;
+	}
+	
+	public void setu_ID(String u_ID) {
+		this.u_ID = u_ID;
+	}
+}
--- a/hospital/src/main/java/DB/MemberDao.java
+++ b/hospital/src/main/java/DB/MemberDao.java
@@ -0,0 +1,78 @@
+
+package DB;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+public class MemberDao  extends BasicDao {
+    private final String MEMBER_LIST = "SELECT * FROM member";
+    private final String MEMBER_CHECK = "SELECT * FROM member WHERE id = ? and pw = ?";
+    private final String MEMBER_INSERT = "INSERT into member values(?,?,?,?,?,?,?)";
+
+    public MemberDao() {
+    }
+
+    public ArrayList<MemberVo> select() {
+        ArrayList list = new ArrayList();
+
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM member");
+            this.rs = this.psmt.executeQuery();
+
+            while(this.rs.next()) {
+                MemberVo member = new MemberVo();
+                member.setId(this.rs.getString("ID"));
+                member.setName(this.rs.getString("NAME"));
+                member.setAddr(this.rs.getString("ADDR"));
+                member.setTel(this.rs.getString("TEL"));
+                member.setGender(this.rs.getString("GENDER"));
+                member.setHobby(this.rs.getString("HOBBY"));
+                list.add(member);
+            }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
+
+        return list;
+    }
+
+    public MemberVo selectMember(MemberVo member) {
+        MemberVo vo = null;
+
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM member WHERE id = ? and pw = ?");
+            this.psmt.setString(1, member.getId());
+            this.psmt.setString(2, member.getPw());
+            this.rs = this.psmt.executeQuery();
+            if (this.rs.next()) {
+                String id = this.rs.getString("id");
+                String pw = this.rs.getString("pw");
+                vo = new MemberVo(id, pw);
+            }
+        } catch (SQLException var5) {
+            var5.printStackTrace();
+        }
+
+        return vo;
+    }
+
+    public int memberInsert(MemberVo member) {
+        int n = 0;
+
+        try {
+            this.psmt = this.conn.prepareStatement("INSERT into member values(?,?,?,?,?,?,?)");
+            this.psmt.setString(1, member.getId());
+            this.psmt.setString(2, member.getName());
+            this.psmt.setString(3, member.getPw());
+            this.psmt.setString(4, member.getAddr());
+            this.psmt.setString(5, member.getTel());
+            this.psmt.setString(6, member.getGender());
+            this.psmt.setString(7, member.getHobby());
+            n = this.psmt.executeUpdate();
+        } catch (SQLException var4) {
+            var4.printStackTrace();
+        }
+
+        return n;
+    }
+}
--- a/hospital/src/main/java/DB/MemberVo.java
+++ b/hospital/src/main/java/DB/MemberVo.java
@@ -0,0 +1,75 @@
+package DB;
+
+public class MemberVo {
+	   public String id;
+	    public String name;
+	    public String pw;
+	    public String addr;
+	    public String tel;
+	    public String gender;
+	    public String hobby;
+
+	    public MemberVo() {
+	    }
+
+	    public MemberVo(String id, String pw) {
+	        this.id = id;
+	        this.pw = pw;
+	    }
+
+	    public String getName() {
+	        return this.name;
+	    }
+
+	    public void setName(String name) {
+	        this.name = name;
+	    }
+
+	    public String getAddr() {
+	        return this.addr;
+	    }
+
+	    public void setAddr(String addr) {
+	        this.addr = addr;
+	    }
+
+	    public String getTel() {
+	        return this.tel;
+	    }
+
+	    public void setTel(String tel) {
+	        this.tel = tel;
+	    }
+
+	    public String getGender() {
+	        return this.gender;
+	    }
+
+	    public void setGender(String gender) {
+	        this.gender = gender;
+	    }
+
+	    public String getHobby() {
+	        return this.hobby;
+	    }
+
+	    public void setHobby(String hobby) {
+	        this.hobby = hobby;
+	    }
+
+	    public String getId() {
+	        return this.id;
+	    }
+
+	    public void setId(String id) {
+	        this.id = id;
+	    }
+
+	    public String getPw() {
+	        return this.pw;
+	    }
+
+	    public void setPw(String pw) {
+	        this.pw = pw;
+	    }
+	}
--- a/hospital/src/main/java/UserJoin/UserJoinDao.java
+++ b/hospital/src/main/java/UserJoin/UserJoinDao.java
@@ -0,0 +1,92 @@
+package UserJoin;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+import DB.BasicDao;
+
+public class UserJoinDao  extends BasicDao {
+    private final String UserJoin_LIST = "SELECT * FROM user_tbl";
+    private final String UserJoin_CHECK = "SELECT * FROM user_tbl WHERE u_ID = ? and u_psw = ?";
+    private final String UserJoin_INSERT = "INSERT into user_tbl values(?,?,?,?,?,?,?)";
+
+    public ArrayList<UserJoinVo> select() {
+        ArrayList list = new ArrayList();
+
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM user_tbl");
+            this.rs = this.psmt.executeQuery();
+
+            while(this.rs.next()) {
+                UserJoinVo member = new UserJoinVo();
+                member.setU_ID(this.rs.getString("u_ID"));
+                member.setU_name(this.rs.getString("u_name"));
+                member.setU_addr(this.rs.getString("u_addr"));
+                member.setU_phone(this.rs.getString("u_phone"));
+                member.setU_gender(this.rs.getString("u_gender"));
+                member.setU_post(this.rs.getString("u_post"));
+                member.setU_divi(this.rs.getString("u_divi"));
+                member.setU_birth(this.rs.getString("u_birth"));
+                member.setU_car_num(this.rs.getString("u_car_num"));
+                
+                list.add(member);
+            }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
+
+        return list;
+    }
+
+    public UserJoinVo selectMember(UserJoinVo member) {
+    	UserJoinVo vo = null;
+
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM user_tbl WHERE u_ID =? and u_psw =?");
+        	//this.psmt = this.conn.prepareStatement("SELECT u_ID, u_psw FROM user_tbl");
+
+        	// while(this.rs.next()) {
+               //  member = new UserJoinVo();
+                 //member.setU_ID(this.rs.getString("u_ID"));
+                 //member.setU_psw(this.rs.getString("u_psw"));
+        	 //}
+        	this.psmt.setString(1, member.getU_ID());
+            this.psmt.setString(2, member.getU_psw());
+        	this.rs = this.psmt.executeQuery();
+            if (this.rs.next()) {
+            	vo = new UserJoinVo();
+                String id = this.rs.getString("u_ID");
+                String pw = this.rs.getString("u_psw");
+                vo.setU_ID(id);
+                vo.setU_psw(pw);
+            }
+        } catch (SQLException var5) {
+            var5.printStackTrace();
+        }
+
+        return vo;
+    }
+
+    public int memberInsert(UserJoinVo member) {
+        int n = 0;
+
+        try {
+            this.psmt = this.conn.prepareStatement("INSERT into user_tbl(u_ID,u_psw,u_divi,u_post,u_name,u_birth,u_gender,u_phone,u_addr,u_car_num) values(?,?,?,?,?,?,?,?,?,?)");
+            this.psmt.setString(1, member.getU_ID());
+            this.psmt.setString(2, member.getU_psw());
+            this.psmt.setString(3, member.getU_divi());
+            this.psmt.setString(4, member.getU_post());
+            this.psmt.setString(5, member.getU_name());
+            this.psmt.setString(6, member.getU_birth());
+            this.psmt.setString(7, member.getU_gender());
+            this.psmt.setString(8,  member.getU_phone());
+            this.psmt.setString(9, member.getU_addr());
+            this.psmt.setString(10,  member.getU_car_num());
+            n = this.psmt.executeUpdate();
+        } catch (SQLException var4) {
+            var4.printStackTrace();
+        }
+
+        return n;
+    }
+}
--- a/hospital/src/main/java/UserJoin/UserJoinVo.java
+++ b/hospital/src/main/java/UserJoin/UserJoinVo.java
@@ -0,0 +1,98 @@
+package UserJoin;
+
+public class UserJoinVo {
+	 	public String u_ID;
+	    public String u_name;
+	    public String u_psw;
+	    public String u_addr;
+	    public String u_phone;
+	    public String u_gender;
+	    public String u_post;
+	    public String u_birth;
+	    public String u_divi;
+	    public String u_car_num;
+
+	
+		
+		public String getU_ID() {
+			return u_ID;
+		}
+
+		public void setU_ID(String u_ID) {
+			this.u_ID = u_ID;
+		}
+
+		public String getU_name() {
+			return u_name;
+		}
+
+		public void setU_name(String u_name) {
+			this.u_name = u_name;
+		}
+
+		public String getU_psw() {
+			return u_psw;
+		}
+
+		public void setU_psw(String u_psw) {
+			this.u_psw = u_psw;
+		}
+
+		public String getU_addr() {
+			return u_addr;
+		}
+
+		public void setU_addr(String u_addr) {
+			this.u_addr = u_addr;
+		}
+
+		public String getU_phone() {
+			return u_phone;
+		}
+
+		public void setU_phone(String u_phone) {
+			this.u_phone = u_phone;
+		}
+
+		public String getU_gender() {
+			return u_gender;
+		}
+
+		public void setU_gender(String u_gender) {
+			this.u_gender = u_gender;
+		}
+
+		public String getU_post() {
+			return u_post;
+		}
+
+		public void setU_post(String u_post) {
+			this.u_post = u_post;
+		}
+
+		public String getU_birth() {
+			return u_birth;
+		}
+
+		public void setU_birth(String u_birth) {
+			this.u_birth = u_birth;
+		}
+
+		public String getU_divi() {
+			return u_divi;
+		}
+
+		public void setU_divi(String u_divi) {
+			this.u_divi = u_divi;
+		}
+
+		public String getU_car_num() {
+			return u_car_num;
+		}
+
+		public void setU_car_num(String u_car_num) {
+			this.u_car_num = u_car_num;
+		}
+
+	    
+	}
--- a/hospital/src/main/java/UserMyList/UserMyListDao.java
+++ b/hospital/src/main/java/UserMyList/UserMyListDao.java
@@ -0,0 +1,37 @@
+package UserMyList;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+import DB.BasicDao;
+
+public class UserMyListDao   extends BasicDao {
+    private final String UserMyList = "SELECT * FROM user_work_tbl WHERE uw_ID = ?";
+
+    public ArrayList<UserMyListVo> select(UserMyListVo member) {
+        ArrayList<UserMyListVo> list = new ArrayList<UserMyListVo>();
+        
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM user_work_tbl WHERE uw_ID = ?");
+            this.psmt.setString(1, member.getUw_ID());
+            this.rs = this.psmt.executeQuery();
+
+            while(this.rs.next()) {
+            	UserMyListVo vo = new UserMyListVo();
+            	
+            	vo.setUw_num(this.rs.getString("uw_num"));
+            	vo.setUw_ID(this.rs.getString("uw_ID"));
+            	vo.setUw_name(this.rs.getString("uw_name"));
+            	vo.setUw_start(this.rs.getString("uw_start"));
+            	vo.setUw_finish(this.rs.getString("uw_finish"));
+            	vo.setUw_state(this.rs.getString("uw_state"));
+            	vo.setUw_ok(this.rs.getString("uw_ok"));
+                list.add(vo);
+            }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
+
+        return list;
+    }
+}
--- a/hospital/src/main/java/UserMyList/UserMyListVo.java
+++ b/hospital/src/main/java/UserMyList/UserMyListVo.java
@@ -0,0 +1,56 @@
+package UserMyList;
+
+public class UserMyListVo {
+	public String uw_num;
+	public String uw_ID;
+    public String uw_name;
+    public String uw_start;
+    public String uw_finish;
+    public String uw_state;
+    public String uw_ok;
+    
+ 	public String getUw_num() {
+		return uw_num;
+	}
+	public void setUw_num(String uw_num) {
+		this.uw_num = uw_num;
+	}
+	public String getUw_ID() {
+		return uw_ID;
+	}
+	public void setUw_ID(String uw_ID) {
+		this.uw_ID = uw_ID;
+	}
+	public String getUw_name() {
+		return uw_name;
+	}
+	public void setUw_name(String uw_name) {
+		this.uw_name = uw_name;
+	}
+	public String getUw_start() {
+		return uw_start;
+	}
+	public void setUw_start(String uw_start) {
+		this.uw_start = uw_start;
+	}
+	public String getUw_finish() {
+		return uw_finish;
+	}
+	public void setUw_finish(String uw_finish) {
+		this.uw_finish = uw_finish;
+	}
+	public String getUw_state() {
+		return uw_state;
+	}
+	public void setUw_state(String uw_state) {
+		this.uw_state = uw_state;
+	}
+	public String getUw_ok() {
+		return uw_ok;
+	}
+	public void setUw_ok(String uw_ok) {
+		this.uw_ok = uw_ok;
+	}
+
+
+}
--- a/hospital/src/main/java/command/UserJoinCommand.java
+++ b/hospital/src/main/java/command/UserJoinCommand.java
@@ -6,9 +6,59 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-public class UserJoinCommand  implements Command{
-	@Override
-	public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
-		return "UserJoin.jsp";
-	}
-}
+import UserJoin.UserJoinDao;
+import UserJoin.UserJoinVo;
+
+public class UserJoinCommand   implements Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String u_ID = request.getParameter("u_ID");
+        String u_name = request.getParameter("u_name");
+        String u_psw = request.getParameter("u_psw");
+        String u_addr = request.getParameter("u_addr");
+        String u_phone = request.getParameter("u_phone");
+        String u_gender = request.getParameter("u_gender");
+        String u_divi = request.getParameter("u_divi");
+        String u_birth = request.getParameter("u_birth");
+        String u_car_num = request.getParameter("u_car_num");
+        String[] u_post = request.getParameterValues("u_post");
+        String u_postString = "";
+        int n;
+        String path;
+        if (u_post != null) {
+            String[] var11 = u_post;
+            int var12 = u_post.length;
+
+            for(n = 0; n < var12; ++n) {
+                path = var11[n];
+                u_postString = u_postString + path;
+                u_postString = u_postString + ":";
+            }
+
+            u_postString = u_postString.substring(0, u_postString.length() - 1);
+        }
+
+        UserJoinVo member = new UserJoinVo();
+        member.setU_ID(u_ID);
+        member.setU_psw(u_psw);
+        member.setU_name(u_name);
+        member.setU_addr(u_addr);
+        member.setU_phone(u_phone);
+        member.setU_gender(u_gender);
+        member.setU_post(u_postString);
+        member.setU_divi(u_divi);
+        member.setU_birth(u_birth);
+        member.setU_car_num(u_car_num);
+        
+        UserJoinDao dao = new UserJoinDao();
+        n = dao.memberInsert(member);
+        if (n != 0) {
+            request.setAttribute("joinName", u_ID);
+            path = "joinOk.jsp";
+        } else {
+            path = "joinFail.jsp";
+        }
+
+        return path;
+    }
+}
--- a/hospital/src/main/java/command/UserListCommand.java
+++ b/hospital/src/main/java/command/UserListCommand.java
@@ -0,0 +1,24 @@
+package command;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import UserJoin.UserJoinDao;
+import UserJoin.UserJoinVo;
+
+public class UserListCommand  implements  Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        UserJoinDao dao = new UserJoinDao();
+        ArrayList<UserJoinVo> list = dao.select();
+        
+        request.setAttribute("members", list);
+        String path = "UserList.jsp";
+        return path;
+    }
+}
--- a/hospital/src/main/java/command/UserLoginCheckCommand.java
+++ b/hospital/src/main/java/command/UserLoginCheckCommand.java
@@ -0,0 +1,48 @@
+package command;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import UserJoin.UserJoinDao;
+import UserJoin.UserJoinVo;
+
+public class UserLoginCheckCommand  implements Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    	HttpSession session = request.getSession();
+        UserJoinDao dao = new UserJoinDao();
+        UserJoinVo member = null;
+        String id = request.getParameter("u_ID");
+        String pw = request.getParameter("u_psw");
+        System.out.println("u_ID : " + id);
+        System.out.println("u_psw : " + pw);
+        id = id.trim();
+        pw = pw.trim();
+        member = new UserJoinVo(); // 인스턴스화 안함 왜 빼먹음 
+        member.setU_ID(id);				// 동일
+        member.setU_psw(pw);			// 동일
+        member = dao.selectMember(member);
+        
+        request.setAttribute("member", member);
+        
+        String path;
+        if (member != null) {
+        	path = "loginOk.jsp";
+        	session.setAttribute("id",id);
+            if( id.equals("boss")) {
+            	session.setAttribute("auth",  "admin" );
+            	
+            }else {
+            	session.setAttribute("auth", "user" );
+            }
+        } else {
+            path = "UserLogin.jsp";	// 실패 시 로그인 화면으로
+        }
+
+        return path;
+    }
+}
--- a/hospital/src/main/java/command/UserMyListCommand.java
+++ b/hospital/src/main/java/command/UserMyListCommand.java
@@ -0,0 +1,34 @@
+package command;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import UserMyList.UserMyListDao;
+import UserMyList.UserMyListVo;
+
+
+
+public class UserMyListCommand  implements  Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    	HttpSession session = request.getSession();
+    	String loginId = (String)session.getAttribute("id");
+
+        UserMyListDao dao = new UserMyListDao();
+        UserMyListVo vo = new UserMyListVo();
+        vo.setUw_ID(loginId);
+        
+        ArrayList<UserMyListVo> list = dao.select(vo);
+            
+        request.setAttribute("vo", list);
+        String path = "UserMyList.jsp";
+        return path;
+    	   	
+    }
+
+}
--- a/hospital/src/main/java/command/UserRegCommand.java
+++ b/hospital/src/main/java/command/UserRegCommand.java
@@ -0,0 +1,17 @@
+package command;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class UserRegCommand implements Command {
+	@Override
+	public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+		//TODO : DB작업 필요
+
+
+		return "UserJoin.jsp";
+	}
+}
--- a/hospital/src/main/java/command/patientInoutCheckCommand.java
+++ b/hospital/src/main/java/command/patientInoutCheckCommand.java
@@ -0,0 +1,56 @@
+package command;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import patientInout.patientInoutDao;
+import patientInout.patientInoutVo;
+import patientJoin.patientJoinDao;
+import patientJoin.patientJoinVo;
+
+public class patientInoutCheckCommand  implements Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    	HttpSession session = request.getSession();
+    	String loginId = (String)session.getAttribute("id");
+    	
+    	patientJoinVo vo = new patientJoinVo();
+    	patientJoinDao dao = new patientJoinDao();
+    	
+    	vo.setP_ID(loginId);
+        patientJoinVo result = dao.selectOne(vo);     
+        System.out.println(loginId);
+
+        String pio_ID =loginId;
+        String pio_name = result.getP_name();
+        String pio_state = request.getParameter("pio_state");
+        String pio_divi = request.getParameter("pio_divi");
+        String pio_date = request.getParameter("pio_date");
+        String pio_time = request.getParameter("pio_time");
+        int n;
+        String path;
+        
+        patientInoutVo member = new patientInoutVo();
+        member.setPio_ID(pio_ID);
+        member.setPio_name(pio_name);
+        member.setPio_state(pio_state);
+        member.setPio_divi(pio_divi);
+        member.setPio_date(pio_date);
+        member.setPio_time(pio_time);
+
+        patientInoutDao pdao = new patientInoutDao();
+        n = pdao.patientInoutInsert(member);
+        if (n != 0) {
+            request.setAttribute("joinName", pio_ID);
+            path = "patientInoutPass.jsp";
+        } else {
+            path = "joinFail.jsp";
+        }
+
+        return path;
+    }
+}
--- a/hospital/src/main/java/command/patientInoutCommand.java
+++ b/hospital/src/main/java/command/patientInoutCommand.java
@@ -0,0 +1,14 @@
+package command;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class patientInoutCommand implements Command {
+	public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+
+		return "patientInout.jsp";
+	}
+}
--- a/hospital/src/main/java/command/patientInoutResCommand.java
+++ b/hospital/src/main/java/command/patientInoutResCommand.java
@@ -0,0 +1,32 @@
+package command;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import UserMyList.UserMyListVo;
+import patientInout.patientInoutDao;
+import patientInout.patientInoutVo;
+
+public class patientInoutResCommand  implements  Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    	HttpSession session = request.getSession();
+    	String loginId = (String)session.getAttribute("id");
+
+        patientInoutDao dao = new patientInoutDao();
+        patientInoutVo vo = new patientInoutVo();
+        vo.setPio_ID(loginId);
+        
+        ArrayList<patientInoutVo> list = dao.select(vo);
+            
+        request.setAttribute("vo", list);
+        String path = "patientInoutRes.jsp";
+        return path;
+    	   	
+    }
+}
--- a/hospital/src/main/java/command/patientJoinCommand.java
+++ b/hospital/src/main/java/command/patientJoinCommand.java
@@ -6,9 +6,44 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-public class patientJoinCommand  implements Command{
-	@Override
-	public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
-		return "patientJoin.jsp";
-	}
+import patientJoin.patientJoinDao;
+import patientJoin.patientJoinVo;;
+
+public class patientJoinCommand  implements Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String p_ID = request.getParameter("p_ID");
+        String p_name = request.getParameter("p_name");
+        String p_psw = request.getParameter("p_psw");
+        String p_addr = request.getParameter("p_addr");
+        String p_phone = request.getParameter("p_phone");
+        String p_gender = request.getParameter("p_gender");
+        String p_birthYear = request.getParameter("p_birthYear");
+        String p_car_num = request.getParameter("p_car_num");
+        String p_age = request.getParameter("p_age");
+        int n;
+        String path;
+        
+        patientJoinVo member = new patientJoinVo();
+        member.setP_ID(p_ID);
+        member.setP_psw(p_psw);
+        member.setP_name(p_name);
+        member.setP_addr(p_addr);
+        member.setP_phone(p_phone);
+        member.setP_gender(p_gender);
+        member.setP_birthYear(p_birthYear);
+        member.setP_car_num(p_car_num);
+        member.setP_age(p_age);
+
+        patientJoinDao dao = new patientJoinDao();
+        n = dao.memberInsert(member);
+        if (n != 0) {
+            request.setAttribute("joinName", p_ID);
+            path = "patientOK.jsp";
+        } else {
+            path = "joinFail.jsp";
+        }
+
+        return path;
+    }
 }
--- a/hospital/src/main/java/command/patientLoginCheckCommand.java
+++ b/hospital/src/main/java/command/patientLoginCheckCommand.java
@@ -0,0 +1,42 @@
+package command;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import patientJoin.patientJoinDao;
+import patientJoin.patientJoinVo;
+
+public class patientLoginCheckCommand   implements Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    	HttpSession session = request.getSession();
+    	patientJoinDao dao = new patientJoinDao();
+    	patientJoinVo member = null;
+        String id = request.getParameter("p_ID");
+        String pw = request.getParameter("p_psw");
+        System.out.println("p_ID : " + id);
+        System.out.println("p_psw : " + pw);
+        id = id.trim();
+        pw = pw.trim();
+        member = new patientJoinVo(); // 인스턴스화 안함 왜 빼먹음 
+        member.setP_ID(id);				// 동일
+        member.setP_psw(pw);			// 동일
+        member = dao.selectMember(member);
+        request.setAttribute("member", member);
+        String path;
+        if (member != null) {
+        	
+        	session.setAttribute("id",id);
+        	
+            path = "patientOK.jsp";
+        } else {
+            path = "patientLogin.jsp";	// 실패 시 로그인 화면으로
+        }
+
+        return path;
+    }
+}
--- a/hospital/src/main/java/command/patientRegCommand.java
+++ b/hospital/src/main/java/command/patientRegCommand.java
@@ -0,0 +1,17 @@
+package command;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class patientRegCommand implements Command {
+	@Override
+	public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+		//TODO : DB작업 필요
+
+
+		return "patientJoin.jsp";
+	}
+}
--- a/hospital/src/main/java/command/patientTestCheckCommand.java
+++ b/hospital/src/main/java/command/patientTestCheckCommand.java
@@ -0,0 +1,52 @@
+package command;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import patientJoin.patientJoinDao;
+import patientJoin.patientJoinVo;
+import patientTest.patientTestDao;
+import patientTest.patientTestVo;
+
+public class patientTestCheckCommand implements Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    	HttpSession session = request.getSession();
+    	String loginId = (String)session.getAttribute("id");
+    	
+    	patientJoinVo vo = new patientJoinVo();
+    	patientJoinDao dao = new patientJoinDao();
+    	
+    	vo.setP_ID(loginId);
+        patientJoinVo result = dao.selectOne(vo);     
+        System.out.println(loginId);
+
+        String pt_ID =loginId;
+        String pt_name = result.getP_name();
+        String pt_date = request.getParameter("pt_date");
+        String pt_time = request.getParameter("pt_time");
+        int n;
+        String path;
+        
+        patientTestVo member = new patientTestVo();
+        member.setPt_ID(pt_ID);
+        member.setPt_name(pt_name);
+        member.setPt_date(pt_date);
+        member.setPt_time(pt_time);
+
+        patientTestDao pdao = new patientTestDao();
+        n = pdao.patientTestInsert(member);
+        if (n != 0) {
+            request.setAttribute("joinName", pt_ID);
+            path = "patientTestPass.jsp";
+        } else {
+            path = "joinFail.jsp";
+        }
+
+        return path;
+    }
+}
--- a/hospital/src/main/java/command/patientTestCommand.java
+++ b/hospital/src/main/java/command/patientTestCommand.java
@@ -0,0 +1,14 @@
+package command;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class patientTestCommand  implements Command {
+	public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+
+		return "patientTest.jsp";
+	}
+}
--- a/hospital/src/main/java/command/patientTestResCommand.java
+++ b/hospital/src/main/java/command/patientTestResCommand.java
@@ -0,0 +1,31 @@
+package command;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import patientTest.patientTestDao;
+import patientTest.patientTestVo;
+
+public class patientTestResCommand   implements  Command {
+
+    public String exec(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    	HttpSession session = request.getSession();
+    	String loginId = (String)session.getAttribute("id");
+
+        patientTestDao dao = new patientTestDao();
+        patientTestVo vo = new patientTestVo();
+        vo.setPt_ID(loginId);
+        
+        ArrayList<patientTestVo> list = dao.select(vo);
+            
+        request.setAttribute("vo", list);
+        String path = "patientTestRes.jsp";
+        return path;
+    	   	
+    }
+}
--- a/hospital/src/main/java/controller/Fcontroller.java
+++ b/hospital/src/main/java/controller/Fcontroller.java
@@ -14,9 +14,21 @@ import javax.servlet.http.HttpServletResponse;
 import command.Command;
 import command.HomeCommand;
 import command.UserJoinCommand;
+import command.UserListCommand;
+import command.UserLoginCheckCommand;
 import command.UserLoginCommand;
+import command.UserMyListCommand;
+import command.UserRegCommand;
+import command.patientInoutCheckCommand;
+import command.patientInoutCommand;
+import command.patientInoutResCommand;
 import command.patientJoinCommand;
+import command.patientLoginCheckCommand;
 import command.patientLoginCommand;
+import command.patientRegCommand;
+import command.patientTestCheckCommand;
+import command.patientTestCommand;
+import command.patientTestResCommand;

@WebServlet("/Fcontroller")
 public class Fcontroller extends HttpServlet {
@@ -33,9 +45,22 @@ public class Fcontroller extends HttpServlet {
 		
 		list.put("/home.do", new HomeCommand()); //처음 보여주는 페이지;
 		list.put("/UserLogin.do", new UserLoginCommand()); // 임직원 로그인 처리
+		list.put("/UserJoin.do", new UserJoinCommand()); // 임직원 회원가입
+		list.put("/UserReg.do", new UserRegCommand()); // 임직원 회원가입 전달 처리
+        list.put("/UserList.do", new UserListCommand());	// 유저 리스트 보여주는 페이지
+        list.put("/UserMyList.do", new UserMyListCommand()); // 직원 개인 출퇴근 항목
+	    list.put("/loginCheck.do", new UserLoginCheckCommand()); // 임직원 로그인 체크
 		list.put("/patientlogin.do", new patientLoginCommand()); // 환자 로그인 처리
-		list.put ("/UserJoin.do", new UserJoinCommand()); // 임직원 회원가입 페이지
-		list.put ("/patientJoin.do", new patientJoinCommand()); // 환자 회원가입 페이지
+		list.put("/patientJoin.do", new patientJoinCommand()); // 환자 회원가입 처리
+		list.put("/patientReg.do", new patientRegCommand()); // 환자 회원가입 전달 처리
+		list.put("/patientCheck.do", new patientLoginCheckCommand()); // 환자 로그인 체크
+        list.put("/patientInout.do", new patientInoutCommand());	// 외래입원 예약
+        list.put("/patientInoutCheck.do", new patientInoutCheckCommand()); // 외래입원 예약 체크
+        list.put("/patientInoutRes.do", new patientInoutResCommand()); // 입원외래 진료 결과
+        list.put("/patientTest.do", new patientTestCommand()); // 건강검진 검사 예약
+        list.put("/patientTestRes.do", new patientTestResCommand()); // 건강검진 검사 결과
+        list.put("/patientTestCheck.do", new patientTestCheckCommand()); // 건강검진 검사 결과
+        
 		//이 부분에 계속적으로 매핑을 추가하면 됨

 	}
--- a/hospital/src/main/java/patientInout/patientInoutDao.java
+++ b/hospital/src/main/java/patientInout/patientInoutDao.java
@@ -0,0 +1,57 @@
+package patientInout;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+import DB.BasicDao;
+
+public class patientInoutDao  extends BasicDao {
+    private final String patientInoutList = "SELECT * FROM patient_inout_tbl WHERE uw_ID = ?";
+
+    public ArrayList<patientInoutVo> select(patientInoutVo member) {
+        ArrayList<patientInoutVo> list = new ArrayList<patientInoutVo>();
+        
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM patient_inout_tbl WHERE pio_ID = ?");
+            this.psmt.setString(1, member.getPio_ID());
+            this.rs = this.psmt.executeQuery();
+
+            while(this.rs.next()) {
+            	patientInoutVo vo = new patientInoutVo();
+            	
+            	vo.setPio_ID(this.rs.getString("pio_ID"));
+            	vo.setPio_name(this.rs.getString("pio_name"));
+            	vo.setPio_state(this.rs.getString("pio_state"));
+            	vo.setPio_divi(this.rs.getString("pio_divi"));
+            	vo.setPio_date(this.rs.getString("pio_date"));
+            	vo.setPio_time(this.rs.getString("pio_time"));
+            	vo.setPio_res(this.rs.getString("pio_res"));
+            	vo.setPio_ok(this.rs.getString("pio_ok"));
+                list.add(vo);
+            }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
+
+        return list;
+    }
+    
+	  public int patientInoutInsert(patientInoutVo member) {
+	        int n = 0;
+
+	        try {
+	            this.psmt = this.conn.prepareStatement("INSERT into patient_inout_tbl(pio_ID,pio_name,pio_state,pio_divi,pio_date,pio_time,pio_ok) values(?,?,?,?,?,?,1)");
+	            this.psmt.setString(1, member.getPio_ID());
+	            this.psmt.setString(2, member.getPio_name());
+	            this.psmt.setString(3, member.getPio_state());
+	            this.psmt.setString(4, member.getPio_divi());
+	            this.psmt.setString(5, member.getPio_date());
+	            this.psmt.setString(6, member.getPio_time());
+	            n = this.psmt.executeUpdate();
+	        } catch (SQLException var4) {
+	            var4.printStackTrace();
+	        }
+	        
+	        return n;
+	    }
+}
--- a/hospital/src/main/java/patientInout/patientInoutVo.java
+++ b/hospital/src/main/java/patientInout/patientInoutVo.java
@@ -0,0 +1,61 @@
+package patientInout;
+
+public class patientInoutVo {
+	public String pio_ID;
+    public String pio_name;
+    public String pio_state;
+    public String pio_divi;
+    public String pio_date;
+    public String pio_time;
+    public String pio_res;
+    public String pio_ok;
+	public String getPio_ID() {
+		return pio_ID;
+	}
+	public void setPio_ID(String pio_ID) {
+		this.pio_ID = pio_ID;
+	}
+	public String getPio_name() {
+		return pio_name;
+	}
+	public void setPio_name(String pio_name) {
+		this.pio_name = pio_name;
+	}
+	public String getPio_state() {
+		return pio_state;
+	}
+	public void setPio_state(String pio_state) {
+		this.pio_state = pio_state;
+	}
+	public String getPio_divi() {
+		return pio_divi;
+	}
+	public void setPio_divi(String pio_divi) {
+		this.pio_divi = pio_divi;
+	}
+	public String getPio_date() {
+		return pio_date;
+	}
+	public void setPio_date(String pio_date) {
+		this.pio_date = pio_date;
+	}
+	public String getPio_time() {
+		return pio_time;
+	}
+	public void setPio_time(String pio_time) {
+		this.pio_time = pio_time;
+	}
+	public String getPio_res() {
+		return pio_res;
+	}
+	public void setPio_res(String pio_res) {
+		this.pio_res = pio_res;
+	}
+	public String getPio_ok() {
+		return pio_ok;
+	}
+	public void setPio_ok(String pio_ok) {
+		this.pio_ok = pio_ok;
+	}
+
+}
--- a/hospital/src/main/java/patientJoin/patientJoinDao.java
+++ b/hospital/src/main/java/patientJoin/patientJoinDao.java
@@ -0,0 +1,104 @@
+package patientJoin;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+import DB.BasicDao;
+
+public class patientJoinDao  extends BasicDao {
+    private final String patientJoinJoin_LIST = "SELECT * FROM patient_tbl";
+    private final String patientJoinJoin_CHECK = "SELECT * FROM patient_tbl WHERE u_ID = ? and u_psw = ?";
+    private final String patientJoinJoin_INSERT = "INSERT into patient_tbl values(?,?,?,?,?,?,?)";
+
+    public ArrayList<patientJoinVo> select() {
+        ArrayList list = new ArrayList();
+
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM patient_tbl");
+            this.rs = this.psmt.executeQuery();
+
+            while(this.rs.next()) {
+                patientJoinVo member = new patientJoinVo();
+                member.setP_ID(this.rs.getString("u_ID"));
+                member.setP_name(this.rs.getString("u_name"));
+                member.setP_addr(this.rs.getString("u_addr"));
+                member.setP_phone(this.rs.getString("u_phone"));
+                member.setP_gender(this.rs.getString("u_gender"));
+                member.setP_age(this.rs.getString("u_age"));
+                member.setP_birthYear(this.rs.getString("u_birth"));
+                member.setP_car_num(this.rs.getString("u_car_num"));
+                
+                list.add(member);
+            }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
+
+        return list;
+    }
+
+    public patientJoinVo selectMember(patientJoinVo member) {
+    	patientJoinVo vo = null;
+
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM patient_tbl WHERE p_ID =? and p_psw =?");
+            this.psmt.setString(1, member.getP_ID());
+            this.psmt.setString(2, member.getP_psw());
+        	this.rs = this.psmt.executeQuery();
+            if (this.rs.next()) {
+            	vo = new patientJoinVo();
+                String id = this.rs.getString("p_ID");
+                String pw = this.rs.getString("p_psw");
+                vo.setP_ID(id);
+                vo.setP_psw(pw);
+            }
+        } catch (SQLException var5) {
+            var5.printStackTrace();
+        }
+
+        return vo;
+    }
+    
+    public patientJoinVo selectOne(patientJoinVo member) {
+    	patientJoinVo vo = null;
+
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM patient_tbl WHERE p_ID =?");
+            this.psmt.setString(1, member.getP_ID());
+        	this.rs = this.psmt.executeQuery();
+            if (this.rs.next()) {
+            	vo = new patientJoinVo();
+                String id = this.rs.getString("p_ID");
+                String name = this.rs.getString("p_name");
+                vo.setP_ID(id);
+                vo.setP_name(name);
+            }
+        } catch (SQLException var5) {
+            var5.printStackTrace();
+        }
+
+        return vo;
+    }
+
+    public int memberInsert(patientJoinVo member) {
+        int n = 0;
+
+        try {
+            this.psmt = this.conn.prepareStatement("INSERT into patient_tbl(p_name,p_ID,p_psw,p_age,p_birthYear,p_gender,p_phone,p_addr,p_car_num) values(?,?,?,?,?,?,?,?,?)");
+            this.psmt.setString(1, member.getP_name());
+            this.psmt.setString(2, member.getP_ID());
+            this.psmt.setString(3, member.getP_psw());
+            this.psmt.setString(4, member.getP_age());
+            this.psmt.setString(5, member.getP_birthYear());
+            this.psmt.setString(6, member.getP_gender());
+            this.psmt.setString(7, member.getP_phone());
+            this.psmt.setString(8,  member.getP_addr());
+            this.psmt.setString(9, member.getP_car_num());
+            n = this.psmt.executeUpdate();
+        } catch (SQLException var4) {
+            var4.printStackTrace();
+        }
+        
+        return n;
+    }
+}
--- a/hospital/src/main/java/patientJoin/patientJoinVo.java
+++ b/hospital/src/main/java/patientJoin/patientJoinVo.java
@@ -0,0 +1,68 @@
+package patientJoin;
+
+public class patientJoinVo {
+	public String p_ID;
+    public String p_name;
+    public String p_psw;
+    public String p_age;
+    public String p_addr;
+    public String p_phone;
+    public String p_gender;
+    public String p_birthYear;
+    public String p_car_num;
+	
+	public String getP_ID() {
+		return p_ID;
+	}
+	public void setP_ID(String p_ID) {
+		this.p_ID = p_ID;
+	}
+	public String getP_name() {
+		return p_name;
+	}
+	public void setP_name(String p_name) {
+		this.p_name = p_name;
+	}
+	public String getP_psw() {
+		return p_psw;
+	}
+	public void setP_psw(String p_psw) {
+		this.p_psw = p_psw;
+	}
+	public String getP_age() {
+		return p_age;
+	}
+	public void setP_age(String p_age) {
+		this.p_age = p_age;
+	}
+	public String getP_addr() {
+		return p_addr;
+	}
+	public void setP_addr(String p_addr) {
+		this.p_addr = p_addr;
+	}
+	public String getP_phone() {
+		return p_phone;
+	}
+	public void setP_phone(String p_phone) {
+		this.p_phone = p_phone;
+	}
+	public String getP_gender() {
+		return p_gender;
+	}
+	public void setP_gender(String p_gender) {
+		this.p_gender = p_gender;
+	}
+	public String getP_birthYear() {
+		return p_birthYear;
+	}
+	public void setP_birthYear(String p_birthYear) {
+		this.p_birthYear = p_birthYear;
+	}
+	public String getP_car_num() {
+		return p_car_num;
+	}
+	public void setP_car_num(String p_car_num) {
+		this.p_car_num = p_car_num;
+	}
+}
--- a/hospital/src/main/java/patientTest/patientTestDao.java
+++ b/hospital/src/main/java/patientTest/patientTestDao.java
@@ -0,0 +1,59 @@
+package patientTest;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+import DB.BasicDao;
+import patientInout.patientInoutVo;
+
+public class patientTestDao   extends BasicDao {
+    private final String patientTestList = "SELECT * FROM patient_test_tbl WHERE pt_ID = ?";
+
+    public ArrayList<patientTestVo> select(patientTestVo member) {
+        ArrayList<patientTestVo> list = new ArrayList<patientTestVo>();
+        
+        try {
+            this.psmt = this.conn.prepareStatement("SELECT * FROM patient_test_tbl WHERE pt_ID = ?");
+            this.psmt.setString(1, member.getPt_ID());
+            this.rs = this.psmt.executeQuery();
+
+            while(this.rs.next()) {
+            	patientTestVo vo = new patientTestVo();
+            	
+            	vo.setPt_ID(this.rs.getString("pt_ID"));
+            	vo.setPt_name(this.rs.getString("pt_name"));
+            	vo.setPt_xray(this.rs.getString("pt_xray"));
+            	vo.setPt_blood(this.rs.getString("pt_blood"));
+            	vo.setPt_urine(this.rs.getString("pt_urine"));
+            	vo.setPt_ct(this.rs.getString("pt_ct"));
+            	vo.setPt_date(this.rs.getString("pt_date"));
+            	vo.setPt_time(this.rs.getString("pt_time"));
+            	vo.setPt_res(this.rs.getString("pt_res"));
+            	vo.setPt_state(this.rs.getString("pt_state"));
+            	
+                list.add(vo);
+            }
+        } catch (SQLException var3) {
+            var3.printStackTrace();
+        }
+
+        return list;
+    }
+    
+	  public int patientTestInsert(patientTestVo member) {
+	        int n = 0;
+
+	        try {
+	            this.psmt = this.conn.prepareStatement("INSERT into patient_test_tbl(pt_ID,pt_name,pt_date,pt_time,pt_state) values(?,?,?,?,1)");
+	            this.psmt.setString(1, member.getPt_ID());
+	            this.psmt.setString(2, member.getPt_name());
+	            this.psmt.setString(3, member.getPt_date());
+	            this.psmt.setString(4, member.getPt_time());
+	            n = this.psmt.executeUpdate();
+	        } catch (SQLException var4) {
+	            var4.printStackTrace();
+	        }
+	        
+	        return n;
+	    }
+}
--- a/hospital/src/main/java/patientTest/patientTestVo.java
+++ b/hospital/src/main/java/patientTest/patientTestVo.java
@@ -0,0 +1,83 @@
+package patientTest;
+
+public class patientTestVo {
+ 	public String pt_num;
+    public String pt_ID;
+    public String pt_name;
+    public String pt_xray;
+    public String pt_blood;
+    public String pt_urine;
+    public String pt_ct;
+    public String pt_date;
+    public String pt_time;
+    public String pt_res;
+    public String pt_state;
+    
+	public String getPt_num() {
+		return pt_num;
+	}
+	public void setPt_num(String pt_num) {
+		this.pt_num = pt_num;
+	}
+	public String getPt_ID() {
+		return pt_ID;
+	}
+	public void setPt_ID(String pt_ID) {
+		this.pt_ID = pt_ID;
+	}
+	public String getPt_name() {
+		return pt_name;
+	}
+	public void setPt_name(String pt_name) {
+		this.pt_name = pt_name;
+	}
+	public String getPt_xray() {
+		return pt_xray;
+	}
+	public void setPt_xray(String pt_xray) {
+		this.pt_xray = pt_xray;
+	}
+	public String getPt_blood() {
+		return pt_blood;
+	}
+	public void setPt_blood(String pt_blood) {
+		this.pt_blood = pt_blood;
+	}
+	public String getPt_urine() {
+		return pt_urine;
+	}
+	public void setPt_urine(String pt_urine) {
+		this.pt_urine = pt_urine;
+	}
+	public String getPt_ct() {
+		return pt_ct;
+	}
+	public void setPt_ct(String pt_ct) {
+		this.pt_ct = pt_ct;
+	}
+	public String getPt_date() {
+		return pt_date;
+	}
+	public void setPt_date(String pt_date) {
+		this.pt_date = pt_date;
+	}
+	public String getPt_time() {
+		return pt_time;
+	}
+	public void setPt_time(String pt_time) {
+		this.pt_time = pt_time;
+	}
+	public String getPt_res() {
+		return pt_res;
+	}
+	public void setPt_res(String pt_res) {
+		this.pt_res = pt_res;
+	}
+	public String getPt_state() {
+		return pt_state;
+	}
+	public void setPt_state(String pt_state) {
+		this.pt_state = pt_state;
+	}
+
+}
--- a/hospital/src/main/webapp/KakaoTalk_20200624_145231741.jpg
+++ b/hospital/src/main/webapp/KakaoTalk_20200624_145231741.jpg
--- a/hospital/src/main/webapp/UserJoin.jsp
+++ b/hospital/src/main/webapp/UserJoin.jsp
@@ -15,27 +15,27 @@
        function formDataCheck(){
            var form = document.frm;

-            if(form.name.value==""){
+            if(form.u_name.value==""){
                alert("사용자 이름을 입력하세요.");
-                form.name.focus();
+                form.u_name.focus();
                return false;
            }

-            if(form.id.value==""){
+            if(form.u_ID.value==""){
                alert("사용자 아이디를 입력하세요.");
-                form.id.focus();
+                form.u_ID.focus();
                return false;
            }

-            if(form.pw.value==""){
+            if(form.u_psw.value==""){
                alert("사용자 비밀번호를 입력하세요.");
-                form.pw.focus();
+                form.u_psw.focus();
                return false;
            }

-            if(form.pwCheck.value==""){
+            if(form.u_pswCheck.value==""){
                alert("사용자 비밀번호 확인값을 입력하세요.");
-                form.pwCheck.focus();
+                form.u_pswCheck.focus();
                return false;
            }
            <!-- form.submit(); button type -->
@@ -51,68 +51,67 @@
                <div><h1>임직원 회원 가입</h1></div>
                <br/>
                <div>
-                    <form id="frm" name="frm" action="memberInsert.do" method="post" onsubmit="return formDataCheck()">
+                    <form id="frm" name="frm" action="UserJoin.do" method="post" onsubmit="return formDataCheck()">
                        <div>
                            <table class="table">
                                <tbody>
                                <tr>
-                                    <th scope="row">회원명</th><td colspan="3"><input class="form-control" style="width:30%" type="text" id="name" name="name" maxlength="10"></td>
+                                    <th scope="row">회원명</th><td colspan="3"><input class="form-control" style="width:30%" type="text" id="u_name" name="u_name" maxlength="10"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">회원ID</th><td colspan="3"> <input class="form-control d-inline" style="width:30%" type="text" id="id" name="id" maxlength="10">&nbsp;&nbsp;<input class="btn btn-info" type="button" value="중복확인" onclick="idValidCheck()"></td>
+                                    <th scope="row">회원ID</th><td colspan="3"> <input class="form-control d-inline" style="width:30%" type="text" id="u_ID" name="u_ID" maxlength="10"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">패스워드</th><td colspan="3"><input class="form-control" style="width:30%" id="pw" name="pw" type="password" size="10"></td>
+                                    <th scope="row">패스워드</th><td colspan="3"><input class="form-control" style="width:30%" id="u_psw" name="u_psw" type="password" size="10"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">패스워드확인</th><td colspan="3"><input class="form-control" style="width:30%" id="pwCheck" name="pwCheck" type="password" size="10"></td>
+                                    <th scope="row">패스워드확인</th><td colspan="3"><input class="form-control" style="width:30%" id="u_pswCheck" name="u_pswCheck" type="password" size="10"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">주소</th><td colspan="3"><input class="form-control" id="addr" name="addr" type="text" maxlength="50"></td>
+                                    <th scope="row">주소</th><td colspan="3"><input class="form-control" id="u_addr" name="u_addr" type="text" maxlength="50"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">전화번호</th><td><input class="form-control" id="tel" name="tel" type="tel" style="width:30%" maxlength="15"></td>
+                                    <th scope="row">전화번호</th><td><input class="form-control" id="u_phone" name="u_phone" type="tel" style="width:30%" maxlength="15"></td>
                                </tr>
                                <tr>
                                    <th scope="row">차량번호</th><td><input class="form-control" id="u_car_num" name="u_car_num" type="text" style="width:30%" maxlength="15"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">생년월일</th><td><input class="form-control" id="u_birth" name="u_birth" type="number" style="width:30%" maxlength="6"></td>
+                                    <th scope="row">생년월일</th><td><input class="form-control" id="u_birth" name="u_birth" type="date" style="width:30%" maxlength="6"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">병과</th><td><input class="form-control" id="u_car_num" name="u_car_num" type="text" style="width:30%" maxlength="15"></td>
+                                    <th scope="row">병과</th><td><input class="form-control" id="u_divi" name="u_divi" type="text" style="width:30%" maxlength="15"></td>
                                </tr>
                                <tr>
                                    <th scope="row">성별</th>
                                    <td>
                                        <div class="custom-control custom-radio custom-control-inline">
-                                            <input class="custom-control-input" type="radio" id="male" name="gender" value="male" checked>
+                                            <input class="custom-control-input" type="radio" id="male" name="u_gender" value="남성" checked>
                                            <label class="custom-control-label" for="male">남성</label>
                                        </div>
                                        <div class="custom-control custom-radio custom-control-inline">
-                                            <input class="custom-control-input" type="radio" id="female" name="gender"value="female">
+                                            <input class="custom-control-input" type="radio" id="female" name="u_gender"value="여성">
                                            <label class="custom-control-label" for="female">여성</label>
                                        </div>
                                    </td>
                                </tr>
-
                                <tr>
                                    <th scope="row">직책</th>
-                                    <td colspan="3">
-                                        <div class="custom-control custom-checkbox custom-control-inline">
-                                           <input type="checkbox" class="custom-control-input" id="u_post_0" name="u_post" value="사원">&nbsp;&nbsp;&nbsp;
+                                    <td>
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="u_post_0" name="u_post" value="사원" checked>
                                            <label class="custom-control-label" for="u_post_0">사원</label>
                                        </div>
-                                        <div class="custom-control custom-checkbox custom-control-inline">
-                                            <input type="checkbox" class="custom-control-input" id="u_post_1" name="u_post" value="주임">&nbsp;&nbsp;&nbsp;
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="u_post_1" name="u_post"value="주임">
                                            <label class="custom-control-label" for="u_post_1">주임</label>
                                        </div>
-                                        <div class="custom-control custom-checkbox custom-control-inline">
-                                            <input type="checkbox" class="custom-control-input" id="u_post_2" name="u_post" value="대리">&nbsp;&nbsp;&nbsp;
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="u_post_2" name="u_post"value="대리">
                                            <label class="custom-control-label" for="u_post_2">대리</label>
                                        </div>
-                                        <div class="custom-control custom-checkbox custom-control-inline">
-                                            <input type="checkbox" class="custom-control-input" id="u_post_3" name="u_post" value="과장">&nbsp;&nbsp;&nbsp;
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="u_post_3" name="u_post"value="과장">
                                            <label class="custom-control-label" for="u_post_3">과장</label>
                                        </div>
                                    </td>
--- a/hospital/src/main/webapp/UserList.jsp
+++ b/hospital/src/main/webapp/UserList.jsp
@@ -0,0 +1,71 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<jsp:include page="menu.jsp" />
+<html>
+<head>
+    <title>Title</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+</head>
+<body>
+<div class="container">
+    <div class="row d-flex justify-content-center">
+        <div class="col-md-6">
+            <br/>
+            <h1 class="text-center">회원 리스트</h1>
+            <br/>
+        </div>
+    </div>
+    <div class="row d-flex justify-content-center">
+        <div class="col-12">
+            <table id="tb" class="table table-hover">
+                <c:choose>
+                    <c:when test="${empty members}">
+                        <tr>
+                            <td colspan="6" align="center"> 데이터가 없습니다.</td>
+                        </tr>
+                    </c:when>
+                    <c:otherwise>
+                        <thead class="thead-dark">
+                        <tr>
+                            <th scope="col">아이디</th>
+                            <th scope="col">이름</th>
+                            <th scope="col">부서</th>     
+                            <th scope="col">직책</th>
+                            <th scope="col">생년월일</th>                                                                                   
+                            <th scope="col">주소</th>
+                            <th scope="col">전화</th>
+                            <th scope="col">성별</th>
+                            <th scope="col">차량번호</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:forEach items="${members}" var = "member">
+                            <tr>
+                                <td>${member.u_ID}</td>
+                                <td>${member.u_name}</td>
+                                <td>${member.u_divi}</td> 
+                                <td>${member.u_post}</td>
+                                <td>${member.u_birth}</td>                                                                                                          
+                                <td>${member.u_addr}</td>
+                                <td>${member.u_phone}</td>
+                                <td>${member.u_gender}</td>
+                                <td>${member.u_car_num}</td>
+                            </tr>
+                            
+                        </c:forEach>
+                        </tbody>
+                    </c:otherwise>
+                </c:choose>
+            </table>
+        </div>
+    </div>
+</div>
+<br/>
+<br/>
+
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/UserLogin.jsp
+++ b/hospital/src/main/webapp/UserLogin.jsp
@@ -24,16 +24,16 @@
    <img class="mb-4" src="img/google_icon.png" alt="" width="100" height="100">
    <h1 class="h3 mb-3 font-weight-normal">임직원 로그인</h1>
    <label for="id" class="sr-only">Email address</label>
-    <input type="text" id="id" name="id" class="form-control" placeholder="ID" required autofocus>
+    <input type="text" id="u_ID" name="u_ID" class="form-control" placeholder="ID" required autofocus>
    <label for="pw" class="sr-only">Password</label>
-    <input type="password" id="pw" name="pw" class="form-control" placeholder="Password" required>
+    <input type="password" id="u_psw" name="u_psw" class="form-control" placeholder="Password" required>
    <div class="checkbox mb-3">
        <label>
            <input type="checkbox" value="remember-me"> Remember me
        </label>
    </div>
    <button class="btn btn-UserLogin btn-primary btn-block" type="submit">임직원 로그인</button>
-    <button class="btn btn-UserJoin btn-primary btn-block" onclick="location.href='UserJoin.do'">임직원 가입하기</button>
+    <button class="btn btn-UserJoin btn-primary btn-block" onclick="location.href='UserReg.do'">임직원 가입하기</button>
    <br/>
    <a style="text-decoration: none" href="home.do">홈으로</a>
    <p class="mt-5 mb-3 text-muted">&copy; 2020-2020</p>
--- a/hospital/src/main/webapp/UserMyList.jsp
+++ b/hospital/src/main/webapp/UserMyList.jsp
@@ -0,0 +1,62 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<jsp:include page="menu.jsp" />
+<html>
+<head>
+    <title>병원 종합 관리 시스템</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+</head>
+<body>
+<div class="container">
+    <div class="row d-flex justify-content-center">
+        <div class="col-md-6">
+            <br/>
+            <h1 class="text-center">근무 기록</h1>
+            <br/>
+        </div>
+    </div>
+    <div class="row d-flex justify-content-center">
+        <div class="col-12">
+            <table id="tb" class="table table-hover">
+                <c:choose>
+                    <c:when test="${empty vo}">
+                        <tr>
+                            <td colspan="6" align="center"> 데이터가 없습니다.</td>
+                        </tr>
+                    </c:when>
+                    <c:otherwise>
+                        <thead class="thead-dark">
+                        <tr>
+                            <th scope="col">ID</th>
+                            <th scope="col">이름</th>
+                            <th scope="col">근무 시작 시간</th>
+                            <th scope="col">근무 종료 시간</th>
+                            <th scope="col">상태</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:forEach items="${vo}" var = "member">
+                            <tr>
+                                <td>${member.uw_ID}</td>
+                                <td>${member.uw_name}</td>
+                                <td>${member.uw_start}</td>
+                                <td>${member.uw_finish}</td>
+                                <td>${member.uw_state}</td>
+                            </tr>   
+                        </c:forEach>
+                        </tbody>
+                    </c:otherwise>
+                </c:choose>
+            </table>
+        </div>
+    </div>
+</div>
+<br/>
+<br/>
+
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/error404.jsp
+++ b/hospital/src/main/webapp/error404.jsp
@@ -0,0 +1,16 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: User
+  Date: 2020-03-24
+  Time: 오전 9:19
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>404에러입니다</title>
+</head>
+<body>
+    <h1>페이지 경로가 정확하지 않습니다</h1>
+</body>
+</html>
--- a/hospital/src/main/webapp/error500.jsp
+++ b/hospital/src/main/webapp/error500.jsp
@@ -0,0 +1,16 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: User
+  Date: 2020-03-24
+  Time: 오전 9:20
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>500에러입니다</title>
+</head>
+<body>
+    <h1>문제가 발생하였습니다</h1>
+</body>
+</html>
--- a/hospital/src/main/webapp/home.jsp
+++ b/hospital/src/main/webapp/home.jsp
@@ -4,14 +4,35 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title>병원 관리 시스템</title>
+<title> 병원 관리 시스템</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+    <script type="text/javascript"></script>
+    
+    <style>
+    	body{
+    		background-size:100%;
+    	}
+    	.main{
+    		text-align :center;
+    	}
+    </style>
 </head>
-<h1>A 병원</h1>
-<input class="btn btn-UserJoin" type="button"  value="임직원가입하기" onclick="location.href='UserJoin.do'">&nbsp;&nbsp;
-<input class="btn btn-UserLogin" type="button" value="임직원로그인" onclick="location.href='UserLogin.do'" >
-<br>
-<br>
-<input class="btn btn-UserJoin" type="button"  value="환자가입하기" onclick="location.href='patientJoin.do'">&nbsp;&nbsp;
-<input class="btn btn-UserLogin" type="button" value="환자로그인" onclick="location.href='patientlogin.do'" >
+
+<body background = "KakaoTalk_20200624_145231741.jpg">
+    <div class="container">
+        <div class="row">
+            <div class="col-12 main">
+								<h1>병원 종합 관리 시스템</h1>
+								<input class="btn btn-success" type="button"  value="임직원가입하기" onclick="location.href='UserReg.do'">&nbsp;&nbsp;
+								<input class="btn btn-success" type="button" value="임직원로그인" onclick="location.href='UserLogin.do'" >
+								<br>
+								<br>
+								<input class="btn btn-success" type="button"  value="환자가입하기" onclick="location.href='patientReg.do'">&nbsp;&nbsp;
+								<input class="btn btn-success" type="button" value="환자로그인" onclick="location.href='patientlogin.do'" >
+								</div>
+								</div>
+								</div>
 </body>
 </html>
--- a/hospital/src/main/webapp/joinFail.jsp
+++ b/hospital/src/main/webapp/joinFail.jsp
@@ -0,0 +1,15 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:include page="menu.jsp" />
+<!DOCTYPE html>
+<html>
+<head>
+    <title>로그인 성공</title>
+</head>
+<body>
+    <div align="center">
+        <div><h1>회원가입에 실패하였습니다</h1></div>
+        <div><br/></div>
+    </div>
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/joinOk.jsp
+++ b/hospital/src/main/webapp/joinOk.jsp
@@ -0,0 +1,15 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:include page="menu.jsp" />
+<!DOCTYPE html>
+<html>
+<head>
+    <title>로그인 성공</title>
+</head>
+<body>
+    <div align="center">
+        <div><h1>${joinName}님 회원가입을 축하드립니다</h1></div>
+        <div><br/></div>
+    </div>
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/loginFail.jsp
+++ b/hospital/src/main/webapp/loginFail.jsp
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:include page="menu.jsp" />
+<!DOCTYPE html>
+<html>
+<head>
+    <title>로그인 실패</title>
+</head>
+<body>
+    <div align="center">
+        <div><br/></div>
+        <div><h1>입력한 ${param.u_ID}는 존재하지 않는 아이디 입니다.</h1></div>
+        <div><br/></div>
+    </div>
+</body>
+</html>
+<jsp:include page="tail.jsp"/>
--- a/hospital/src/main/webapp/loginOk.jsp
+++ b/hospital/src/main/webapp/loginOk.jsp
@@ -0,0 +1,17 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:include page="menu.jsp" />
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>로그인 성공</title>
+</head>
+<body>
+    <div align="center">
+        <div><h1>${requestScope.member.u_ID} 님 환영합니다</h1></div> <!-- u_ID -->
+        <div><br/></div>
+    </div>
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/menu.jsp
+++ b/hospital/src/main/webapp/menu.jsp
@@ -0,0 +1,39 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+  <%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>병원 종합 관리 시스템</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+    <a class="navbar-brand" href="home.do">병원 종합 관리 시스템</a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <c:if test="${sessionScope.auth eq 'admin' }" >
+            <li class="nav-item">
+                <a class="nav-link" href="UserList.do">회원리스트</a>
+            </li>
+            </c:if>
+            <c:if test="${sessionScope.auth ne 'admin' }" >
+            	<li class="nav-item">
+                	<a class="nav-link" href="UserMyList.do">근무기록</a>
+            	</li>	
+            </c:if>
+        </ul>
+        <form class="form-inline my-2 my-lg-0">
+        </form>
+    </div>
+</nav>
+
+</body>
+</html>
--- a/hospital/src/main/webapp/patientInout.jsp
+++ b/hospital/src/main/webapp/patientInout.jsp
@@ -0,0 +1,82 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<jsp:include page="patientMenu.jsp" />
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title> 외래 or 입원</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+    <script type="text/javascript"></script>
+</head>
+<body>
+    <div class="container">
+        <div class="row">
+            <div class="col-12">
+                <br/>
+                <div><h1>외래 or 입원</h1></div>
+                <br/>
+                <div>
+                    <form id="frm" name="frm" action="patientInoutCheck.do" method="post" onsubmit="return formDataCheck()">
+                        <div>
+                            <table class="table">
+                                <tbody>
+                                <tr>
+                                    <th scope="row">외래 or 입원</th>
+                                    <td>
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="out" name="pio_state" value="외래" checked>
+                                            <label class="custom-control-label" for="out">외래</label>
+                                        </div>
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="in" name="pio_state"value="입원">
+                                            <label class="custom-control-label" for="in">입원</label>
+                                        </div>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th scope="row">병과</th>
+                                    <td>
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="divi-1" name="pio_divi" value="내과" checked>
+                                            <label class="custom-control-label" for="divi-1">내과</label>
+                                        </div>
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="divi-2" name="pio_divi"value="외과">
+                                            <label class="custom-control-label" for="divi-2">외과</label>
+                                        </div>
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="divi-3" name="pio_divi"value="안과">
+                                            <label class="custom-control-label" for="divi-3">안과</label>
+                                        </div>
+                                        <div class="custom-control custom-radio custom-control-inline">
+                                            <input class="custom-control-input" type="radio" id="divi-4" name="pio_divi"value="치과">
+                                            <label class="custom-control-label" for="divi-4">치과</label>
+                                        </div>
+                                    </td>
+                                </tr>
+                                 <tr>
+                                    <th scope="row">예약일</th><td><input class="form-control" id="pio_date" name="pio_date" type="date" style="width:30%" maxlength="6"></td>
+                                </tr>
+                                 <tr>
+                                    <th scope="row">예약시간</th><td><input class="form-control" id="pio_time" name="pio_time" type="time" style="width:30%" maxlength="6"></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div>
+                            <br/>
+                            <input class="btn btn-success" type="submit"  value="예약하기" >&nbsp;&nbsp;<input class="btn btn-danger" type="reset" value="취소" >&nbsp;&nbsp;
+                            <br/>
+                            <br/>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/patientInoutPass.jsp
+++ b/hospital/src/main/webapp/patientInoutPass.jsp
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+    <jsp:forward page="/patientInoutRes.do"></jsp:forward>
+</body>
+</html>
--- a/hospital/src/main/webapp/patientInoutRes.jsp
+++ b/hospital/src/main/webapp/patientInoutRes.jsp
@@ -0,0 +1,65 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<jsp:include page="patientMenu.jsp" />
+<html>
+<head>
+    <title>병원 종합 관리 시스템</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+</head>
+<body>
+<div class="container">
+    <div class="row d-flex justify-content-center">
+        <div class="col-md-6">
+            <br/>
+            <h1 class="text-center">외래 or 입원 결과</h1>
+            <br/>
+        </div>
+    </div>
+<div class="row d-flex justify-content-center">
+       <div class="col-12">
+           <table id="tb" class="table table-hover">
+               <c:choose>
+                   <c:when test="${empty vo}">
+                       <tr>
+                           <td colspan="6" align="center"> 데이터가 없습니다.</td>
+                       </tr>
+                   </c:when>
+                   <c:otherwise>
+                       <thead class="thead-dark">
+                       <tr>
+                        	<th scope="col">이름</th>
+                        	<th scope="col">외래 or 입원</th>
+                           <th scope="col">병과</th>
+                           <th scope="col">일자</th>
+                           <th scope="col">시간</th>
+                           <th scope="col">결과</th>
+                           <th scope="col">비고</th>
+                       </tr>
+                       </thead>
+                       <tbody>
+                       <c:forEach items="${vo}" var = "member">
+                           <tr>
+                               <td>${member.pio_name}</td>
+                               <td>${member.pio_state}</td>
+                               <td>${member.pio_divi}</td>
+                               <td>${member.pio_date}</td>
+                               <td>${member.pio_time}</td>
+                               <td>${member.pio_res}</td>
+                               <td>${member.pio_ok}</td>
+                           </tr>   
+                       </c:forEach>
+                       </tbody>
+                   </c:otherwise>
+               </c:choose>
+           </table>
+       </div>
+    </div>
+</div>
+<br/>
+<br/>
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/patientJoin.jsp
+++ b/hospital/src/main/webapp/patientJoin.jsp
@@ -17,25 +17,25 @@

            if(form.name.value==""){
                alert("사용자 이름을 입력하세요.");
-                form.name.focus();
+                form.p_name.focus();
                return false;
            }

            if(form.id.value==""){
                alert("사용자 아이디를 입력하세요.");
-                form.id.focus();
+                form.p_ID.focus();
                return false;
            }

            if(form.pw.value==""){
                alert("사용자 비밀번호를 입력하세요.");
-                form.pw.focus();
+                form.p_psw.focus();
                return false;
            }

            if(form.pwCheck.value==""){
                alert("사용자 비밀번호 확인값을 입력하세요.");
-                form.pwCheck.focus();
+                form.p_pswCheck.focus();
                return false;
            }
            <!-- form.submit(); button type -->
@@ -51,72 +51,50 @@
                <div><h1>환자 회원 가입</h1></div>
                <br/>
                <div>
-                    <form id="frm" name="frm" action="memberInsert.do" method="post" onsubmit="return formDataCheck()">
+                    <form id="frm" name="frm" action="patientJoin.do" method="post" onsubmit="return formDataCheck()">
                        <div>
                            <table class="table">
                                <tbody>
                                <tr>
-                                    <th scope="row">회원명</th><td colspan="3"><input class="form-control" style="width:30%" type="text" id="name" name="name" maxlength="10"></td>
+                                    <th scope="row">환자성명</th><td colspan="3"><input class="form-control" style="width:30%" type="text" id="p_name" name="p_name" maxlength="10"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">회원ID</th><td colspan="3"> <input class="form-control d-inline" style="width:30%" type="text" id="id" name="id" maxlength="10">&nbsp;&nbsp;<input class="btn btn-info" type="button" value="중복확인" onclick="idValidCheck()"></td>
+                                    <th scope="row">회원ID</th><td colspan="3"> <input class="form-control d-inline" style="width:30%" type="text" id="p_ID" name="p_ID" maxlength="10"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">패스워드</th><td colspan="3"><input class="form-control" style="width:30%" id="pw" name="pw" type="password" size="10"></td>
+                                    <th scope="row">패스워드</th><td colspan="3"><input class="form-control" style="width:30%" id="p_psw" name="p_psw" type="password" size="10"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">패스워드확인</th><td colspan="3"><input class="form-control" style="width:30%" id="pwCheck" name="pwCheck" type="password" size="10"></td>
+                                    <th scope="row">패스워드확인</th><td colspan="3"><input class="form-control" style="width:30%" id="p_pswCheck" name="p_pswCheck" type="password" size="10"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">주소</th><td colspan="3"><input class="form-control" id="addr" name="addr" type="text" maxlength="50"></td>
+                                    <th scope="row">주소</th><td colspan="3"><input class="form-control" id="p_addr" name="p_addr" type="text" maxlength="50"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">전화번호</th><td><input class="form-control" id="tel" name="tel" type="tel" style="width:30%" maxlength="15"></td>
+                                    <th scope="row">전화번호</th><td><input class="form-control" id="p_phone" name="p_phone" type="tel" style="width:30%" maxlength="15"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">차량번호</th><td><input class="form-control" id="u_car_num" name="u_car_num" type="text" style="width:30%" maxlength="15"></td>
+                                    <th scope="row">차량번호</th><td><input class="form-control" id="p_car_num" name="p_car_num" type="text" style="width:30%" maxlength="15"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">생년월일</th><td><input class="form-control" id="u_birth" name="u_birth" type="number" style="width:30%" maxlength="6"></td>
+                                    <th scope="row">생년월일</th><td><input class="form-control" id="p_birthYear" name="p_birthYear" type="date" style="width:30%" maxlength="6"></td>
                                </tr>
                                <tr>
-                                    <th scope="row">병과</th><td><input class="form-control" id="u_car_num" name="u_car_num" type="text" style="width:30%" maxlength="15"></td>
+                                    <th scope="row">나이</th><td><input class="form-control" id="p_age" name="p_age" type="number" style="width:30%" maxlength="3"></td>
                                </tr>
                                <tr>
                                    <th scope="row">성별</th>
                                    <td>
                                        <div class="custom-control custom-radio custom-control-inline">
-                                            <input class="custom-control-input" type="radio" id="male" name="gender" value="male" checked>
+                                            <input class="custom-control-input" type="radio" id="male" name="p_gender" value="남성" checked>
                                            <label class="custom-control-label" for="male">남성</label>
                                        </div>
                                        <div class="custom-control custom-radio custom-control-inline">
-                                            <input class="custom-control-input" type="radio" id="female" name="gender"value="female">
+                                            <input class="custom-control-input" type="radio" id="female" name="p_gender"value="여성">
                                            <label class="custom-control-label" for="female">여성</label>
                                        </div>
                                    </td>
                                </tr>
-
-                                <tr>
-                                    <th scope="row">직책</th>
-                                    <td colspan="3">
-                                        <div class="custom-control custom-checkbox custom-control-inline">
-                                           <input type="checkbox" class="custom-control-input" id="u_post_0" name="u_post" value="사원">&nbsp;&nbsp;&nbsp;
-                                            <label class="custom-control-label" for="u_post_0">사원</label>
-                                        </div>
-                                        <div class="custom-control custom-checkbox custom-control-inline">
-                                            <input type="checkbox" class="custom-control-input" id="u_post_1" name="u_post" value="주임">&nbsp;&nbsp;&nbsp;
-                                            <label class="custom-control-label" for="u_post_1">주임</label>
-                                        </div>
-                                        <div class="custom-control custom-checkbox custom-control-inline">
-                                            <input type="checkbox" class="custom-control-input" id="u_post_2" name="u_post" value="대리">&nbsp;&nbsp;&nbsp;
-                                            <label class="custom-control-label" for="u_post_2">대리</label>
-                                        </div>
-                                        <div class="custom-control custom-checkbox custom-control-inline">
-                                            <input type="checkbox" class="custom-control-input" id="u_post_3" name="u_post" value="과장">&nbsp;&nbsp;&nbsp;
-                                            <label class="custom-control-label" for="u_post_3">과장</label>
-                                        </div>
-                                    </td>
-                                </tr>
                                </tbody>
                            </table>
                        </div>
--- a/hospital/src/main/webapp/patientLogin.jsp
+++ b/hospital/src/main/webapp/patientLogin.jsp
@@ -20,20 +20,20 @@
 </head>
 <body class="text-center">
 <h1>A 병원</h1>
-<form class="form-signin" action="loginCheck.do" method="post">
+<form class="form-signin" action="patientCheck.do" method="post">
    <img class="mb-4" src="img/google_icon.png" alt="" width="100" height="100">
    <h1 class="h3 mb-3 font-weight-normal">로그인 해주세요</h1>
    <label for="id" class="sr-only">Email address</label>
-    <input type="text" id="id" name="id" class="form-control" placeholder="ID" required autofocus>
+    <input type="text" id="p_ID" name="p_ID" class="form-control" placeholder="ID" required autofocus>
    <label for="pw" class="sr-only">Password</label>
-    <input type="password" id="pw" name="pw" class="form-control" placeholder="Password" required>
+    <input type="password" id="p_psw" name="p_psw" class="form-control" placeholder="Password" required>
    <div class="checkbox mb-3">
        <label>
            <input type="checkbox" value="remember-me"> Remember me
        </label>
    </div>
    <button class="btn btn-UserLogin btn-primary btn-block" type="submit">환자 로그인</button>
-    <button class="btn btn-UserJoin btn-primary btn-block" onclick="location.href='patientJoin.do'">환자 가입하기</button>
+    <button class="btn btn-UserJoin btn-primary btn-block" onclick="location.href='patientReg.do'">환자 가입하기</button>
    <br/>
    <a style="text-decoration: none" href="home.do">홈으로</a>
    <p class="mt-5 mb-3 text-muted">&copy; 2020-2020</p>
--- a/hospital/src/main/webapp/patientMenu.jsp
+++ b/hospital/src/main/webapp/patientMenu.jsp
@@ -0,0 +1,38 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>병원 종합 관리 시스템</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+    <a class="navbar-brand" href="home.do">병원 종합 관리 시스템</a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item">
+                <a class="nav-link" href="patientInout.do">외래 or 입원</a>
+            </li>
+           <li class="nav-item">
+                <a class="nav-link" href="patientInoutRes.do">외래 or 입원 결과</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="patientTest.do">건강검진</a>
+            </li>
+			 <li class="nav-item">
+                <a class="nav-link" href="patientTestRes.do">건강검진 결과</a>
+            </li>
+        </ul>
+        <form class="form-inline my-2 my-lg-0">
+        </form>
+    </div>
+</nav>
+</body>
+</html>
--- a/hospital/src/main/webapp/patientOK.jsp
+++ b/hospital/src/main/webapp/patientOK.jsp
@@ -0,0 +1,17 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<jsp:include page="patientMenu.jsp" />
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>로그인 성공</title>
+</head>
+<body>
+    <div align="center">
+        <div><h1>${requestScope.member.p_ID} 님 환영합니다</h1></div> <!-- u_ID -->
+        <div><br/></div>
+    </div>
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/patientTest.jsp
+++ b/hospital/src/main/webapp/patientTest.jsp
@@ -0,0 +1,49 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+ <%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core" %>
+<jsp:include page="patientMenu.jsp" />
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title> 건강검진</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+    <script type="text/javascript"></script>
+</head>
+<body>
+    <div class="container">
+        <div class="row">
+            <div class="col-12">
+                <br/>
+                <div><h1>건강검진</h1></div>
+                <br/>
+                <div>
+                    <form id="frm" name="frm" action="patientTestCheck.do" method="post" onsubmit="return formDataCheck()">
+                        <div>
+                            <table class="table">
+                                <tbody>
+                                 <tr>
+                                    <th scope="row">예약일</th><td><input class="form-control" id="pt_date" name="pt_date" type="date" style="width:30%" maxlength="6"></td>
+                                </tr>
+                                 <tr>
+                                    <th scope="row">예약시간</th><td><input class="form-control" id="pt_time" name="pt_time" type="time" style="width:30%" maxlength="6"></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                            <div>
+                            <br/>
+                            <input class="btn btn-success" type="submit"  value="예약하기" >&nbsp;&nbsp;<input class="btn btn-danger" type="reset" value="취소" >&nbsp;&nbsp;
+                            <br/>
+                            <br/>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/patientTestPass.jsp
+++ b/hospital/src/main/webapp/patientTestPass.jsp
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+    <jsp:forward page="/patientTestRes.do"></jsp:forward>
+</body>
+</html>
--- a/hospital/src/main/webapp/patientTestRes.jsp
+++ b/hospital/src/main/webapp/patientTestRes.jsp
@@ -0,0 +1,69 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<jsp:include page="patientMenu.jsp" />
+<html>
+<head>
+    <title>병원 종합 관리 시스템</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+</head>
+<body>
+<div class="container">
+    <div class="row d-flex justify-content-center">
+        <div class="col-md-6">
+            <br/>
+            <h1 class="text-center">건강검진 결과</h1>
+            <br/>
+        </div>
+    </div>
+<div class="row d-flex justify-content-center">
+       <div class="col-12">
+           <table id="tb" class="table table-hover">
+               <c:choose>
+                   <c:when test="${empty vo}">
+                       <tr>
+                           <td colspan="6" align="center"> 데이터가 없습니다.</td>
+                       </tr>
+                   </c:when>
+                   <c:otherwise>
+                       <thead class="thead-dark">
+                       <tr>
+                        	<th scope="col">이름</th>
+                        	<th scope="col">예약일</th>
+                           <th scope="col">예약 시간</th>
+                           <th scope="col">엑스레이</th>
+                           <th scope="col">피검사</th>
+                           <th scope="col">소변검사</th>
+                           <th scope="col">CT촬영</th>
+                           <th scope="col">결과</th>
+                           <th scope="col">비고</th>
+                       </tr>
+                       </thead>
+                       <tbody>
+                       <c:forEach items="${vo}" var = "member">
+                           <tr>
+                               <td>${member.pt_name}</td>
+                               <td>${member.pt_date}</td>
+                               <td>${member.pt_time}</td>
+                               <td>${member.pt_xray}</td>
+                               <td>${member.pt_blood}</td>
+                               <td>${member.pt_urine}</td>
+                               <td>${member.pt_ct}</td>
+                               <td>${member.pt_res}</td>
+                               <td>${member.pt_state}</td>                               
+                           </tr>   
+                       </c:forEach>
+                       </tbody>
+                   </c:otherwise>
+               </c:choose>
+           </table>
+       </div>
+    </div>
+</div>
+<br/>
+<br/>
+</body>
+</html>
+<jsp:include page="tail.jsp" />
--- a/hospital/src/main/webapp/tail.jsp
+++ b/hospital/src/main/webapp/tail.jsp
@@ -0,0 +1,39 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+<nav class="navbar fixed-bottom navbar-expand-sm navbar-dark bg-dark">
+    <div class="collapse navbar-collapse justify-content-md-center" href="#" style="text-align: center; color : white">copyWriter@병원 종합 관리 시스템</div>
+    <!--<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>-->
+    <!--<div class="collapse navbar-collapse" id="navbarCollapse">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item active">
+                <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="#">Link</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link disabled" href="#">Disabled</a>
+            </li>
+            <li class="nav-item dropup">
+                <a class="nav-link dropdown-toggle" href="https://getbootstrap.com" id="dropdown10" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropup</a>
+                <div class="dropdown-menu" aria-labelledby="dropdown10">
+                    <a class="dropdown-item" href="#">Action</a>
+                    <a class="dropdown-item" href="#">Another action</a>
+                    <a class="dropdown-item" href="#">Something else here</a>
+                </div>
+            </li>-->
+        </ul>
+    </div>
+</nav>
+</div>
+</body>
+</html>
Author	SHA1	Message	Date
mcutegs2	8f89c8e28d	1. 테스트 파일 제거 2. 환자 회원가입 시 ID 값 받아서 환영메시지 노출하는 부분 오류	2020-06-30 20:33:08 +09:00
mcutegs2	9667ac9135	Ver. 0.0.1	2020-06-29 12:41:20 +09:00
mcutegs2	e7ade55c25	1. 병원장(id : boss)이 로그인할 경우 임직원 List 노출 2. 임직원이 로그인할 경우 근무기록 List 노출 3. 환자 외래 or 입원 예약 DB에 Input(pio_ok에 1값 입력) = 로그인 시 사용했던 ID, name값 해당 테이블에 저장 4. 환자 외래 or 입원 예약 기록 List 노출 5. 환자 건강검진 예약 DB에 Input (pt_state에 1값 입력) = 로그인 시 사용했던 ID, name값 해당 테이블에 저장 6. 환자 건강검진 예약 기록 List 노출	2020-06-28 03:56:19 +09:00
mcutegs2	78e29d6686	1. 환자 회원가입, 로그인 추가 2. 임직원 로그인 추가 3. 외래 or 입원, 건강검진 추가 예정	2020-06-25 16:57:40 +09:00
mcutegs2	e55cee847a	회원가입 DB 연동	2020-06-23 17:52:42 +09:00
mcutegs2	939483e336	임직원 회원가입 DB 연결 중 - UserJoinDao, UserJoinVo, error404, error500, UserRegCommand, Menu, joinfail, joinOk, tail 추가 및 수정	2020-06-22 20:32:08 +09:00
mcutegs2	7fafe170b0	UserJoin 관련 - Dao, Vo, Command 수정 필요 - 생일 관련 Date 자료형 처리 논의 필요.	2020-06-18 17:40:36 +09:00
mcutegs2	a4662a5768	직원 DB 연동 패키지 생성	2020-06-17 17:01:16 +09:00
mcutegs2	866c1f9516	1. DB 연동 관련 Driver 추가 2. DB 연동 후 데이터 출력 test 파일 제작	2020-06-16 18:00:55 +09:00
mcutegs2	a7dd2177cd	Revert "Revert "1. DB 연결 관련 Dao, Vo 자바 파일 생성"" This reverts commit `9bc7963d4c`.	2020-06-15 19:25:27 +09:00