Commit

consentApi/.gitignore

@@ -1,6 +1,7 @@
 HELP.md
 .gradle
 build/
+/bin/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**
 !**/src/test/**

consentApi/bin/main/mybatis/mapper/HospitalMapper.xml

@@ -114,7 +114,7 @@
     ]]>
   </select>
 
-  <select id="getDeptList" parameterType="java.util.HashMap" resultType="com.dbs.consentServer.VO.hospitalVO.GetWardDeptVO">
+  <select id="getDeptList" parameterType="java.util.HashMap" resultType="com.dbs.consentServer.VO.hospitalVO.WardDeptVO">
     <![CDATA[
       SELECT ''                    AS deptCd,
              '진료과(전체)'          AS deptNm,
@@ -1143,7 +1143,7 @@
     ]]>
   </delete>
 
-  <select id="getConsentFormCategory" resultType="ConsentFormCategoryVO">
+  <select id="getConsentFormCategory" parameterType="string" resultType="ConsentFormCategoryVO">
     <![CDATA[
       SELECT FORM_CATEGORY_ID         AS categoryId,
              FORM_CATEGORY_CODE       AS categoryCode,

consentApi/build.gradle

@@ -19,7 +19,7 @@ dependencies {
 	implementation fileTree(dir: 'lib', include: ['*.jar'])
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-validation
-	implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation', version: '1.3.0.RELEASE'
+	// implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation', version: '1.3.0.RELEASE'
 	providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 	testImplementation('org.springframework.boot:spring-boot-starter-test') {
 		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
@@ -35,10 +35,7 @@ dependencies {
 
 	// https://mvnrepository.com/artifact/org.projectlombok/lombok
 	providedCompile group: 'org.projectlombok', name: 'lombok', version: '1.18.12'
-
 	
-
-
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

consentApi/src/main/java/com/dbs/consentServer/mapper/HospitalMapper.java

@@ -25,7 +25,7 @@ public interface HospitalMapper {
   public String doLogin(String userId);
   public List<UserDeptVO> getUserDeptList(User.UserLogin dto);
   public ArrayList<UserDeptVO> getUserDeptList(HashMap<String, String> params);
-  public List<WardDeptVO> getWardList(String instCd);
+  public ArrayList<WardDeptVO> getWardList(String instCd);
   public ArrayList<WardDeptVO> getDeptList(HashMap<String, String> params);
   public ArrayList<GetDoctorVO> getDoctorList(HashMap<String, String> params);
   public ArrayList<GetPatientVO> getInPatientList(PatientListDTO patientListDTO);

consentApi/src/main/java/com/dbs/consentServer/service/HospitalService.java

@@ -40,7 +40,7 @@ public class HospitalService {
     return hospitalMapper.getUserDeptList(params);
   }
 
-  public List<WardDeptVO> getWardList(String instCd) {
+  public ArrayList<WardDeptVO> getWardList(String instCd) {
     return hospitalMapper.getWardList(instCd);
   }
 

consentApi/src/main/resources/mybatis/mapper/HospitalMapper.xml

@@ -95,7 +95,7 @@
     ]]>
   </select>
   
-  <select id="getWardList" resultType="com.dbs.consentServer.VO.hospitalVO.GetWardDeptVO">
+  <select id="getWardList" resultType="com.dbs.consentServer.VO.hospitalVO.WardDeptVO">
     <![CDATA[
       SELECT ''               AS deptCd,
              '병동(전체)'       AS deptNm,
@@ -114,7 +114,7 @@
     ]]>
   </select>
 
-  <select id="getDeptList" parameterType="java.util.HashMap" resultType="com.dbs.consentServer.VO.hospitalVO.GetWardDeptVO">
+  <select id="getDeptList" parameterType="java.util.HashMap" resultType="com.dbs.consentServer.VO.hospitalVO.WardDeptVO">
     <![CDATA[
       SELECT ''                    AS deptCd,
              '진료과(전체)'          AS deptNm,
@@ -1143,7 +1143,7 @@
     ]]>
   </delete>
 
-  <select id="getConsentFormCategory" resultType="ConsentFormCategoryVO">
+  <select id="getConsentFormCategory" parameterType="string" resultType="ConsentFormCategoryVO">
     <![CDATA[
       SELECT FORM_CATEGORY_ID         AS categoryId,
              FORM_CATEGORY_CODE       AS categoryCode,