Add Claim.diagnosis.

• Encounter.diagnosis uses the “code” QDM concept as Encounter.diagnosis.condition defined as Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure. (Bold italics added for emphasis).
• Claim has 2 elements:
• Claim.diagnosis with Claim.diagnosis.diagnosis_x_, Claim.diagnosis.sequence, Claim.diagnosis.type (with example value set valueset-ex-diagnosistype),[Claim.diagnosis.onAdmission|https://www.hl7.org/fhir/claim-definitions.html#Claim.diagnosis.onAdmission] (with example value set valueset-ex-diagnosis-on-admission
• Claim.procedure with its own Claim.procedure.sequence, Claim.procedure.type (with example value set valueset-ex-procedure-type – primary or secondary), and Claim.procedure.procedure_x_with example ICD-10 procedure codes – procedure 1, procedure 2, procedure 3)

Note – For “rank” the definitions vary a bit:

• Claim.procedure.sequence (A number to uniquely identify procedure entries)
• Claim.diagnosis.sequence (A number to uniquely identify diagnosis entries)
• Encounter.diagnosis.rank (Ranking of the diagnosis (for each role type)

Claim and Encounter (different HL7 WGs) define encounter-diagnosis and encounter-procedure differently - the two should be aligned and use the same components for consistency and to avoid confusion and provider burden.