Merge branch 'master' into BACK-4025-clinic-patient-count

Author: darinkrauss

reference/clinic.v1.yaml

@@ -959,6 +959,17 @@ paths:
           description: Comma-separated list of clinic site IDs
           style: form
           explode: false
+        - name: omitNonStandardRanges
+          description: |
+            Whether patients whose glycemic ranges selection is *not*
+            the ADA standard ranges (e.g. as used by the TIDE report)
+            should be omitted.
+          schema:
+            type: boolean
+          in: query
+          # Skipping the pointer here ran afoul of https://github.com/oapi-codegen/oapi-codegen/issues/1263
+          # x-go-type-skip-optional-pointer: true
+
       description: Retrieve a list of patients of a clinic
     post:
       summary: Create Patient Account
@@ -2398,6 +2409,10 @@ components:
           x-omitzero: true
           items:
             $ref: ./clinic/models/site.v1.yaml
+        glycemicRanges:
+          $ref: ./clinic/models/glycemicRanges.v1.yaml
+        diagnosisType:
+          $ref: ./metadata/models/diagnosisType.v1.yaml
     associateClinicianToUser.v1:
       title: Associate Clinician
       type: object
@@ -2596,6 +2611,10 @@ components:
           x-omitzero: true
           items:
             $ref: ./clinic/models/site.v1.yaml
+        glycemicRanges:
+          $ref: ./clinic/models/glycemicRanges.v1.yaml
+        diagnosisType:
+          $ref: ./metadata/models/diagnosisType.v1.yaml
     addServiceAccount.v1:
       title: AddServiceAccount
       x-stoplight:

reference/clinic/models/glycemicRanges.v1.yaml

@@ -0,0 +1,13 @@
+properties:
+  type:
+    type: string
+    enum:
+      - preset
+      - custom
+    default: preset
+  custom:
+    $ref: ./glycemicRangesCustom.v1.yaml
+  preset:
+    $ref: ./glycemicRangesPreset.v1.yaml
+required:
+  - type

reference/clinic/models/glycemicRangesCustom.v1.yaml

@@ -0,0 +1,16 @@
+type: object
+properties:
+  name:
+    type: string
+    minLength: 1
+  thresholds:
+    type: array
+    items:
+      $ref: ./glycemicRangesThreshold.v1.yaml
+    minLength: 4
+    maxLength: 5
+required:
+  - name
+  - thresholds
+x-go-type-skip-optional-pointer: true
+x-omitzero: true

reference/clinic/models/glycemicRangesPreset.v1.yaml

@@ -0,0 +1,15 @@
+type: string
+minLength: 1
+enum:
+  - adaStandard
+  - adaPregnancyType1
+  - adaPregnancyType2
+  - adaHighRisk
+x-enum-varnames:
+  - ADAStandard
+  - ADAPregnancyType1
+  - ADAPregnancyType2
+  - ADAHighRisk
+default: adaStandard
+x-go-type-skip-optional-pointer: true
+x-omitzero: true

reference/clinic/models/glycemicRangesThreshold.v1.yaml

@@ -0,0 +1,14 @@
+type: object
+properties:
+  name:
+    type: string
+    minLength: 1
+  upperBound:
+    $ref: ./glycemicRangesThresholdUpperBound.v1.yaml
+  inclusive:
+    type: boolean
+    default: false
+    x-go-type-skip-optional-pointer: true
+required:
+  - name
+  - upperBound

reference/clinic/models/glycemicRangesThresholdUpperBound.v1.yaml

@@ -0,0 +1,13 @@
+type: object
+properties:
+  value:
+    type: number
+    format: float
+  units:
+    type: string
+    enum:
+      - mg/dL
+      - mmol/L
+required:
+  - value
+  - units

reference/clinic/models/patient.v1.yaml

@@ -68,6 +68,10 @@ properties:
     x-omitzero: true
     items:
       $ref: ./site.v1.yaml
+  glycemicRanges:
+    $ref: ./glycemicRanges.v1.yaml
+  diagnosisType:
+    $ref: ../../metadata/models/diagnosisType.v1.yaml
 required:
   - id
   - fullName

reference/metadata/models/diagnosistype.v1.yaml renamed to reference/metadata/models/diagnosisType.v1.yaml

@@ -3,9 +3,12 @@ type: string
 enum:
   - type1
   - type2
+  - type3c
   - gestational
   - prediabetes
   - lada
   - mody
   - other
+  - notApplicable
+  - "" # used to clear out an existing value
 example: 'type1'

reference/metadata/models/userprofile.v1.yaml

@@ -9,7 +9,7 @@ properties:
     type: object
     properties:
       diagnosisType:
-        $ref: './diagnosistype.v1.yaml'
+        $ref: './diagnosisType.v1.yaml'
       diagnosisDate:
         $ref: '../../common/models/diagnosisdate.v1.yaml'
       birthday: