[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web ClientM
open source web-based Electronic Medical Record (EMR) system
Brought to you by:
davidhcchan,
jaygallagher
Menu
▾
▴
[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web ClientManagerAction.java, 1.134, 1.135
|
From: Ted L. <ted...@us...> - 2008-12-26 23:43:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18819/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web Modified Files: ClientManagerAction.java Log Message: added ability to send photos to hnr Index: ClientManagerAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/ClientManagerAction.java,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** ClientManagerAction.java 24 Dec 2008 21:07:54 -0000 1.134 --- ClientManagerAction.java 26 Dec 2008 23:43:02 -0000 1.135 *************** *** 92,96 **** --- 92,98 ---- import org.oscarehr.caisi_integrator.ws.client.Referral; import org.oscarehr.caisi_integrator.ws.client.ReferralWs; + import org.oscarehr.casemgmt.dao.ClientImageDAO; import org.oscarehr.casemgmt.service.CaseManagementManager; + import org.oscarehr.common.dao.DemographicDao; import org.oscarehr.common.dao.IntegratorConsentDao; import org.oscarehr.common.model.Demographic; *************** *** 98,101 **** --- 100,104 ---- import org.oscarehr.common.model.IntegratorConsent; import org.oscarehr.common.model.Provider; + import org.oscarehr.hnr.ws.client.HnrWs; import org.oscarehr.survey.model.oscar.OscarFormInstance; import org.oscarehr.util.SessionConstants; *************** *** 110,113 **** --- 113,118 ---- private static final Logger logger = org.apache.log4j.LogManager.getLogger(ClientManagerAction.class); + private DemographicDao demographicDao; + private ClientImageDAO clientImageDAO; private CaisiIntegratorManager caisiIntegratorManager; private HealthSafetyManager healthSafetyManager; *************** *** 134,137 **** --- 139,150 ---- } + public void setDemographicDao(DemographicDao demographicDao) { + this.demographicDao = demographicDao; + } + + public void setClientImageDAO(ClientImageDAO clientImageDAO) { + this.clientImageDAO = clientImageDAO; + } + public void setIntegratorConsentDao(IntegratorConsentDao integratorConsentDao) { this.integratorConsentDao = integratorConsentDao; *************** *** 146,152 **** } - // Parameter - public static final String ID = "id"; - public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { DynaActionForm clientForm = (DynaActionForm) form; --- 159,162 ---- *************** *** 156,159 **** --- 166,209 ---- } + public ActionForward sendImageToHnr(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + try { + Integer clientId = Integer.parseInt(request.getParameter("id")); + org.oscarehr.casemgmt.model.ClientImage localClientImage=clientImageDAO.getClientImage(clientId); + + if (localClientImage!=null) + { + HttpSession session = request.getSession(); + Facility loggedInFacility=(Facility)session.getAttribute(SessionConstants.CURRENT_FACILITY); + Provider provider = (Provider)session.getAttribute(SessionConstants.LOGGED_IN_PROVIDER); + Demographic demographic=demographicDao.getDemographicById(clientId); + + HnrWs hnrWs=caisiIntegratorManager.getHnrWs(loggedInFacility.getId()); + String dataSetter="caisi logged in facilityId="+loggedInFacility.getId()+", logged in providerId="+provider.getProviderNo(); + + org.oscarehr.hnr.ws.client.ClientImage hnrClientImage=new org.oscarehr.hnr.ws.client.ClientImage(); + hnrClientImage.setCreatedBy(loggedInFacility.getName()+":"+provider.getFormattedName()); + + //the following line shouldn't be here but our data in the db is so dirty some one needs to flag the warning. + if (StringUtils.trimToNull(demographic.getHin())==null) logger.error("Invalid data in the database, blank was set for the HIN, null should be used for no hin. clientId="+clientId); + + hnrClientImage.setHin(demographic.getHin()); + hnrClientImage.setImage(localClientImage.getImage_data()); + + hnrWs.setClientImage2(dataSetter, hnrClientImage); + } + else + { + logger.warn("Odd, client image disappeared, either code error or some one removed the client image while some one was viewing it and just about to send it to the HNR. clientId="+request.getParameter("id")); + } + } catch (Exception e) { + logger.error("Unexpected error. QS="+request.getQueryString(), e); + } + + DynaActionForm clientForm = (DynaActionForm) form; + clientForm.set("view", new ClientManagerFormBean()); + + return edit(mapping, form, request, response); + } + public ActionForward admit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { DynaActionForm clientForm = (DynaActionForm) form; *************** *** 166,186 **** try { ! admissionManager.processAdmission(Integer.valueOf(demographicNo), getProviderNo(request), fullProgram, admission.getDischargeNotes(), admission.getAdmissionNotes(), ! admission.isTemporaryAdmission()); ! } ! catch (ProgramFullException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("admit.error", "Program is full.")); saveMessages(request, messages); ! } ! catch (AdmissionException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("admit.error", e.getMessage())); saveMessages(request, messages); ! } ! catch (ServiceRestrictionException e) { ActionMessages messages = new ActionMessages(); ! messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("admit.service_restricted", e.getRestriction().getComments(), e.getRestriction().getProvider() ! .getFormattedName())); saveMessages(request, messages); } --- 216,231 ---- try { ! admissionManager.processAdmission(Integer.valueOf(demographicNo), getProviderNo(request), fullProgram, admission.getDischargeNotes(), admission.getAdmissionNotes(), admission.isTemporaryAdmission()); ! } catch (ProgramFullException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("admit.error", "Program is full.")); saveMessages(request, messages); ! } catch (AdmissionException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("admit.error", e.getMessage())); saveMessages(request, messages); ! } catch (ServiceRestrictionException e) { ActionMessages messages = new ActionMessages(); ! messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("admit.service_restricted", e.getRestriction().getComments(), e.getRestriction().getProvider().getFormattedName())); saveMessages(request, messages); } *************** *** 238,243 **** try { admissionManager.processDischarge(p.getId(), new Integer(id), admission.getDischargeNotes(), admission.getRadioDischargeReason(), dependents, false, false); ! } ! catch (AdmissionException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("discharge.failure", e.getMessage())); --- 283,287 ---- try { admissionManager.processDischarge(p.getId(), new Integer(id), admission.getDischargeNotes(), admission.getRadioDischargeReason(), dependents, false, false); ! } catch (AdmissionException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("discharge.failure", e.getMessage())); *************** *** 270,281 **** try { ! admissionManager.processDischargeToCommunity(program.getId(), new Integer(clientId), getProviderNo(request), admission.getDischargeNotes(), admission ! .getRadioDischargeReason(), dependents); logManager.log("write", "discharge", clientId, request); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("discharge.success")); saveMessages(request, messages); ! } ! catch (AdmissionException e) { messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("discharge.failure", e.getMessage())); saveMessages(request, messages); --- 314,323 ---- try { ! admissionManager.processDischargeToCommunity(program.getId(), new Integer(clientId), getProviderNo(request), admission.getDischargeNotes(), admission.getRadioDischargeReason(), dependents); logManager.log("write", "discharge", clientId, request); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("discharge.success")); saveMessages(request, messages); ! } catch (AdmissionException e) { messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("discharge.failure", e.getMessage())); saveMessages(request, messages); *************** *** 376,385 **** String consentText = "Have not asked client yet."; if (integratorConsent != null) { ! if (integratorConsent.isConsentToAll()) ! consentText = "Consented to all"; ! else if (integratorConsent.isConsentToNone()) ! consentText = "Consented to none"; ! else ! consentText = "Consented to some"; } request.getSession().setAttribute("integratorConsent", consentText); --- 418,424 ---- String consentText = "Have not asked client yet."; if (integratorConsent != null) { ! if (integratorConsent.isConsentToAll()) consentText = "Consented to all"; ! else if (integratorConsent.isConsentToNone()) consentText = "Consented to none"; ! else consentText = "Consented to some"; } request.getSession().setAttribute("integratorConsent", consentText); *************** *** 405,409 **** // if it's local if (programId != 0) { ! referral.setClientId((long)clientId); referral.setProgramId((long) programId); referral.setProviderNo(providerId); --- 444,448 ---- // if it's local if (programId != 0) { ! referral.setClientId((long) clientId); referral.setProgramId((long) programId); referral.setProviderNo(providerId); *************** *** 419,423 **** else if (referral.getRemoteFacilityId() != null && referral.getRemoteProgramId() != null) { try { ! Referral remoteReferral=new Referral(); remoteReferral.setDestinationIntegratorFacilityId(Integer.parseInt(referral.getRemoteFacilityId())); remoteReferral.setDestinationCaisiProgramId(Integer.parseInt(referral.getRemoteProgramId())); --- 458,462 ---- else if (referral.getRemoteFacilityId() != null && referral.getRemoteProgramId() != null) { try { ! Referral remoteReferral = new Referral(); remoteReferral.setDestinationIntegratorFacilityId(Integer.parseInt(referral.getRemoteFacilityId())); remoteReferral.setDestinationCaisiProgramId(Integer.parseInt(referral.getRemoteProgramId())); *************** *** 426,434 **** remoteReferral.setSourceCaisiDemographicId(clientId); remoteReferral.setSourceCaisiProviderId(providerId); ! ReferralWs referralWs = caisiIntegratorManager.getReferralWs(facilityId); referralWs.makeReferral(remoteReferral); ! } ! catch (Exception e) { logger.error("Unexpected Error.", e); } --- 465,472 ---- remoteReferral.setSourceCaisiDemographicId(clientId); remoteReferral.setSourceCaisiProviderId(providerId); ! ReferralWs referralWs = caisiIntegratorManager.getReferralWs(facilityId); referralWs.makeReferral(remoteReferral); ! } catch (Exception e) { logger.error("Unexpected Error.", e); } *************** *** 450,470 **** try { clientManager.processReferral(referral); ! } ! catch (AlreadyAdmittedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.already_admitted")); saveMessages(request, messages); success = false; ! } ! catch (AlreadyQueuedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.already_referred")); saveMessages(request, messages); success = false; ! } ! catch (ServiceRestrictionException e) { ActionMessages messages = new ActionMessages(); ! messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.service_restricted", e.getRestriction().getComments(), e.getRestriction().getProvider() ! .getFormattedName())); saveMessages(request, messages); --- 488,504 ---- try { clientManager.processReferral(referral); ! } catch (AlreadyAdmittedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.already_admitted")); saveMessages(request, messages); success = false; ! } catch (AlreadyQueuedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.already_referred")); saveMessages(request, messages); success = false; ! } catch (ServiceRestrictionException e) { ActionMessages messages = new ActionMessages(); ! messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.service_restricted", e.getRestriction().getComments(), e.getRestriction().getProvider().getFormattedName())); saveMessages(request, messages); *************** *** 476,481 **** // store permission ! request.setAttribute("hasOverridePermission", caseManagementManager.hasAccessRight("Service restriction override on referral", "access", getProviderNo(request), String ! .valueOf(referral.getClientId()), "" + program.getId())); // jump to service restriction error page to allow overrides, etc. --- 510,514 ---- // store permission ! request.setAttribute("hasOverridePermission", caseManagementManager.hasAccessRight("Service restriction override on referral", "access", getProviderNo(request), String.valueOf(referral.getClientId()), "" + program.getId())); // jump to service restriction error page to allow overrides, etc. *************** *** 521,526 **** request.setAttribute("program", program); ! } ! catch (Exception e) { e.printStackTrace(); } --- 554,558 ---- request.setAttribute("program", program); ! } catch (Exception e) { e.printStackTrace(); } *************** *** 558,563 **** clientRestrictionManager.saveClientRestriction(restriction); success = true; ! } ! catch (ClientAlreadyRestrictedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("restrict.already_restricted")); --- 590,594 ---- clientRestrictionManager.saveClientRestriction(restriction); success = true; ! } catch (ClientAlreadyRestrictedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("restrict.already_restricted")); *************** *** 578,583 **** if (facility != null) { request.setAttribute("serviceRestrictions", clientRestrictionManager.getActiveRestrictionsForClient(Integer.valueOf(id), facility.getId(), new Date())); ! } ! else { request.setAttribute("serviceRestrictions", clientRestrictionManager.getActiveRestrictionsForClient(Integer.valueOf(id), 0, new Date())); } --- 609,613 ---- if (facility != null) { request.setAttribute("serviceRestrictions", clientRestrictionManager.getActiveRestrictionsForClient(Integer.valueOf(id), facility.getId(), new Date())); ! } else { request.setAttribute("serviceRestrictions", clientRestrictionManager.getActiveRestrictionsForClient(Integer.valueOf(id), 0, new Date())); } *************** *** 620,626 **** ClientReferral referral = (ClientReferral) clientForm.get("referral"); ! if (isCancelled(request) ! || !caseManagementManager.hasAccessRight("Service restriction override on referral", "access", getProviderNo(request), "" + restriction.getDemographicNo(), "" ! + restriction.getProgramId())) { clientForm.set("referral", new ClientReferral()); ActionMessages messages = new ActionMessages(); --- 650,654 ---- ClientReferral referral = (ClientReferral) clientForm.get("referral"); ! if (isCancelled(request) || !caseManagementManager.hasAccessRight("Service restriction override on referral", "access", getProviderNo(request), "" + restriction.getDemographicNo(), "" + restriction.getProgramId())) { clientForm.set("referral", new ClientReferral()); ActionMessages messages = new ActionMessages(); *************** *** 636,653 **** try { clientManager.processReferral(referral, true); ! } ! catch (AlreadyAdmittedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.already_admitted")); saveMessages(request, messages); success = false; ! } ! catch (AlreadyQueuedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.already_referred")); saveMessages(request, messages); success = false; ! } ! catch (ServiceRestrictionException e) { throw new RuntimeException("service restriction encountered during override"); } --- 664,678 ---- try { clientManager.processReferral(referral, true); ! } catch (AlreadyAdmittedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.already_admitted")); saveMessages(request, messages); success = false; ! } catch (AlreadyQueuedException e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("refer.already_referred")); saveMessages(request, messages); success = false; ! } catch (ServiceRestrictionException e) { throw new RuntimeException("service restriction encountered during override"); } *************** *** 744,749 **** return edit(mapping, clientForm, request, response); ! } ! else {// check whether client is familyHead or independent client // create roomDemographic from bedDemographic roomDemographic = getRoomDemographicManager().getRoomDemographicByDemographic(demographicNo, facilityId); --- 769,773 ---- return edit(mapping, clientForm, request, response); ! } else {// check whether client is familyHead or independent client // create roomDemographic from bedDemographic roomDemographic = getRoomDemographicManager().getRoomDemographicByDemographic(demographicNo, facilityId); *************** *** 808,813 **** if (isBedSelected) { bedDemographicManager.saveBedDemographic(bedDemographic); ! } ! else { // if only select room without bed, delete previous selected bedId in 'bed_demographic' table getRoomDemographicManager().cleanUpBedTables(roomDemographic); --- 832,836 ---- if (isBedSelected) { bedDemographicManager.saveBedDemographic(bedDemographic); ! } else { // if only select room without bed, delete previous selected bedId in 'bed_demographic' table getRoomDemographicManager().cleanUpBedTables(roomDemographic); *************** *** 820,837 **** if (isBedSelected) { bedDemographicManager.saveBedDemographic(bedDemographic); ! } ! else { // if only select room without bed, delete previous selected bedId in 'bed_demographic' table getRoomDemographicManager().cleanUpBedTables(roomDemographic); } } ! } ! else { if (bedId == null || bedId.intValue() == 0) {// assign room only if (room != null) { roomCapacity = room.getOccupancy().intValue(); } ! } ! else {// roomCapacity = total number of beds assigned to room Bed[] bedAssignedToRoom = bedManager.getBedsByRoom(bedDemographic.getRoomId()); if (bedAssignedToRoom != null && bedAssignedToRoom.length > 0) { --- 843,857 ---- if (isBedSelected) { bedDemographicManager.saveBedDemographic(bedDemographic); ! } else { // if only select room without bed, delete previous selected bedId in 'bed_demographic' table getRoomDemographicManager().cleanUpBedTables(roomDemographic); } } ! } else { if (bedId == null || bedId.intValue() == 0) {// assign room only if (room != null) { roomCapacity = room.getOccupancy().intValue(); } ! } else {// roomCapacity = total number of beds assigned to room Bed[] bedAssignedToRoom = bedManager.getBedsByRoom(bedDemographic.getRoomId()); if (bedAssignedToRoom != null && bedAssignedToRoom.length > 0) { *************** *** 862,867 **** roomOccupancy = rdsByRoom.size() - numberOfFamilyMembersAssignedRoom; } ! } ! else {// assign room/bed combination BedDemographic bd = null; --- 882,886 ---- roomOccupancy = rdsByRoom.size() - numberOfFamilyMembersAssignedRoom; } ! } else {// assign room/bed combination BedDemographic bd = null; *************** *** 887,892 **** dependentsBedIdList.add(bd.getId().getBedId()); numberOfFamilyMembersAssignedRoomBed++; ! } ! else { for (int j = 0; j < dependentIds.length; j++) { if (dependentIds[j].intValue() == bdClientId) { --- 906,910 ---- dependentsBedIdList.add(bd.getId().getBedId()); numberOfFamilyMembersAssignedRoomBed++; ! } else { for (int j = 0; j < dependentIds.length; j++) { if (dependentIds[j].intValue() == bdClientId) { *************** *** 927,932 **** } bedDemographicManager.saveBedDemographic(bedDemographic); ! } ! else { // if only select room without bed, delete previous selected bedId in 'bed_demographic' table getRoomDemographicManager().cleanUpBedTables(roomDemographic); --- 945,949 ---- } bedDemographicManager.saveBedDemographic(bedDemographic); ! } else { // if only select room without bed, delete previous selected bedId in 'bed_demographic' table getRoomDemographicManager().cleanUpBedTables(roomDemographic); *************** *** 962,972 **** bedDemographicManager.saveBedDemographic(bedDemographic); ! } ! else if (!isBedSelected) {// assigning room only for all dependents if (roomDemographic != null) { roomDemographic.setRoomDemographicFromBedDemographic(bedDemographic); ! } ! else { roomDemographic = RoomDemographic.create(clientId, bedDemographic.getProviderNo()); roomDemographic.setRoomDemographicFromBedDemographic(bedDemographic); --- 979,987 ---- bedDemographicManager.saveBedDemographic(bedDemographic); ! } else if (!isBedSelected) {// assigning room only for all dependents if (roomDemographic != null) { roomDemographic.setRoomDemographicFromBedDemographic(bedDemographic); ! } else { roomDemographic = RoomDemographic.create(clientId, bedDemographic.getProviderNo()); roomDemographic.setRoomDemographicFromBedDemographic(bedDemographic); *************** *** 986,991 **** }// end for loop ! } ! else {// if(roomCapacity - roomOccupancy - familySize < 0 ) String occupancy = "0"; String available = "0"; --- 1001,1005 ---- }// end for loop ! } else {// if(roomCapacity - roomOccupancy - familySize < 0 ) String occupancy = "0"; String available = "0"; *************** *** 1001,1006 **** saveMessages(request, messages); ! } ! else { if (rdsByRoom != null) { occupancy = String.valueOf(rdsByRoom.size()); --- 1015,1019 ---- saveMessages(request, messages); ! } else { if (rdsByRoom != null) { occupancy = String.valueOf(rdsByRoom.size()); *************** *** 1018,1023 **** }// end of if(roomId != 0) -> (i.e.) assigning instead of unassigning ! } ! else { // when client is independent -> just assign/unassign either room/bed or room only. getRoomDemographicManager().saveRoomDemographic(roomDemographic); --- 1031,1035 ---- }// end of if(roomId != 0) -> (i.e.) assigning instead of unassigning ! } else { // when client is independent -> just assign/unassign either room/bed or room only. getRoomDemographicManager().saveRoomDemographic(roomDemographic); *************** *** 1025,1030 **** if (isBedSelected) { bedDemographicManager.saveBedDemographic(bedDemographic); ! } ! else { // if only select room without bed, delete previous selected bedId in 'bed_demographic' table getRoomDemographicManager().cleanUpBedTables(roomDemographic); --- 1037,1041 ---- if (isBedSelected) { bedDemographicManager.saveBedDemographic(bedDemographic); ! } else { // if only select room without bed, delete previous selected bedId in 'bed_demographic' table getRoomDemographicManager().cleanUpBedTables(roomDemographic); *************** *** 1036,1041 **** if (bedDemographic.getRoomId().intValue() == 0) { messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("bed.reservation.unreserved")); ! } ! else { messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("bed.reservation.success")); } --- 1047,1051 ---- if (bedDemographic.getRoomId().intValue() == 0) { messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("bed.reservation.unreserved")); ! } else { messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("bed.reservation.success")); } *************** *** 1107,1115 **** filterResultsByCriteria(results, criteria); request.setAttribute("remotePrograms", results); ! } ! catch (MalformedURLException e) { logger.error(e); ! } ! catch (WebServiceException e) { logger.error(e); } --- 1117,1123 ---- filterResultsByCriteria(results, criteria); request.setAttribute("remotePrograms", results); ! } catch (MalformedURLException e) { logger.error(e); ! } catch (WebServiceException e) { logger.error(e); } *************** *** 1250,1257 **** * Fix for 2390337 to populate FacilityId with current facility from user's session for receptionists */ ! if(referral.getFacilityId() == null) ! { ! referral.setFacilityId((Integer)request.getSession().getAttribute(SessionConstants.CURRENT_FACILITY_ID)); ! }clientManager.saveClientReferral(referral); } --- 1258,1265 ---- * Fix for 2390337 to populate FacilityId with current facility from user's session for receptionists */ ! if (referral.getFacilityId() == null) { ! referral.setFacilityId((Integer) request.getSession().getAttribute(SessionConstants.CURRENT_FACILITY_ID)); ! } ! clientManager.saveClientReferral(referral); } *************** *** 1259,1266 **** String admissionNotes = "ER Automated admission\nConsent Type: " + consentFormBean.getConsentType() + "\nReason: " + consentFormBean.getConsentReason(); try { ! admissionManager.processAdmission(Integer.valueOf(demographicNo), getProviderNo(request), programManager.getProgram(String.valueOf(program.getProgramId())), ! null, admissionNotes); ! } ! catch (Exception e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("admit.error", e.getMessage())); --- 1267,1272 ---- String admissionNotes = "ER Automated admission\nConsent Type: " + consentFormBean.getConsentType() + "\nReason: " + consentFormBean.getConsentReason(); try { ! admissionManager.processAdmission(Integer.valueOf(demographicNo), getProviderNo(request), programManager.getProgram(String.valueOf(program.getProgramId())), null, admissionNotes); ! } catch (Exception e) { ActionMessages messages = new ActionMessages(); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("admit.error", e.getMessage())); *************** *** 1275,1280 **** if (success) { return mapping.findForward("er-redirect"); ! } ! else { return mapping.findForward("search"); } --- 1281,1285 ---- if (success) { return mapping.findForward("er-redirect"); ! } else { return mapping.findForward("search"); } *************** *** 1376,1390 **** String inProgramType = admission.getProgramType(); if ("service".equalsIgnoreCase(inProgramType)) { ! se.setAttribute("performDischargeService", ! new Boolean(caseManagementManager.hasAccessRight("perform discharges", "access", providerNo, demographicNo, inProgramId))); ! se.setAttribute("performAdmissionService", ! new Boolean(caseManagementManager.hasAccessRight("perform admissions", "access", providerNo, demographicNo, inProgramId))); ! } ! else if ("bed".equalsIgnoreCase(inProgramType)) { se.setAttribute("performDischargeBed", new Boolean(caseManagementManager.hasAccessRight("perform discharges", "access", providerNo, demographicNo, inProgramId))); se.setAttribute("performAdmissionBed", new Boolean(caseManagementManager.hasAccessRight("perform admissions", "access", providerNo, demographicNo, inProgramId))); ! se.setAttribute("performBedAssignments", new Boolean(caseManagementManager.hasAccessRight("perform bed assignments", "access", providerNo, demographicNo, ! inProgramId))); } --- 1381,1391 ---- String inProgramType = admission.getProgramType(); if ("service".equalsIgnoreCase(inProgramType)) { ! se.setAttribute("performDischargeService", new Boolean(caseManagementManager.hasAccessRight("perform discharges", "access", providerNo, demographicNo, inProgramId))); ! se.setAttribute("performAdmissionService", new Boolean(caseManagementManager.hasAccessRight("perform admissions", "access", providerNo, demographicNo, inProgramId))); ! } else if ("bed".equalsIgnoreCase(inProgramType)) { se.setAttribute("performDischargeBed", new Boolean(caseManagementManager.hasAccessRight("perform discharges", "access", providerNo, demographicNo, inProgramId))); se.setAttribute("performAdmissionBed", new Boolean(caseManagementManager.hasAccessRight("perform admissions", "access", providerNo, demographicNo, inProgramId))); ! se.setAttribute("performBedAssignments", new Boolean(caseManagementManager.hasAccessRight("perform bed assignments", "access", providerNo, demographicNo, inProgramId))); } *************** *** 1465,1470 **** if (request.getAttribute("isRefreshRoomDropDown") != null && request.getAttribute("isRefreshRoomDropDown").equals("Y")) { isRefreshRoomDropDown = true; ! } ! else { isRefreshRoomDropDown = false; } --- 1466,1470 ---- if (request.getAttribute("isRefreshRoomDropDown") != null && request.getAttribute("isRefreshRoomDropDown").equals("Y")) { isRefreshRoomDropDown = true; ! } else { isRefreshRoomDropDown = false; } *************** *** 1495,1500 **** reservedBed = null; ! } ! else { reservedBed = bedManager.getBed(bedDemographic.getBedId()); --- 1495,1499 ---- reservedBed = null; ! } else { reservedBed = bedManager.getBed(bedDemographic.getBedId()); *************** *** 1513,1521 **** if ((isRefreshRoomDropDown && roomId != null) || (reservedBed == null && !"0".equals(roomId))) { request.setAttribute("roomId", roomId); ! } ! else if (reservedBed != null) { request.setAttribute("roomId", reservedBed.getRoomId().toString()); ! } ! else { request.setAttribute("roomId", "0"); } --- 1512,1518 ---- if ((isRefreshRoomDropDown && roomId != null) || (reservedBed == null && !"0".equals(roomId))) { request.setAttribute("roomId", roomId); ! } else if (reservedBed != null) { request.setAttribute("roomId", reservedBed.getRoomId().toString()); ! } else { request.setAttribute("roomId", "0"); } *************** *** 1528,1533 **** unreservedBeds = (Bed[]) request.getAttribute("unreservedBeds"); ! } ! else if (reservedBed != null) { // unreservedBeds = bedManager.getBedsByRoomProgram(availableRooms, bedProgramId, false); --- 1525,1529 ---- unreservedBeds = (Bed[]) request.getAttribute("unreservedBeds"); ! } else if (reservedBed != null) { // unreservedBeds = bedManager.getBedsByRoomProgram(availableRooms, bedProgramId, false); *************** *** 1551,1567 **** request.setAttribute("survey_list", surveyManager.getAllForms(facilityId)); request.setAttribute("surveys", surveyManager.getFormsByFacility(demographicNo, facilityId)); ! ! List<IntegratorConsent> consentTemp=integratorConsentDao.findByFacilityAndDemographic(facilityId, Integer.parseInt(demographicNo)); ! ArrayList<HashMap<String,Object>> consents=new ArrayList<HashMap<String,Object>>(); ! for (IntegratorConsent x : consentTemp){ ! HashMap<String,Object> map=new HashMap<String,Object>(); ! map.put("createdDate", DateFormatUtils.ISO_DATE_FORMAT.format(x.getCreatedDate())+" "+DateFormatUtils.ISO_TIME_NO_T_FORMAT.format(x.getCreatedDate())); map.put("formVersion", x.getFormVersion()); ! Provider provider=providerDao.getProvider(x.getProviderNo()); ! map.put("provider",provider.getFormattedName()); ! map.put("consentId",x.getId()); consents.add(map); } ! request.setAttribute("consents", consents); } --- 1547,1563 ---- request.setAttribute("survey_list", surveyManager.getAllForms(facilityId)); request.setAttribute("surveys", surveyManager.getFormsByFacility(demographicNo, facilityId)); ! ! List<IntegratorConsent> consentTemp = integratorConsentDao.findByFacilityAndDemographic(facilityId, Integer.parseInt(demographicNo)); ! ArrayList<HashMap<String, Object>> consents = new ArrayList<HashMap<String, Object>>(); ! for (IntegratorConsent x : consentTemp) { ! HashMap<String, Object> map = new HashMap<String, Object>(); ! map.put("createdDate", DateFormatUtils.ISO_DATE_FORMAT.format(x.getCreatedDate()) + " " + DateFormatUtils.ISO_TIME_NO_T_FORMAT.format(x.getCreatedDate())); map.put("formVersion", x.getFormVersion()); ! Provider provider = providerDao.getProvider(x.getProviderNo()); ! map.put("provider", provider.getFormattedName()); ! map.put("consentId", x.getId()); consents.add(map); } ! request.setAttribute("consents", consents); } *************** *** 1571,1616 **** request.setAttribute("referrals", clientManager.getActiveReferrals(demographicNo, String.valueOf(facilityId))); ! if (caisiIntegratorManager.isIntegratorEnabled(facilityId)) ! { try { ReferralWs referralWs = caisiIntegratorManager.getReferralWs(facilityId); ! ! List<Referral> referrals=referralWs.getReferralsFor(Integer.parseInt(demographicNo)); ! if (referrals!=null) ! { ! ArrayList<ClientReferral> processedReferrals=new ArrayList<ClientReferral>(); ! ! for (Referral remoteReferral : referrals) ! { ! ClientReferral clientReferral=new ClientReferral(); ! ! StringBuilder programName=new StringBuilder(); ! CachedFacility cachedFacility=caisiIntegratorManager.getRemoteFacility(facilityId, remoteReferral.getDestinationIntegratorFacilityId()); programName.append(cachedFacility.getName()); programName.append(" / "); ! ! FacilityIdIntegerCompositePk pk=new FacilityIdIntegerCompositePk(); pk.setIntegratorFacilityId(remoteReferral.getDestinationIntegratorFacilityId()); pk.setCaisiItemId(remoteReferral.getDestinationCaisiProgramId()); ! CachedProgram cachedProgram=caisiIntegratorManager.getRemoteProgram(facilityId, pk); programName.append(cachedProgram.getName()); ! clientReferral.setProgramName(programName.toString()); clientReferral.setReferralDate(remoteReferral.getReferralDate().toGregorianCalendar().getTime()); ! ! Provider tempProvider=providerDao.getProvider(remoteReferral.getSourceCaisiProviderId()); clientReferral.setProviderFirstName(tempProvider.getFirstName()); clientReferral.setProviderLastName(tempProvider.getLastName()); ! clientReferral.setNotes(remoteReferral.getReasonForReferral()); clientReferral.setPresentProblems(remoteReferral.getPresentingProblem()); ! processedReferrals.add(clientReferral); } ! request.setAttribute("remoteReferrals", processedReferrals); } ! } ! catch (Exception e) { logger.error("Unexpected Error.", e); } --- 1567,1608 ---- request.setAttribute("referrals", clientManager.getActiveReferrals(demographicNo, String.valueOf(facilityId))); ! if (caisiIntegratorManager.isIntegratorEnabled(facilityId)) { try { ReferralWs referralWs = caisiIntegratorManager.getReferralWs(facilityId); ! ! List<Referral> referrals = referralWs.getReferralsFor(Integer.parseInt(demographicNo)); ! if (referrals != null) { ! ArrayList<ClientReferral> processedReferrals = new ArrayList<ClientReferral>(); ! ! for (Referral remoteReferral : referrals) { ! ClientReferral clientReferral = new ClientReferral(); ! ! StringBuilder programName = new StringBuilder(); ! CachedFacility cachedFacility = caisiIntegratorManager.getRemoteFacility(facilityId, remoteReferral.getDestinationIntegratorFacilityId()); programName.append(cachedFacility.getName()); programName.append(" / "); ! ! FacilityIdIntegerCompositePk pk = new FacilityIdIntegerCompositePk(); pk.setIntegratorFacilityId(remoteReferral.getDestinationIntegratorFacilityId()); pk.setCaisiItemId(remoteReferral.getDestinationCaisiProgramId()); ! CachedProgram cachedProgram = caisiIntegratorManager.getRemoteProgram(facilityId, pk); programName.append(cachedProgram.getName()); ! clientReferral.setProgramName(programName.toString()); clientReferral.setReferralDate(remoteReferral.getReferralDate().toGregorianCalendar().getTime()); ! ! Provider tempProvider = providerDao.getProvider(remoteReferral.getSourceCaisiProviderId()); clientReferral.setProviderFirstName(tempProvider.getFirstName()); clientReferral.setProviderLastName(tempProvider.getLastName()); ! clientReferral.setNotes(remoteReferral.getReasonForReferral()); clientReferral.setPresentProblems(remoteReferral.getPresentingProblem()); ! processedReferrals.add(clientReferral); } ! request.setAttribute("remoteReferrals", processedReferrals); } ! } catch (Exception e) { logger.error("Unexpected Error.", e); } *************** *** 1664,1673 **** if (clientsJadm != null && clientsJadm.getHeadClientId().longValue() == demoLong) { // they're my head client h.put("jointAdmission", "head"); ! } ! else if (demoJadm != null && clientsJadm != null && clientsJadm.getHeadClientId().longValue() == demoJadm.getHeadClientId().longValue()) { // They depend on the same person i do! h.put("jointAdmission", "dependent"); ! } ! else if (demoJadm != null && demoJadm.getHeadClientId().longValue() == new Long(demographicNo).longValue()) { // They depend on me h.put("jointAdmission", "dependent"); --- 1656,1663 ---- if (clientsJadm != null && clientsJadm.getHeadClientId().longValue() == demoLong) { // they're my head client h.put("jointAdmission", "head"); ! } else if (demoJadm != null && clientsJadm != null && clientsJadm.getHeadClientId().longValue() == demoJadm.getHeadClientId().longValue()) { // They depend on the same person i do! h.put("jointAdmission", "dependent"); ! } else if (demoJadm != null && demoJadm.getHeadClientId().longValue() == new Long(demographicNo).longValue()) { // They depend on me h.put("jointAdmission", "dependent"); *************** *** 1685,1690 **** h.put("dependent", demoJadm.getTypeId()); } ! } ! else if (clientsJadm != null && clientsJadm.getHeadClientId().longValue() == demoLong) { // HEAD PERSON WON'T DEPEND ON ANYONE h.put("dependent", new Long(0)); } --- 1675,1679 ---- h.put("dependent", demoJadm.getTypeId()); } ! } else if (clientsJadm != null && clientsJadm.getHeadClientId().longValue() == demoLong) { // HEAD PERSON WON'T DEPEND ON ANYONE h.put("dependent", new Long(0)); } |