환자정보 조회 오류 수정

생활치료센터 리스트 수정

src/main/java/com/lemon/lifecenter/controller/PatientController.java

@@ -55,11 +55,14 @@ public class PatientController extends LifeCenterController {
             @RequestParam(value="patientName", required=false, defaultValue="") String patientName,
             @RequestParam(value="startDate", required=false, defaultValue="") String startDate,
             @RequestParam(value="endDate", required=false, defaultValue="") String endDate,
-            @RequestParam(value="page", required=false, defaultValue="1") int page ) {
+            @RequestParam(value="page", required=false, defaultValue="1") int page,
+            HttpServletRequest request,HttpServletResponse response) {
         
         System.err.println( "page : " + page );
         
+        String sesCenterCode  = LifeCenterSessionController.getSession( request, "sesCenterCode" );
         PatientDTO dto = new PatientDTO();
+        dto.setCenterCode(Integer.parseInt(sesCenterCode));
         dto.setPatientName(patientName);
         dto.setState(inputState);
         dto.setStartDate(startDate);
@@ -187,8 +190,12 @@ public class PatientController extends LifeCenterController {
             dto.setBloodPressureLevelRel(bloodPressureLevel[0]);
         }
         
-        String strDisease = getDisease(dto);
+        String strDisease = "";
         String strSymptom = getSymptom(dto);
+        if (dto.getBasalDiseaseYn().equals("Y")) {
+            strDisease = getDisease(dto);
+        }
+        
         
         mv.addObject("disease", strDisease);
         mv.addObject("symptom", strSymptom);

src/main/resources/mybatis/mapper/center/center.xml

@@ -56,6 +56,7 @@
               LEFT OUTER JOIN MEMBER M
                 ON CI.CENTER_CODE = M.CENTER_CODE
              WHERE CI.CENTER_CODE = #{centerCode}
+               AND M.GROUP_IDX = 2
         ]]>
     </select>
     
@@ -66,6 +67,7 @@
               LEFT OUTER JOIN MEMBER M
                 ON CI.CENTER_CODE = M.CENTER_CODE
              WHERE 1 = 1
+               AND M.GROUP_IDX = 2
         ]]>
         <if test='locationCode != null and locationCode != ""'>
             <![CDATA[
@@ -104,6 +106,7 @@
               LEFT OUTER JOIN MEMBER M
                 ON CI.CENTER_CODE = M.CENTER_CODE
              WHERE 1 = 1
+               AND M.GROUP_IDX = 2
         ]]>
         <if test='locationCode != null and locationCode != ""'>
             <![CDATA[

src/main/resources/mybatis/mapper/patient/patient.xml

@@ -7,6 +7,7 @@
             SELECT count(*) AS total
               FROM PATIENT_CARE
              WHERE 1 = 1
+               AND CENTER_CODE = #{centerCode}
         ]]>
         <if test='state != "ALL"'>
             <![CDATA[
@@ -47,6 +48,7 @@
                    END                                                                AS state
               FROM PATIENT_CARE
              WHERE 1 = 1
+               AND CENTER_CODE = #{centerCode}
         ]]>
     <if test='state != "ALL"'>
         <![CDATA[

src/main/resources/mybatis/mapper/staff/staff.xml

@@ -20,6 +20,7 @@
               LEFT OUTER JOIN CENTER_INFO CI
                 ON M.CENTER_CODE = CI.CENTER_CODE
              WHERE 1 = 1
+               AND M.GROUP_IDX != 1
         ]]>
         <if test='useYn != null and useYn != ""'>
             <![CDATA[
@@ -64,6 +65,7 @@
               LEFT OUTER JOIN CENTER_INFO CI
                 ON M.CENTER_CODE = CI.CENTER_CODE
              WHERE 1 = 1
+               AND M.GROUP_IDX != 1
         ]]>
         <if test='useYn != null and useYn != ""'>
             <![CDATA[

src/main/webapp/WEB-INF/jsp/clinic/info.jsp

@@ -850,7 +850,7 @@ $(document).ready(function() {
 														<c:if test="${info.allergyCheck eq 'Y'}">, 알레르기</c:if>
 														<c:if test="${info.kidneyDisease eq 'Y'}">, 신장질환</c:if>
 														<c:if test="${info.cancerCheck eq 'Y'}">, 암(<c:out value="${info.cancerName}" />)</c:if>
-														<c:if test="${info.ectCheckDisease eq 'Y'}">, 기타(<c:out value="${info.etcContentDisease}" />)</c:if>
+														<c:if test="${info.etcCheckDisease eq 'Y'}">, 기타(<c:out value="${info.etcContentDisease}" />)</c:if>
 												</td>
 										</tr>
 										<tr>
@@ -871,7 +871,7 @@ $(document).ready(function() {
 														<c:if test="${info.headacheCheck eq 'Y'}">, 두통(머리아픔)</c:if>
 														<c:if test="${info.dyspneaCheck eq 'Y'}">, 호흡곤란(숨가쁨)</c:if>
 														<c:if test="${info.fatigueCheck eq 'Y'}">, 권태감(피곤함)</c:if>
-														<c:if test="${info.ectCheckSymptom eq 'Y'}">, 기타(<c:out value="${info.etcContentSymptom}" />)</c:if>
+														<c:if test="${info.etcCheckSymptom eq 'Y'}">, 기타(<c:out value="${info.etcContentSymptom}" />)</c:if>
 												</td>
 										</tr>
 										<tr>