diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js
index 61bbf3f28..d16229629 100644
--- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js
+++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js
@@ -35,6 +35,18 @@ EHR.model.DataModelManager.registerMetadata('onprc_Surgery', {
                 shownInGrid: true,
                 defaultValue: 'Surgical',
                 allowBlank: false
+            },
+            date: {
+                inheritDefaultDateFromParent: false,
+                getInitialValue: function(v, rec){
+                    if (v)
+                        return v;
+
+                    var ret = Ext4.Date.clearTime(new Date());
+                    ret = Ext4.Date.add(ret, Ext4.Date.DAY, 1);
+                    ret.setHours(8);
+                    return ret;
+                }
             }
 
         },
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/EncounterChildFormSection.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/EncounterChildFormSection.java
index 66b37ae97..300daf3e3 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/EncounterChildFormSection.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/EncounterChildFormSection.java
@@ -44,7 +44,6 @@ public EncounterChildFormSection(String schemaName, String queryName, String lab
 //        Modified: 2-13-2025  R. Blasa
         addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/window/AddProcedureDefaultsWindow.js"));
 
-        addConfigSource("Encounter");
         addConfigSource("EncounterChild");
 
         setTemplateMode(TEMPLATE_MODE.ENCOUNTER);
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/SingleSurgeryFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/SingleSurgeryFormType.java
index 1bf0c75fa..fad3ed827 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/SingleSurgeryFormType.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/SingleSurgeryFormType.java
@@ -73,16 +73,8 @@ public SingleSurgeryFormType(DataEntryFormContext ctx, Module owner)
 
         for (FormSection s : this.getFormSections())
         {
-            s.addConfigSource("Encounter");
-
             //   Modified: 4-20-2021  R. Blasa
             s.addConfigSource("onprc_Surgery");
-
-            //Added: 9-6-2017  R.Blasa
-            s.addConfigSource("Surgery_Blood");
-
-            //Added: 10-13-2017  R.Blasa
-            s.addConfigSource("Biopsy_Staff");
         }
     }
 
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/table/ONPRC_EHRCustomizer.java b/onprc_ehr/src/org/labkey/onprc_ehr/table/ONPRC_EHRCustomizer.java
index 717db38f7..0253307c1 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/table/ONPRC_EHRCustomizer.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/table/ONPRC_EHRCustomizer.java
@@ -1111,7 +1111,7 @@ private void customizeTreatmentFrequency(AbstractTableInfo ti)
         ColumnInfo existing = ti.getColumn(name);
         if (null == existing && null != ti.getColumn("meaning"))
         {
-            SQLFragment sql = new SQLFragment("(SELECT " + ti.getSqlDialect().getGroupConcat(new SQLFragment("REPLICATE('0', 4 - LEN(t.hourofday))  + cast(t.hourofday as varchar(4))"), true, true, "','").getSqlCharSequence() +
+            SQLFragment sql = new SQLFragment("(SELECT " + ti.getSqlDialect().getGroupConcat(new SQLFragment("REPLICATE('0', 4 - LEN(t.hourofday))  + cast(t.hourofday as varchar(4))"), true, true, ",").getSqlCharSequence() +
                     "FROM ehr_lookups.treatment_frequency_times t " +
                     " WHERE t.frequency = " + ExprColumn.STR_TABLE_ALIAS + ".meaning " +
                     " GROUP BY t.frequency " +
diff --git a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java
index 5dcbd3b73..2ebd9f64e 100644
--- a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java
+++ b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java
@@ -61,6 +61,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1550,6 +1551,8 @@ public void testPathology()
     @Test
     public void testSurgeryForm()
     {
+        LocalDateTime tomorrow = LocalDateTime.now().plusDays(1);
+
         _helper.goToTaskForm("Surgeries");
 
         Ext4GridRef proceduresGrid = _helper.getExt4GridForFormSection("Procedures");
@@ -1689,6 +1692,17 @@ public void testSurgeryForm()
         waitForElementToDisappear(caseWindow);
         waitForElement(Ext4Helper.Locators.window("Success").append(Locator.tagWithText("div", "Surgical cases opened")));
         waitAndClick(Ext4Helper.Locators.window("Success").append(Ext4Helper.Locators.ext4ButtonEnabled("OK")));
+
+        _ext4Helper.clickExt4Tab("Medication/Treatment Orders");
+        treatmentGrid = _helper.getExt4GridForFormSection("Medication/Treatment Orders");
+        treatmentGrid.clickTbarButton("Add Record");
+        treatmentGrid.completeEdit();
+
+        Assert.assertEquals(tomorrow.withHour(8).withMinute(0).withSecond(0).withNano(0),
+                treatmentGrid.getDateFieldValue(3, "date").toInstant()
+                .atZone(ZoneId.systemDefault())
+                .toLocalDateTime());
+
         _helper.discardForm();
     }