feat: implement patient demographic merge and unmerge

database/mysql/oscarinit.sql

@@ -8247,16 +8247,16 @@ CREATE TABLE IF NOT EXISTS IssueGroupIssues (issueGroupId int not null, issue_id
 --
 -- Table structure for table `demographic_merged`
 --
-CREATE TABLE IF NOT EXISTS demographic_merged(
-    id INT(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    demographic_no INT(10) NOT NULL,
-    merged_to INT(10) NOT NULL,
-    deleted INT(1) NOT NULL DEFAULT 0,
-    `lastUpdateUser` varchar(6) default NULL,
-    `lastUpdateDate` date default NULL,
-    INDEX `dem_merged` (demographic_no, merged_to, deleted),
-    INDEX `dem_merged_dem` (demographic_no, deleted),
-    INDEX `dem_merged_merge` (merged_to, deleted)
+CREATE TABLE IF NOT EXISTS demographic_merged (
+  id INT(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  primary_demographic_no INT(10) NULL DEFAULT NULL,
+  secondary_demographic_no VARCHAR(500) NULL DEFAULT NULL,
+  merged_demographic_no INT(10) NULL DEFAULT NULL,
+  event_type VARCHAR(20) NULL DEFAULT NULL,
+  provider_no VARCHAR(6) NULL DEFAULT NULL,
+  event_date DATETIME NULL DEFAULT NULL,
+  INDEX idx_dm_merged_demo_no (merged_demographic_no),
+  INDEX idx_dm_event_type (event_type)
 );
 
 --

database/mysql/oscarinit_2025.sql

@@ -772,15 +772,25 @@ ALTER TABLE `demographicArchive`
 MODIFY COLUMN `myOscarUserName` VARCHAR(255);
 
 --
--- Alter table structure for table `demographic_merged`, added constraints
+-- Create demographic_merged_event for the new merge/unmerge audit event model.
+-- The legacy demographic_merged table is left untouched so that a rollback to the
+-- old merge code continues to work without any schema remediation.
 --
 
-ALTER TABLE `demographic_merged`
-ADD CONSTRAINT `FKqev6qw9c8jc2f3w40p524h5xd` 
-FOREIGN KEY (`merged_to`) REFERENCES `demographic` (`demographic_no`);
+CREATE TABLE IF NOT EXISTS `demographic_merged_event` (
+  `id` INT(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `primary_demographic_no` INT(10) NULL DEFAULT NULL,
+  `secondary_demographic_no` VARCHAR(500) NULL DEFAULT NULL,
+  `merged_demographic_no` INT(10) NULL DEFAULT NULL,
+  `event_type` VARCHAR(20) NULL DEFAULT NULL,
+  `provider_no` VARCHAR(6) NULL DEFAULT NULL,
+  `event_date` DATETIME NULL DEFAULT NULL,
+  INDEX `idx_dme_merged_demo_no` (`merged_demographic_no`),
+  INDEX `idx_dme_event_type` (`event_type`)
+);
 
 --
--- Alter table structure for table `demographic_merged`, modified column sequence
+-- Alter table structure for table `fax_config`
 --
 
 ALTER TABLE `fax_config`

database/mysql/updates/update-2026-04-10-demographic-merged-extend.sql

@@ -0,0 +1,14 @@
+-- Create a new table demographic_merged_event to record merge/unmerge audit events.
+-- The existing demographic_merged table is left untouched so that a rollback to the
+-- old merge code continues to work without any schema remediation.
+CREATE TABLE IF NOT EXISTS demographic_merged_event (
+  id INT(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  primary_demographic_no INT(10) NULL DEFAULT NULL,
+  secondary_demographic_no VARCHAR(500) NULL DEFAULT NULL,
+  merged_demographic_no INT(10) NULL DEFAULT NULL,
+  event_type VARCHAR(20) NULL DEFAULT NULL,
+  provider_no VARCHAR(6) NULL DEFAULT NULL,
+  event_date DATETIME NULL DEFAULT NULL,
+  INDEX idx_dme_merged_demo_no (merged_demographic_no),
+  INDEX idx_dme_event_type (event_type)
+);

src/main/java/ca/openosp/openo/billing/CA/ON/model/BillingONCHeader2.java

@@ -141,6 +141,10 @@ public Integer getId() {
         return id;
     }
 
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
     public Integer getCh1Id() {
         return ch1Id;
     }

src/main/java/ca/openosp/openo/commn/DemographicSearchResultTransformer.java

@@ -31,17 +31,11 @@
 
 import org.apache.tools.ant.util.DateUtils;
 import org.hibernate.transform.ResultTransformer;
-import ca.openosp.openo.commn.dao.DemographicDao;
-import ca.openosp.openo.commn.model.Demographic;
 import ca.openosp.openo.webserv.rest.to.model.DemographicSearchResult;
 
-import ca.openosp.openo.demographic.data.DemographicMerged;
-
 public class DemographicSearchResultTransformer implements ResultTransformer {
 
-    private DemographicDao demographicDao;
     private SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.ISO8601_DATE_PATTERN);
-    private DemographicMerged dm = new DemographicMerged();
 
     public DemographicSearchResultTransformer() {
     }
@@ -64,33 +58,6 @@ public Object transformTuple(Object[] tuple, String[] aliases) {
         String providerLastName = (String) tuple[12];
         String providerFirstName = (String) tuple[13];
         String hin = (String) tuple[14];
-        Integer mergedTo = (Integer) tuple[15];
-
-        //more about this @ SF Bug #3575
-        if (mergedTo != null) {
-            //find and replace with the HEAD record info
-            Integer headDemographicNo = dm.getHead(demographicNo);
-            Demographic d = demographicDao.getDemographicById(headDemographicNo);
-
-            if (d != null) {
-                demographicNo = d.getDemographicNo();
-                lastName = d.getLastName();
-                firstName = d.getFirstName();
-                chartNo = d.getChartNo();
-                sex = d.getSex();
-                providerNo = d.getProviderNo();
-                rosterStatus = d.getRosterStatus();
-                patientStatus = d.getPatientStatus();
-                phone = d.getPhone();
-                year = d.getYearOfBirth();
-                month = d.getMonthOfBirth();
-                day = d.getDateOfBirth();
-                hin = d.getHin();
-                providerLastName = (d.getProvider() != null) ? d.getProvider().getLastName() : "";
-                providerFirstName = (d.getProvider() != null) ? d.getProvider().getFirstName() : "";
-                mergedTo = null;
-            }
-        }
 
         Date dob = null;
         try {
@@ -112,13 +79,4 @@ public List transformList(List collection) {
         return collection;
     }
 
-    public DemographicDao getDemographicDao() {
-        return demographicDao;
-    }
-
-    public void setDemographicDao(DemographicDao demographicDao) {
-        this.demographicDao = demographicDao;
-    }
-
-
 }

src/main/java/ca/openosp/openo/commn/dao/DemographicDao.java

@@ -34,8 +34,6 @@
  */
 public interface DemographicDao {
 
-    public List<Integer> getMergedDemographics(Integer demographicNo);
-
     public Demographic getDemographic(String demographic_no);
 
     public List getDemographics();
@@ -282,6 +280,59 @@ public List<Demographic> searchDemographicByExtKeyAndValueLikeAndStatus(Demograp
     public List<Demographic> searchMergedDemographicByAddress(String addressStr, int limit, int offset,
                                                               String providerNo, boolean outOfDomain);
 
+    /**
+     * Finds active merged demographics (C records created by the merge engine) whose
+     * last name matches the given search string. Only records that appear in
+     * {@code demographic_merged_event} with {@code event_type = 'MERGE'} and have
+     * {@code patient_status = 'AC'} are returned.
+     *
+     * @param searchStr String last name prefix, or "last,first" for combined search
+     * @param limit     int maximum number of results to return
+     * @param offset    int pagination offset
+     * @return List&lt;Demographic&gt; matched active merged demographics
+     */
+    public List<Demographic> findActiveMergedDemographicByName(String searchStr, int limit, int offset);
+
+    /**
+     * Finds active merged demographics (C records) by date of birth.
+     *
+     * @param dobStr String date of birth in yyyy-MM-dd format
+     * @param limit  int maximum number of results
+     * @param offset int pagination offset
+     * @return List&lt;Demographic&gt; matched active merged demographics
+     */
+    public List<Demographic> findActiveMergedDemographicByDOB(String dobStr, int limit, int offset);
+
+    /**
+     * Finds active merged demographics (C records) by phone number.
+     *
+     * @param phoneStr String phone number substring to match
+     * @param limit    int maximum number of results
+     * @param offset   int pagination offset
+     * @return List&lt;Demographic&gt; matched active merged demographics
+     */
+    public List<Demographic> findActiveMergedDemographicByPhone(String phoneStr, int limit, int offset);
+
+    /**
+     * Finds active merged demographics (C records) by health insurance number.
+     *
+     * @param hinStr String HIN prefix to match
+     * @param limit  int maximum number of results
+     * @param offset int pagination offset
+     * @return List&lt;Demographic&gt; matched active merged demographics
+     */
+    public List<Demographic> findActiveMergedDemographicByHIN(String hinStr, int limit, int offset);
+
+    /**
+     * Finds active merged demographics (C records) by address.
+     *
+     * @param addressStr String address prefix to match
+     * @param limit      int maximum number of results
+     * @param offset     int pagination offset
+     * @return List&lt;Demographic&gt; matched active merged demographics
+     */
+    public List<Demographic> findActiveMergedDemographicByAddress(String addressStr, int limit, int offset);
+
     public List<Demographic> findDemographicByChartNo(String chartNoStr, int limit, int offset, String providerNo,
                                                       boolean outOfDomain);