Changes done for to show Patient Family detail on appointment

webitm-dashboard/ibase/dashboard/crm/ejb/Appointment.java

 package ibase.dashboard.crm.ejb;
 
 import java.sql.Connection;
-import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import org.json.XML;
 import org.json.simple.JSONArray;
@@ -39,25 +37,53 @@ public class Appointment
 		try 
 		{
 			conn = connDriver.getConnectDB(transDB);
-			sql  =  " SELECT PT.FIRST_NAME || ' ' || PT.MIDDLE_NAME || ' ' || PT.LAST_NAME AS PATIENT_NAME, "+
-					" PT.PATIENT_CODE, APT.APPOINT_ID AS APPT_ID, TO_CHAR( APT.APPOINT_DATE, 'DD FMMONTH YYYY' ) AS APPT_DATE," + 
-					" APT.STATUS AS STATUS,(TO_CHAR( SYSDATE, 'YYYY' ) - TO_CHAR( PT.BIRTH_DATE, 'YYYY' )) AS AGE, UPPER(PT.SEX) AS GENDER, " + 
+			/*
+			 * sql =
+			 * " SELECT PT.FIRST_NAME || ' ' || PT.MIDDLE_NAME || ' ' || PT.LAST_NAME AS PATIENT_NAME, "
+			 * +
+			 * " PT.PATIENT_CODE, APT.APPOINT_ID AS APPT_ID, TO_CHAR( APT.APPOINT_DATE, 'DD FMMONTH YYYY' ) AS APPT_DATE,"
+			 * +
+			 * " APT.STATUS AS STATUS,(TO_CHAR( SYSDATE, 'YYYY' ) - TO_CHAR( PT.BIRTH_DATE, 'YYYY' )) AS AGE, UPPER(PT.SEX) AS GENDER, "
+			 * +
+			 * " '/IBASE/RESOURCE/IMAGES/DETAILFORMICON/COMPLETED.PNG' AS VISIT_COMP_ICON, "
+			 * +
+			 * " '/IBASE/RESOURCE/IMAGES/DETAILFORMICON/DOC_VERIFY.PNG' AS VERIFY_DOC_ICON, "
+			 * + " ( SELECT COUNT(AA.APPOINT_DATE) COUNT " + "   FROM APPOINTMENT AA " +
+			 * "   WHERE AA.APPOINT_DATE = APT.APPOINT_DATE " + "   GROUP BY APPOINT_DATE "
+			 * + " ) AS COUNT_DAYS " + " FROM APPOINTMENT APT " + " JOIN PATIENT PT " +
+			 * " ON APT.PATIENT_CODE = PT.PATIENT_CODE " + " WHERE DOCTOR_CODE = ? " +
+			 * " AND (TO_CHAR( APPOINT_DATE, 'DD/MM/YY' ) BETWEEN TO_CHAR( SYSDATE , 'DD/MM/YY' ) "
+			 * + " AND TO_CHAR( SYSDATE + 1 , 'DD/MM/YY' ) )" +
+			 * " GROUP BY  PT.FIRST_NAME,PT.MIDDLE_NAME,PT.LAST_NAME,PT.PATIENT_CODE,APT.APPOINT_ID,"
+			 * + " APT.APPOINT_DATE,APT.STATUS,PT.BIRTH_DATE,PT.SEX " +
+			 * " ORDER BY APPOINT_ID";
+			 */
+			
+			sql =   " SELECT " + 
+					" CASE" + 
+					"   WHEN PATIENT_REF_NO = 0 THEN PT.FIRST_NAME || ' ' || PT.MIDDLE_NAME || ' ' || PT.LAST_NAME " + 
+					"   ELSE PTF.MEMBER_NAME " + 
+					" END AS PATIENT_NAME," + 
+					" CASE " + 
+					"   WHEN PATIENT_REF_NO = 0 THEN (TO_CHAR( SYSDATE, 'YYYY' ) - TO_CHAR( PT.BIRTH_DATE, 'YYYY' )) " + 
+					"   ELSE (TO_CHAR( SYSDATE, 'YYYY' ) - TO_CHAR( PTF.BIRTH_DATE, 'YYYY' )) " + 
+					" END AS AGE, " + 
+					" CASE " + 
+					"   WHEN PATIENT_REF_NO = 0 THEN  UPPER(PT.SEX) " + 
+					"   ELSE UPPER(PTF.SEX) " + 
+					" END AS GENDER, " + 
+					" PT.PATIENT_CODE, APT.APPOINT_ID AS APPT_ID, TO_CHAR( APT.APPOINT_DATE, 'DD FMMONTH YYYY' ) AS APPT_DATE, " + 
+					" APT.STATUS AS STATUS, " + 
 					" '/IBASE/RESOURCE/IMAGES/DETAILFORMICON/COMPLETED.PNG' AS VISIT_COMP_ICON,  " + 
 					" '/IBASE/RESOURCE/IMAGES/DETAILFORMICON/DOC_VERIFY.PNG' AS VERIFY_DOC_ICON, " + 
-					" ( SELECT COUNT(AA.APPOINT_DATE) COUNT " + 
-					"   FROM APPOINTMENT AA " + 
-					"   WHERE AA.APPOINT_DATE = APT.APPOINT_DATE " + 
-					"   GROUP BY APPOINT_DATE " + 
-					" ) AS COUNT_DAYS " + 
+					" APT.PATIENT_REF_NO " + 
 					" FROM APPOINTMENT APT  " + 
-					" JOIN PATIENT PT " + 
-					" ON APT.PATIENT_CODE = PT.PATIENT_CODE " + 
+					" JOIN PATIENT PT ON APT.PATIENT_CODE = PT.PATIENT_CODE " + 
+					" JOIN PATIENT_FAMILY PTF ON  PTF.PATIENT_CODE = APT.PATIENT_CODE AND PTF.LINE_NO = APT.PATIENT_REF_NO " + 
 					" WHERE DOCTOR_CODE = ?  " + 
 					" AND (TO_CHAR( APPOINT_DATE, 'DD/MM/YY' ) BETWEEN TO_CHAR( SYSDATE , 'DD/MM/YY' ) " + 
-					" AND TO_CHAR( SYSDATE + 1 , 'DD/MM/YY' ) )" + 
-					" GROUP BY  PT.FIRST_NAME,PT.MIDDLE_NAME,PT.LAST_NAME,PT.PATIENT_CODE,APT.APPOINT_ID," +
-					" APT.APPOINT_DATE,APT.STATUS,PT.BIRTH_DATE,PT.SEX " + 
-					" ORDER BY APPOINT_ID";
+					" AND TO_CHAR( SYSDATE + 1 , 'DD/MM/YY' ) ) " + 
+					" ORDER BY APPOINT_ID ";
 			pStmt = conn.prepareStatement(sql);
 			pStmt.setString(1, userCode);
 			rs = pStmt.executeQuery();
@@ -137,13 +163,29 @@ public class Appointment
 		try 
 		{
 			conn = connDriver.getConnectDB(transDB);
-			sql= " SELECT APT.STATUS,PT.PATIENT_CODE,PT.FIRST_NAME || ' ' || PT.MIDDLE_NAME || ' ' || PT.LAST_NAME AS PATIENT_NAME\n" + 
-				 " FROM APPOINTMENT APT \n" + 
-			     " JOIN PATIENT PT\n" + 
-				 " ON PT.PATIENT_CODE = APT.PATIENT_CODE  \n" + 
-				 " WHERE APT.APPOINT_ID = ? ";
+			/*
+			 * sql=
+			 * " SELECT APT.STATUS,PT.PATIENT_CODE,PT.FIRST_NAME || ' ' || PT.MIDDLE_NAME || ' ' || PT.LAST_NAME AS PATIENT_NAME\n"
+			 * + " FROM APPOINTMENT APT \n" + " JOIN PATIENT PT\n" +
+			 * " ON PT.PATIENT_CODE = APT.PATIENT_CODE  \n" + " WHERE APT.APPOINT_ID = ? ";
+			 */
+			
+			sql =   " SELECT " + 
+					" CASE " + 
+					" WHEN PATIENT_REF_NO = 0 THEN PT.FIRST_NAME || ' ' || PT.MIDDLE_NAME || ' ' || PT.LAST_NAME  " + 
+					" ELSE PTF.MEMBER_NAME " + 
+					" END AS PATIENT_NAME,APT.STATUS,PT.PATIENT_CODE " + 
+					" FROM APPOINTMENT APT " + 
+					" JOIN PATIENT PT ON APT.PATIENT_CODE = PT.PATIENT_CODE  " + 
+					" JOIN PATIENT_FAMILY PTF ON  PTF.PATIENT_CODE = APT.PATIENT_CODE AND PTF.LINE_NO = APT.PATIENT_REF_NO " + 
+					" WHERE DOCTOR_CODE = ? " + 
+					" AND APT.APPOINT_ID = ? "+
+					" AND (TO_CHAR( APPOINT_DATE, 'DD/MM/YY' ) BETWEEN TO_CHAR( SYSDATE , 'DD/MM/YY' ) " + 
+					" AND TO_CHAR( SYSDATE + 1 , 'DD/MM/YY' ) ) ";
 			pStmt = conn.prepareStatement(sql);
-			pStmt.setString(1, apptId);
+			pStmt.setString(1, userCode);
+			pStmt.setString(2, apptId);
+			System.out.println("sql ::  "+sql);
 			rs = pStmt.executeQuery();
 			if(rs.next()) 
 			{
@@ -151,6 +193,7 @@ public class Appointment
 				patientName = genericUtility.checkNull(rs.getString("PATIENT_NAME"));
 				patientCode = genericUtility.checkNull(rs.getString("PATIENT_CODE"));
 			}
+			System.out.println("Status   :: "+status);
 			if("C".equalsIgnoreCase(status))
 			{
 				errSting = genericUtility.getErrorString("appt_id", "VMAPPTCPAR", userCode); 
@@ -163,7 +206,7 @@ public class Appointment
 				pStmt.setString(1, "C");
 				pStmt.setString(2, apptId);
 				cnt = pStmt.executeUpdate();
-				System.out.println("Update Status Count :: "+cnt);
+				System.out.println("Update Status Count :: "+cnt+"      Query ::  "+sql);
 				if(cnt > 0) 
 				{
 					conn.commit();