Merge pull request #23 from ncats/archUpdate

updated Search Count
ncats · Jul 10, 2024 · 9d80d4f · 9d80d4f
2 parents b318668 + c6963c0
commit 9d80d4f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 41 deletions.
diff --git a/...e/src/main/java/gov/hhs/gsrs/application/application/models/additional/ClinicalTrial.java b/...e/src/main/java/gov/hhs/gsrs/application/application/models/additional/ClinicalTrial.java
@@ -10,11 +10,13 @@
 
 @Data
 @Entity
-@Table(name="ct_clinical_trial")
+@Table(name="ctrial_us")
+//@Table(name="ct_clinical_trial")
 public class ClinicalTrial extends AbstractGsrsEntity {
 
     @Id
-    @Column(name = "NCTN", length=22)
+   // @Column(name = "NCTN", length=22)
+    @Column(name = "TRIAL_NUMBER", length=22)
     @JsonProperty("nctNumber")
     public String nctn;
 

diff --git a/...igure/src/main/java/gov/hhs/gsrs/application/searchcount/models/SubstanceSearchCount.java b/...igure/src/main/java/gov/hhs/gsrs/application/searchcount/models/SubstanceSearchCount.java
@@ -12,33 +12,15 @@
 @Backup
 @Data
 @Entity
-//@IdClass(SearchCountCompositePrimaryKeyId.class)
 @Table(name="SRSCID_SEARCH_COUNT_MV")
 public class SubstanceSearchCount extends AbstractGsrsEntity {
-    /*
-    @Id
-    public String substanceId;
-
-    @Id
-    public String provenance;
-
-    @Id
-    public String fromTable;
-    */
-
     @Id
     @Column(name="ID")
     public String id;
 
     @Column(name="UUID")
     public String substanceId;
 
-    @Column(name="PROVENANCE")
-    public String provenance;
-
-    @Column(name="FROMTABLE")
-    public String fromTable;
-
     @Column(name="UNII")
     public String unii;
 
@@ -51,33 +33,30 @@ public class SubstanceSearchCount extends AbstractGsrsEntity {
     @Column(name="APPCOUNT")
     public int appCount;
 
+    @Column(name="CENTER")
+    public String center;
+
+    @Column(name="PROVENANCE")
+    public String provenance;
+
+    @Column(name="FROMTABLE")
+    public String fromTable;
+
     @Column(name="PRODCOUNT")
     public int prodCount;
 
-    @Column(name="PRODACTIVECOUNT")
-    public int prodActiveCount;
+    @Column(name="PROD_PROVENANCE")
+    public String prodProvenance;
 
-    @Column(name="PRODINACTIVECOUNT")
-    public int prodInactiveCount;
+    //@Column(name="PROD_INGREDIENT_TYPE")
+    //public String prodIngredientType;
 
     @Column(name="CLINICALCOUNT")
     public int clinicalCount;
 
     @Column(name="CASECOUNT")
     public int adverseEventCount;
 
-    @Column(name="CENTER")
-    public String center;
-
-    @Column(name="PROD_PROVENANCE")
-    public String prodProvenance;
-
-    @Column(name="PROD_FROMTABLE")
-    public String prodFromTable;
-
-    @Column(name="PROD_INGREDIENTTYPE")
-    public String prodIngredientType;
-
     @Transient
     public String appCountConcat;
 

diff --git a/...src/main/java/gov/hhs/gsrs/application/searchcount/services/SearchCountEntityService.java b/...src/main/java/gov/hhs/gsrs/application/searchcount/services/SearchCountEntityService.java
@@ -188,11 +188,11 @@ public SubstanceSearchCount findSearchCountBySubstanceUuid(String substanceUuid)
                 String prodConcat = "";
                 if (searchCount.prodCount > 0) {
                     // PRODUCT COUNT. Add in the List for sorting purpose
-                    if ((searchCount.prodProvenance != null) && searchCount.prodProvenance.equalsIgnoreCase("SPL")) {
-                        prodConcat = searchCount.prodProvenance + " (" + searchCount.prodIngredientType + ") : " + searchCount.prodCount + "<br>";
-                    } else {
-                        prodConcat = searchCount.prodProvenance + ": " + searchCount.prodCount + "<br>";
-                    }
+                    // if ((searchCount.prodProvenance != null) && searchCount.prodProvenance.equalsIgnoreCase("SPL")) {
+                    //    prodConcat = searchCount.prodProvenance + " (" + searchCount.prodIngredientType + ") : " + searchCount.prodCount + "<br>";
+                    // } else {
+                    prodConcat = searchCount.prodProvenance + ": " + searchCount.prodCount + "<br>";
+                    // }
                     prodCountConcatList.add(prodConcat);
                 } else {
                     prodConcat = "0";