Merge 23.7 to 23.11

Author: labkey-teamcity

onprc_ehr/resources/queries/study/ExamVetPE/.qview.xml

@@ -38,6 +38,8 @@
         <column name="p2date"/>
         <column name="p2"/>
         <column name="id/assignedVet/assignedVet"/>
+        <column name="Id/activeFlags/Alert::valueField"/>
+        <column name="Id/MostRecentTB/MonthsSinceLastTB"/>
     </columns>
     <sorts>
         <sort column="Id/curLocation/room"/>

onprc_ehr/resources/queries/study/pregnancyGestation.sql

@@ -26,5 +26,6 @@ INNER JOIN ehr_lookups.species p on (m.Id.DataSet.demographics.species = p.commo
 And m.date in (select max(s.date) AS d from study.pregnancyConfirmation s where s.id = m.id)
 And m.Id.DataSet.demographics.calculated_status.code = 'Alive'
 And p.Gestation is not null
-And m.outcome.birthDate is null
+And m.outcome.birthDate is null And (Select count(*) from ehr.snomed_tags stg where stg.code.code = 'F-30980' And stg.id = m.id
+                                      And stg.date >= m.date ) = 0
 And m.gestation_days is not null

onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PathologyTissuesFormType.java

@@ -94,14 +94,6 @@ public PathologyTissuesFormType(DataEntryFormContext ctx, Module owner)
         addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/form/field/PathologyTissuesField.js"));
     }
 
-    @Override
-    protected List<String> getMoreActionButtonConfigs()
-    {
-        List<String> ret = super.getMoreActionButtonConfigs();
-        ret.add("ENTERDEATH_FOR_TISSUES");
-
-        return ret;
-    }
 
     @Override
     protected boolean canInsert()