OpenMRS

Timestamp:

08/30/08 23:59:53 (3 months ago)

Author:

rmalla

Message:

mrngen: rmalla : Modified to add check digit only if a validator exists.

Files:

• openmrs-modules/mrngen/metadata/config.xml (modified) (1 diff)
• openmrs-modules/mrngen/src/org/openmrs/module/mrngen/MRNGenUtil.java (modified) (1 diff)
• openmrs-modules/mrngen/src/org/openmrs/module/mrngen/advice/PatientServiceAroundAdvisor.java (modified) (6 diffs)
• openmrs-modules/mrngen/src/org/openmrs/module/mrngen/db/hibernate/HibernateMRNSequenceDAO.java (modified) (4 diffs)
• openmrs-modules/mrngen/web/src/org/openmrs/module/mrngen/web/MRNGenFormController.java (modified) (4 diffs)

openmrs-modules/mrngen/metadata/config.xml

@@ -7 +7 @@
-        <id>mrngen</id>
-        <name>MRN Generator Module</name>
-0
+1
-        <package>org.openmrs.module.@MODULE_ID@</package>
-        <author>Ratnakar Malla</author>

openmrs-modules/mrngen/src/org/openmrs/module/mrngen/MRNGenUtil.java

@@ -63 +63 @@
-        }
-        
+                
-}

openmrs-modules/mrngen/src/org/openmrs/module/mrngen/advice/PatientServiceAroundAdvisor.java

@@ -10 +10 @@
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
+
-import org.openmrs.module.mrngen.MRNGenUtil;
-import org.openmrs.module.mrngen.MRNSequenceResponse;
-import org.openmrs.util.OpenmrsUtil;
-import org.springframework.aop.Advisor;
-import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
-
+
+
+
-
-/**
@@ -24 +24 @@
- * @author Ratnakar Malla
- * @vesrion 1.0
+ * 08/30/2008: rmalla : Modified to add check digit only if a validator exists.
- */
-public class PatientServiceAroundAdvisor extends StaticMethodMatcherPointcutAdvisor implements Advisor {
@@ -53 +54 @@
-                        Object[] obj = invocation.getArguments();
-                        org.openmrs.Patient patient= (org.openmrs.Patient)obj[0];
-                        System.out.println("** PatientServiceAroundAdvice patient==null " + (patient==null));
-                        Set<PatientIdentifier> piSet = patient.getIdentifiers();
-                        System.out.println("** PatientServiceAroundAdvice piSet==null " + (piSet==null));
-                        Iterator<PatientIdentifier> piSetIterator = piSet.iterator();
-                        while(piSetIterator.hasNext())
-                        {
-                                PatientIdentifier pi = piSetIterator.next();
-                                System.out.println("** PatientServiceAroundAdvice pi.getIdentifier() " + (pi.getIdentifier()==null));
-                                if (pi.getIdentifier().contains("TEMPID_WILL_BE_REPLACED"))
-                                {
@@ -66 +64 @@
-                                        MRNSequenceResponse mrsr = new MRNGenUtil().generateIDs(1,""+pi.getIdentifierType().getPatientIdentifierTypeId()).get(0);
-                                        String line= mrsr.getPrefix() + mrsr.getLval();
-
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                        }
@@ -74 +82 @@
-                        try
-                        {
-                                System.out.println("** invocation=null " + (invocation==null)); 
-                                o =invocation.proceed();
-                                System.out.println("** invocation=null End " );
-                        }catch (Exception e)
-                        {
@@ -89 +95 @@
-        }
-        
-
-
+
-}

openmrs-modules/mrngen/src/org/openmrs/module/mrngen/db/hibernate/HibernateMRNSequenceDAO.java

@@ -10 +10 @@
-import org.hibernate.SessionFactory;
-import org.openmrs.DataEntryStatistic;
+import org.openmrs.PatientIdentifierType;
-import org.openmrs.api.db.DAOException;
-import org.openmrs.module.mrngen.MRNSequenceResponse;
-import org.openmrs.module.mrngen.MRNSequenceResponseDerived;
-import org.openmrs.module.mrngen.db.MRNSequenceDAO;
+
+/**
+ * 
+ * 
+ * @author Ratnakar Malla
+ * Hibernate DAO object for MRNSequence Response 
+ * @version 1.0
+ * 08/30/2008: rmalla : Modified to include PatientIdentifierType when getResponses is called.
+ */
-
-public class HibernateMRNSequenceDAO implements MRNSequenceDAO {
@@ -72 +82 @@
-        {
-                
-
+
+
+
-                Query q = sessionFactory.getCurrentSession().createQuery(hql);
-                q.setInteger("patientIdentifierTypeId", Integer.parseInt(patientIdentifierTypeId));
@@ -107 +119 @@
-                        s.setPatientIdentifierTypeId(pidTypeId);
-                        String setupComplete=null;
-0
+4
-                        {
-                                setupComplete = (String)holder[4];
@@ -113 +125 @@
-                        s.setSetupcomplete(setupComplete);
-                        
+                        PatientIdentifierType pitype = null;
+                        if (holder[5]!=null)
+                        {
+                                s.setPatientIdentifierType((PatientIdentifierType)holder[5]);
+                        }
+                                                
-                        derivedList.add(s);
-                }

openmrs-modules/mrngen/web/src/org/openmrs/module/mrngen/web/MRNGenFormController.java

@@ -27 +27 @@
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.SimpleFormController;
+import org.openmrs.patient.IdentifierValidator;
-
-/**
@@ -34 +35 @@
- * Spring Form for Bulk MRN Generator 
- * @version 1.0
+ * 08/30/2008: rmalla : Modified to add check digit only if a validator exists.
- */
-
@@ -79 +81 @@
-                        HttpServletResponse response, Object obj, BindException errors)
-                        throws Exception {
-                        
-                        log.error("Inside onSubmit MRNGenFormController0");
-                
- 
+
-                        String first = request.getParameter("mrn_first");
-                        String count = request.getParameter("mrn_count");
@@ -150 +150 @@
-                                
-                                String line = mrsrList.get(i).getPrefix() + mrsrList.get(i).getLval();
-
-
-
+
+
+
+
+
+
+
-                                }
-                                catch (Exception e) {
-                                        throw new ServletException(e);
-                                }
-                                line = line + "-" + checkdigit;  
-                                
-                                response.getOutputStream().println(line);