Skip to content

Commit 64ee234

Browse files
ASL-rmarshallASL-rmarshall
committed
New Duration class (DDF-RA #635) and add notes to StudyRole (DDF-RA #634)
1 parent 5ecd60b commit 64ee234

7 files changed

Lines changed: 306 additions & 233 deletions

File tree

‎docs/USDM_API.json‎

Lines changed: 182 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,7 +1376,7 @@
13761376
"title": "Description"
13771377
},
13781378
"duration": {
1379-
"$ref": "#/components/schemas/AdministrationDuration-Input"
1379+
"$ref": "#/components/schemas/Duration-Input"
13801380
},
13811381
"dose": {
13821382
"anyOf": [
@@ -1499,7 +1499,7 @@
14991499
"title": "Description"
15001500
},
15011501
"duration": {
1502-
"$ref": "#/components/schemas/AdministrationDuration-Output"
1502+
"$ref": "#/components/schemas/Duration-Output"
15031503
},
15041504
"dose": {
15051505
"anyOf": [
@@ -1579,142 +1579,6 @@
15791579
],
15801580
"title": "Administration"
15811581
},
1582-
"AdministrationDuration-Input": {
1583-
"properties": {
1584-
"id": {
1585-
"type": "string",
1586-
"minLength": 1,
1587-
"title": "Id"
1588-
},
1589-
"extensionAttributes": {
1590-
"items": {
1591-
"$ref": "#/components/schemas/ExtensionAttribute-Input"
1592-
},
1593-
"type": "array",
1594-
"title": "Extensionattributes",
1595-
"default": []
1596-
},
1597-
"description": {
1598-
"anyOf": [
1599-
{
1600-
"type": "string"
1601-
},
1602-
{
1603-
"type": "null"
1604-
}
1605-
],
1606-
"title": "Description"
1607-
},
1608-
"quantity": {
1609-
"anyOf": [
1610-
{
1611-
"$ref": "#/components/schemas/Quantity-Input"
1612-
},
1613-
{
1614-
"type": "null"
1615-
}
1616-
]
1617-
},
1618-
"durationWillVary": {
1619-
"type": "boolean",
1620-
"title": "Durationwillvary"
1621-
},
1622-
"reasonDurationWillVary": {
1623-
"anyOf": [
1624-
{
1625-
"type": "string"
1626-
},
1627-
{
1628-
"type": "null"
1629-
}
1630-
],
1631-
"title": "Reasondurationwillvary"
1632-
},
1633-
"instanceType": {
1634-
"type": "string",
1635-
"enum": [
1636-
"AdministrationDuration"
1637-
],
1638-
"const": "AdministrationDuration",
1639-
"title": "Instancetype"
1640-
}
1641-
},
1642-
"type": "object",
1643-
"required": [
1644-
"id",
1645-
"durationWillVary",
1646-
"instanceType"
1647-
],
1648-
"title": "AdministrationDuration"
1649-
},
1650-
"AdministrationDuration-Output": {
1651-
"properties": {
1652-
"id": {
1653-
"type": "string",
1654-
"minLength": 1,
1655-
"title": "Id"
1656-
},
1657-
"extensionAttributes": {
1658-
"items": {
1659-
"$ref": "#/components/schemas/ExtensionAttribute-Output"
1660-
},
1661-
"type": "array",
1662-
"title": "Extensionattributes",
1663-
"default": []
1664-
},
1665-
"description": {
1666-
"anyOf": [
1667-
{
1668-
"type": "string"
1669-
},
1670-
{
1671-
"type": "null"
1672-
}
1673-
],
1674-
"title": "Description"
1675-
},
1676-
"quantity": {
1677-
"anyOf": [
1678-
{
1679-
"$ref": "#/components/schemas/Quantity-Output"
1680-
},
1681-
{
1682-
"type": "null"
1683-
}
1684-
]
1685-
},
1686-
"durationWillVary": {
1687-
"type": "boolean",
1688-
"title": "Durationwillvary"
1689-
},
1690-
"reasonDurationWillVary": {
1691-
"anyOf": [
1692-
{
1693-
"type": "string"
1694-
},
1695-
{
1696-
"type": "null"
1697-
}
1698-
],
1699-
"title": "Reasondurationwillvary"
1700-
},
1701-
"instanceType": {
1702-
"type": "string",
1703-
"enum": [
1704-
"AdministrationDuration"
1705-
],
1706-
"const": "AdministrationDuration",
1707-
"title": "Instancetype"
1708-
}
1709-
},
1710-
"type": "object",
1711-
"required": [
1712-
"id",
1713-
"durationWillVary",
1714-
"instanceType"
1715-
],
1716-
"title": "AdministrationDuration"
1717-
},
17181582
"AliasCode-Input": {
17191583
"properties": {
17201584
"id": {
@@ -3667,6 +3531,150 @@
36673531
],
36683532
"title": "DocumentContentReference"
36693533
},
3534+
"Duration-Input": {
3535+
"properties": {
3536+
"id": {
3537+
"type": "string",
3538+
"minLength": 1,
3539+
"title": "Id"
3540+
},
3541+
"extensionAttributes": {
3542+
"items": {
3543+
"$ref": "#/components/schemas/ExtensionAttribute-Input"
3544+
},
3545+
"type": "array",
3546+
"title": "Extensionattributes",
3547+
"default": []
3548+
},
3549+
"text": {
3550+
"anyOf": [
3551+
{
3552+
"type": "string"
3553+
},
3554+
{
3555+
"type": "null"
3556+
}
3557+
],
3558+
"title": "Text"
3559+
},
3560+
"quantity": {
3561+
"anyOf": [
3562+
{
3563+
"$ref": "#/components/schemas/Quantity-Input"
3564+
},
3565+
{
3566+
"$ref": "#/components/schemas/Range-Input"
3567+
},
3568+
{
3569+
"type": "null"
3570+
}
3571+
],
3572+
"title": "Quantity"
3573+
},
3574+
"durationWillVary": {
3575+
"type": "boolean",
3576+
"title": "Durationwillvary"
3577+
},
3578+
"reasonDurationWillVary": {
3579+
"anyOf": [
3580+
{
3581+
"type": "string"
3582+
},
3583+
{
3584+
"type": "null"
3585+
}
3586+
],
3587+
"title": "Reasondurationwillvary"
3588+
},
3589+
"instanceType": {
3590+
"type": "string",
3591+
"enum": [
3592+
"Duration"
3593+
],
3594+
"const": "Duration",
3595+
"title": "Instancetype"
3596+
}
3597+
},
3598+
"type": "object",
3599+
"required": [
3600+
"id",
3601+
"durationWillVary",
3602+
"instanceType"
3603+
],
3604+
"title": "Duration"
3605+
},
3606+
"Duration-Output": {
3607+
"properties": {
3608+
"id": {
3609+
"type": "string",
3610+
"minLength": 1,
3611+
"title": "Id"
3612+
},
3613+
"extensionAttributes": {
3614+
"items": {
3615+
"$ref": "#/components/schemas/ExtensionAttribute-Output"
3616+
},
3617+
"type": "array",
3618+
"title": "Extensionattributes",
3619+
"default": []
3620+
},
3621+
"text": {
3622+
"anyOf": [
3623+
{
3624+
"type": "string"
3625+
},
3626+
{
3627+
"type": "null"
3628+
}
3629+
],
3630+
"title": "Text"
3631+
},
3632+
"quantity": {
3633+
"anyOf": [
3634+
{
3635+
"$ref": "#/components/schemas/Quantity-Output"
3636+
},
3637+
{
3638+
"$ref": "#/components/schemas/Range-Output"
3639+
},
3640+
{
3641+
"type": "null"
3642+
}
3643+
],
3644+
"title": "Quantity"
3645+
},
3646+
"durationWillVary": {
3647+
"type": "boolean",
3648+
"title": "Durationwillvary"
3649+
},
3650+
"reasonDurationWillVary": {
3651+
"anyOf": [
3652+
{
3653+
"type": "string"
3654+
},
3655+
{
3656+
"type": "null"
3657+
}
3658+
],
3659+
"title": "Reasondurationwillvary"
3660+
},
3661+
"instanceType": {
3662+
"type": "string",
3663+
"enum": [
3664+
"Duration"
3665+
],
3666+
"const": "Duration",
3667+
"title": "Instancetype"
3668+
}
3669+
},
3670+
"type": "object",
3671+
"required": [
3672+
"id",
3673+
"durationWillVary",
3674+
"instanceType"
3675+
],
3676+
"title": "Duration"
3677+
},
36703678
"EligibilityCriterion-Input": {
36713679
"properties": {
36723680
"id": {
@@ -8835,6 +8843,16 @@
88358843
"title": "Instances",
88368844
"default": []
88378845
},
8846+
"plannedDuration": {
8847+
"anyOf": [
8848+
{
8849+
"$ref": "#/components/schemas/Duration-Input"
8850+
},
8851+
{
8852+
"type": "null"
8853+
}
8854+
]
8855+
},
88388856
"instanceType": {
88398857
"type": "string",
88408858
"enum": [
@@ -8940,6 +8958,16 @@
89408958
"title": "Instances",
89418959
"default": []
89428960
},
8961+
"plannedDuration": {
8962+
"anyOf": [
8963+
{
8964+
"$ref": "#/components/schemas/Duration-Output"
8965+
},
8966+
{
8967+
"type": "null"
8968+
}
8969+
]
8970+
},
89438971
"instanceType": {
89448972
"type": "string",
89458973
"enum": [
@@ -12289,6 +12317,14 @@
1228912317
}
1229012318
]
1229112319
},
12320+
"notes": {
12321+
"items": {
12322+
"$ref": "#/components/schemas/CommentAnnotation-Input"
12323+
},
12324+
"type": "array",
12325+
"title": "Notes",
12326+
"default": []
12327+
},
1229212328
"instanceType": {
1229312329
"type": "string",
1229412330
"enum": [
@@ -12386,6 +12422,14 @@
1238612422
}
1238712423
]
1238812424
},
12425+
"notes": {
12426+
"items": {
12427+
"$ref": "#/components/schemas/CommentAnnotation-Output"
12428+
},
12429+
"type": "array",
12430+
"title": "Notes",
12431+
"default": []
12432+
},
1238912433
"instanceType": {
1239012434
"type": "string",
1239112435
"enum": [

0 commit comments

Comments
 (0)