Fix treatment order updates (#1482)

* Remove ParticipantSequenceNum
* Check for null return and errors

Author: labkey-martyp

onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java

@@ -368,6 +368,7 @@ public Date createUpdatedTreatmentRow(Map<String, Object> row, Map<String, Objec
         Map<String, Object> toCreate = new CaseInsensitiveHashMap<>();
         toCreate.putAll(oldRow);
         toCreate.remove("lsid");
+        toCreate.remove("ParticipantSequenceNum");
 
         String originalObjectId = (String) toCreate.get("objectid");
         assert originalObjectId != null;
@@ -385,14 +386,19 @@ public Date createUpdatedTreatmentRow(Map<String, Object> row, Map<String, Objec
         List<Map<String, Object>> createdRows = treatmentOrders.getUpdateService().insertRows(getUser(), getContainer(), Arrays.asList(toCreate), errors, null, getExtraContext());
 
         //also update records in drugs table
-        if (!createdRows.isEmpty())
+        if (createdRows != null && !createdRows.isEmpty())
         {
             TableInfo drugAdministration = getRealTable(getTableInfo("study", "Drug Administration"));
             SQLFragment sql = new SQLFragment("UPDATE " + drugAdministration.getSelectName() + " SET treatmentid = ? WHERE treatmentid = ?", newObjectId, originalObjectId);
             SqlExecutor se = new SqlExecutor(drugAdministration.getSchema().getScope());
             se.execute(sql);
         }
 
+        if (errors.hasErrors())
+        {
+            throw errors;
+        }
+
         return now;
     }