Changeset 3463

Timestamp:

09/06/10 17:16:59 (17 months ago)

Author:

rwagner

Message:

 

File:

• molgenis_projects/col7a1/handwritten/java/service/PatientService.java (modified) (4 diffs)

molgenis_projects/col7a1/handwritten/java/service/PatientService.java

@@ -9 +9 @@
 import jxl.Workbook;
 
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -121 +122 @@
         public int insert(PatientSummaryVO patientSummaryVO) throws Exception
         {
+                if (patientSummaryVO == null)
+                        return 0;
+
                 try
                 {
@@ -126 +130 @@
                         db.beginTx();
 
-                        // If patientSummaryVO.mutation1 is existent, add it and link to patient
-
-                        if (StringUtils.isNotEmpty(patientSummaryVO.getMutation1().getCdna_notation()))
-                        {
-                                this.db.update(patientSummaryVO.getMutation1());
-
-                                List<Mutation> mutations1 = this.db.findByExample(patientSummaryVO.getMutation1());
-                                if (mutations1.size() == 1)
-                                        patientSummaryVO.getPatient().setMutation1(mutations1.get(0));
-                        }
-
-                        // If patientSummaryVO.mutation2 is existent, add it and link to patient
-
-                        if (StringUtils.isNotEmpty(patientSummaryVO.getMutation2().getCdna_notation()))
-                        {
-                                this.db.update(patientSummaryVO.getMutation2());
-
-                                List<Mutation> mutations2 = this.db.findByExample(patientSummaryVO.getMutation2());
-                                if (mutations2.size() == 1)
-                                        patientSummaryVO.getPatient().setMutation2(mutations2.get(0));
-                        }
-
-//                      // Phenotypes are never added via patients, just select
-//                      List<Phenotype> phenotypes = this.db.findByExample(patientSummaryVO.getPhenotype());
-//                      logger.debug(">>> phenotypes==" + phenotypes.size());
-//                      if (phenotypes.size() == 1)
-//                              patientSummaryVO.getPatient().setPhenotype(phenotypes.get(0));
-//                      else
-//                      {
-//                              Phenotype phenotype = new Phenotype();
-//                              phenotype.setName("DEB-u");
-//                              List<Phenotype> phenotypes2 = this.db.findByExample(phenotype);
-//                              patientSummaryVO.getPatient().setPhenotype(phenotypes2.get(0));
-//                      }
-
-//                      // Publications are currently not added via patients, just select
-//                      List<Publication> publications = this.db.findByExample(patientSummaryVO.getPublication());
-//                      if (publications.size() == 1)
-//                              patientSummaryVO.getPatient().setPublication(publications.get(0));
+                        if (patientSummaryVO.getMutation1().getId() != null)
+                                patientSummaryVO.getPatient().setMutation1(patientSummaryVO.getMutation1().getId());
+
+                        if (patientSummaryVO.getMutation2().getId() != null)
+                                patientSummaryVO.getPatient().setMutation2(patientSummaryVO.getMutation2().getId());
+
+                        if (patientSummaryVO.getPhenotype().getId() != null)
+                                patientSummaryVO.getPatient().setPhenotype(patientSummaryVO.getPhenotype().getId());
+
+                        // Insert/update publication and get primary key
+                        this.db.update(patientSummaryVO.getPublication());
+
+                        List<Publication> publications = this.db.findByExample(patientSummaryVO.getPublication());
+                        if (publications.size() == 1)
+                                patientSummaryVO.getPatient().setPublication(publications.get(0));
 
                         // Insert patient and set primary key
@@ -218 +198 @@
 
                 patientSummaryVO.setPhenotype(phenotype);
-                patientSummaryVO.getPatient().setPhenotype(phenotype);
         }