[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web BaseCli
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 BaseClientAction.java, 1.1.2.11, 1.1.2.12 QuatroClientAdmissionAction.java, 1.1.2.44, 1.1.2.45
|
From: Lilian Li <lli...@us...> - 2008-06-30 19:33:55
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4912/src/org/oscarehr/PMmodule/web Modified Files: Tag: QUATRO_TORONTO_RFQ_20080408B BaseClientAction.java QuatroClientAdmissionAction.java Log Message: Index: QuatroClientAdmissionAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/Attic/QuatroClientAdmissionAction.java,v retrieving revision 1.1.2.44 retrieving revision 1.1.2.45 diff -C2 -d -r1.1.2.44 -r1.1.2.45 *** QuatroClientAdmissionAction.java 30 Jun 2008 15:48:52 -0000 1.1.2.44 --- QuatroClientAdmissionAction.java 30 Jun 2008 19:34:01 -0000 1.1.2.45 *************** *** 263,268 **** public ActionForward update(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { QuatroClientAdmissionForm clientForm = (QuatroClientAdmissionForm) form; - HashMap actionParam = new HashMap(); Integer shelterId=(Integer)request.getSession().getAttribute(KeyConstants.SESSION_KEY_SHELTERID); --- 263,268 ---- public ActionForward update(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { QuatroClientAdmissionForm clientForm = (QuatroClientAdmissionForm) form; + // super.setScreenMode(request, KeyConstants.TAB_CLIENT_ADMISSION); Integer shelterId=(Integer)request.getSession().getAttribute(KeyConstants.SESSION_KEY_SHELTERID); *************** *** 284,290 **** String clientId=admission.getClientId().toString(); Integer programId = admission.getProgramId(); actionParam.put("clientId", admission.getClientId()); actionParam.put("intakeId", admission.getIntakeId()); ! request.setAttribute("clientId", clientId); request.setAttribute("client", clientManager.getClientByDemographicNo(clientId)); request.setAttribute("actionParam", actionParam); --- 284,295 ---- String clientId=admission.getClientId().toString(); Integer programId = admission.getProgramId(); + HashMap actionParam = (HashMap) request.getAttribute("actionParam"); + if(actionParam==null){ + actionParam = new HashMap(); + } actionParam.put("clientId", admission.getClientId()); actionParam.put("intakeId", admission.getIntakeId()); ! request.setAttribute("actionParam", actionParam); ! request.setAttribute("clientId", clientId); request.setAttribute("client", clientManager.getClientByDemographicNo(clientId)); request.setAttribute("actionParam", actionParam); *************** *** 400,410 **** return sec.GetAccess(KeyConstants.FUN_PMM_CLIENTADMISSION, programId).equals(KeyConstants.ACCESS_ALL); } ! public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { ! ActionMessages messages = new ActionMessages(); super.setScreenMode(request, KeyConstants.TAB_CLIENT_ADMISSION); boolean isError = false; boolean isWarning = false; QuatroClientAdmissionForm clientForm = (QuatroClientAdmissionForm) form; ! Admission admission = clientForm.getAdmission(); Integer clientId = admission.getClientId(); --- 405,446 ---- return sec.GetAccess(KeyConstants.FUN_PMM_CLIENTADMISSION, programId).equals(KeyConstants.ACCESS_ALL); } ! private boolean validateConflict(HttpServletRequest request, Program program,Demographic client,ActionMessages messages){ ! boolean valid = true; ! // ActionMessages messages = new ActionMessages(); ! if(clientRestrictionManager.checkGenderConflict(program, client)){ ! messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.intake.gender_conflict", request.getContextPath())); ! valid = false; ! saveMessages(request,messages); ! } ! if(clientRestrictionManager.checkAgeConflict(program, client)){ ! messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.intake.age_conflict", request.getContextPath())); ! valid = false; ! saveMessages(request,messages); ! } ! StringBuffer sb = new StringBuffer(); ! //service restriction check ! ProgramClientRestriction restrInPlace = clientRestrictionManager.checkClientRestriction( ! program.getId(), client.getDemographicNo(), new Date()); ! if(restrInPlace != null) { ! sb.append(client.getLastName() + ", " + client.getFirstName() + "<br>"); ! messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.intake.admission.family_service_restriction", ! request.getContextPath(), program.getName(), sb.toString())); ! valid = false; ! saveMessages(request,messages); ! } ! return !valid; ! } ! public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { super.setScreenMode(request, KeyConstants.TAB_CLIENT_ADMISSION); + HashMap actionParam = (HashMap) request.getAttribute("actionParam"); + if(actionParam==null){ + actionParam = new HashMap(); + actionParam.put("clientId", request.getParameter("clientId")); + } + request.setAttribute("actionParam", actionParam); boolean isError = false; boolean isWarning = false; QuatroClientAdmissionForm clientForm = (QuatroClientAdmissionForm) form; ! ActionMessages messages = new ActionMessages(); Admission admission = clientForm.getAdmission(); Integer clientId = admission.getClientId(); *************** *** 415,419 **** Demographic client= clientManager.getClientByDemographicNo(clientId.toString()); request.setAttribute("client", client); ! //don't check these if intake admitted. if(admissionId.intValue()==0){ --- 451,456 ---- Demographic client= clientManager.getClientByDemographicNo(clientId.toString()); request.setAttribute("client", client); ! String overrideYN =request.getParameter(KeyConstants.CONFIRMATION_CHECKBOX_NAME); ! boolean canOverride=false; //don't check these if intake admitted. if(admissionId.intValue()==0){ *************** *** 421,425 **** Program program = programManager.getProgram(programId); ! StringBuffer sb = new StringBuffer(); List lstFamily = intakeManager.getClientFamilyByIntakeId(admission.getIntakeId().toString()); for(int i=0;i<lstFamily.size();i++){ --- 458,462 ---- Program program = programManager.getProgram(programId); ! List lstFamily = intakeManager.getClientFamilyByIntakeId(admission.getIntakeId().toString()); for(int i=0;i<lstFamily.size();i++){ *************** *** 428,455 **** //check gender conflict and age conflict Demographic client2= clientManager.getClientByDemographicNo(qif.getClientId().toString()); ! if(clientRestrictionManager.checkGenderConflict(program, client2)){ ! messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.intake.gender_conflict", request.getContextPath())); ! isError = true; ! saveMessages(request,messages); ! return update(mapping, form, request, response); } - if(clientRestrictionManager.checkAgeConflict(program, client2)){ - messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.intake.age_conflict", request.getContextPath())); - isError = true; - saveMessages(request,messages); - return update(mapping, form, request, response); - } - - //service restriction check - ProgramClientRestriction restrInPlace = clientRestrictionManager.checkClientRestriction( - admission.getProgramId(), qif.getClientId(), new Date()); - if(restrInPlace != null) { - sb.append(qif.getLastName() + ", " + qif.getFirstName() + "<br>"); - messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.intake.admission.family_service_restriction", - request.getContextPath(), program.getName(), sb.toString())); - isError = true; - saveMessages(request,messages); - return update(mapping, form, request, response); - } } --- 465,480 ---- //check gender conflict and age conflict Demographic client2= clientManager.getClientByDemographicNo(qif.getClientId().toString()); ! isWarning = validateConflict(request, program, client2,messages); ! canOverride=canOverwrite(request, program.getId().toString()); ! if(isWarning){ ! if (!canOverride) return update(mapping, form, request, response); ! else{ ! if(!"Y".equals(overrideYN)){ ! messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("warning.admission.overwrite_conflict", request.getContextPath())); ! saveMessages(request,messages); ! return update(mapping, form, request, response); ! } ! } } } *************** *** 472,501 **** //check gender conflict and age conflict Program program = programManager.getProgram(programId); ! if(clientRestrictionManager.checkGenderConflict(program, client)){ ! messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.intake.gender_conflict", request.getContextPath())); ! isError = true; ! saveMessages(request,messages); ! return update(mapping, form, request, response); ! } ! if(clientRestrictionManager.checkAgeConflict(program, client)){ ! messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.intake.age_conflict", request.getContextPath())); ! isError = true; ! saveMessages(request,messages); ! return update(mapping, form, request, response); ! } ! ! //service restriction check ! ProgramClientRestriction restrInPlace = clientRestrictionManager.checkClientRestriction( ! programId, clientId, new Date()); ! if (restrInPlace != null) { ! // Program program = programManager.getProgram(programId); ! messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.intake.admission.service_restriction", ! request.getContextPath(), program.getName())); ! isError = true; ! saveMessages(request,messages); ! return update(mapping, form, request, response); ! } ! ! //check client active in other program List lst=admissionManager.getCurrentAdmissions(clientId,KeyConstants.SYSTEM_USER_PROVIDER_NO,null); for(int i=0;i<lst.size();i++){ --- 497,515 ---- //check gender conflict and age conflict Program program = programManager.getProgram(programId); ! isWarning = validateConflict(request, program, client,messages); ! canOverride=canOverwrite(request, program.getId().toString()); ! ! if(isWarning){ ! if (!canOverride) return update(mapping, form, request, response); ! else{ ! if(!"Y".equals(overrideYN)){ ! messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("warning.admission.overwrite_conflict", request.getContextPath())); ! saveMessages(request,messages); ! return update(mapping, form, request, response); ! } ! } ! } ! ! //check client active in other program List lst=admissionManager.getCurrentAdmissions(clientId,KeyConstants.SYSTEM_USER_PROVIDER_NO,null); for(int i=0;i<lst.size();i++){ Index: BaseClientAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/Attic/BaseClientAction.java,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** BaseClientAction.java 25 Jun 2008 18:38:55 -0000 1.1.2.11 --- BaseClientAction.java 30 Jun 2008 19:34:01 -0000 1.1.2.12 *************** *** 25,28 **** --- 25,29 ---- import javax.servlet.http.HttpServletRequest; + import org.oscarehr.PMmodule.model.Demographic; import org.oscarehr.PMmodule.service.AdmissionManager; import org.oscarehr.PMmodule.service.ClientManager; *************** *** 43,47 **** String orgCd=this.getProgramIdByClient(request); String clientId =request.getParameter("clientId"); ! if(Utility.IsEmpty(clientId)) clientId=(String)request.getSession(true).getAttribute("casemgmt_DemoNo"); if(Utility.IsEmpty(clientId)||"0".equals(clientId)){ request.setAttribute(KeyConstants.TAB_CLIENT_SUMMARY, KeyConstants.ACCESS_NULL); --- 44,52 ---- String orgCd=this.getProgramIdByClient(request); String clientId =request.getParameter("clientId"); ! // Demographic client =(Demographic)request.getAttribute("client"); ! if(Utility.IsEmpty(clientId)){ ! if(null!=request.getParameter("clientId")) clientId=request.getAttribute("clientId").toString(); ! else clientId=(String)request.getSession(true).getAttribute("casemgmt_DemoNo"); ! } if(Utility.IsEmpty(clientId)||"0".equals(clientId)){ request.setAttribute(KeyConstants.TAB_CLIENT_SUMMARY, KeyConstants.ACCESS_NULL); *************** *** 142,146 **** private String getProgramIdByClient(HttpServletRequest request){ String cId =request.getParameter("clientId"); ! if(Utility.IsEmpty(cId)) cId=(String)request.getSession(true).getAttribute("casemgmt_DemoNo"); String providerNo=(String) request.getSession().getAttribute(KeyConstants.SESSION_KEY_PROVIDERNO); String programId=""; --- 147,155 ---- private String getProgramIdByClient(HttpServletRequest request){ String cId =request.getParameter("clientId"); ! //Demographic client =(Demographic)request.getAttribute("client"); ! if(Utility.IsEmpty(cId)){ ! if(null !=request.getAttribute("clientId"))cId=request.getAttribute("clientId").toString(); ! else cId=(String)request.getSession(true).getAttribute("casemgmt_DemoNo"); ! } String providerNo=(String) request.getSession().getAttribute(KeyConstants.SESSION_KEY_PROVIDERNO); String programId=""; |