fixed bug in gender coding
This commit is contained in:
parent
6562be14b8
commit
04245af1a9
|
@ -132,7 +132,8 @@ PEXTRACT(AMAP,AIEN,AOID) ; EXTRACT TO RETURN ARRAY RARY PASSED BY NAME
|
||||||
S @AMAP@("ACTORMIDDLENAME")=$$MIDDLE^C0CDPT(AIEN)
|
S @AMAP@("ACTORMIDDLENAME")=$$MIDDLE^C0CDPT(AIEN)
|
||||||
S @AMAP@("ACTORFAMILYNAME")=$$FAMILY^C0CDPT(AIEN)
|
S @AMAP@("ACTORFAMILYNAME")=$$FAMILY^C0CDPT(AIEN)
|
||||||
S @AMAP@("ACTORDATEOFBIRTH")=$$DOB^C0CDPT(AIEN)
|
S @AMAP@("ACTORDATEOFBIRTH")=$$DOB^C0CDPT(AIEN)
|
||||||
S @AMAP@("ACTORGENDER")=$$GENDER^C0CDPT(AIEN)
|
S @AMAP@("ACTORGENDER")=$P($$GENDER^C0CDPT(AIEN),U,2)
|
||||||
|
S @AMAP@("ACTORGENDERCODE")=$P($$GENDER^C0CDPT(AIEN),U,1)
|
||||||
S @AMAP@("ACTORSSN")=""
|
S @AMAP@("ACTORSSN")=""
|
||||||
S @AMAP@("ACTORSSNTEXT")=""
|
S @AMAP@("ACTORSSNTEXT")=""
|
||||||
S @AMAP@("ACTORSSNSOURCEID")=""
|
S @AMAP@("ACTORSSNSOURCEID")=""
|
||||||
|
|
|
@ -675,8 +675,8 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
|
||||||
;;<Gender>
|
;;<Gender>
|
||||||
;;<Text>@@ACTORGENDER@@</Text>
|
;;<Text>@@ACTORGENDER@@</Text>
|
||||||
;;<Code>
|
;;<Code>
|
||||||
;;<Value>@@ACTORGENDER@@</Value>
|
;;<Value>@@ACTORGENDERCODE@@</Value>
|
||||||
;;<CodingSystem>2.16.840.1.113883.5.1</CodingSystem>
|
;;<CodingSystem>HL7 AdministrativeGender</CodingSystem>
|
||||||
;;</Code>
|
;;</Code>
|
||||||
;;</Gender>
|
;;</Gender>
|
||||||
;;</Person>
|
;;</Person>
|
||||||
|
|
|
@ -111,7 +111,7 @@ DOB(DFN) ; Date of Birth
|
||||||
; Date in FM Date Format. Convert to UTC/ISO 8601.
|
; Date in FM Date Format. Convert to UTC/ISO 8601.
|
||||||
Q $$FMDTOUTC^C0CUTIL(DOB,"D")
|
Q $$FMDTOUTC^C0CUTIL(DOB,"D")
|
||||||
GENDER(DFN) ; Gender/Sex
|
GENDER(DFN) ; Gender/Sex
|
||||||
Q $$GET1^DIQ(2,DFN,.02) ;
|
Q $$GET1^DIQ(2,DFN,.02,"I")_"^"_$$GET1^DIQ(2,DFN,.02,"E") ;
|
||||||
SSN(DFN) ; SSN
|
SSN(DFN) ; SSN
|
||||||
Q $$GET1^DIQ(2,DFN,.09)
|
Q $$GET1^DIQ(2,DFN,.09)
|
||||||
ADDRTYPE(DFN) ; Address Type
|
ADDRTYPE(DFN) ; Address Type
|
||||||
|
|
|
@ -21,6 +21,12 @@ C0CUTIL ;WV/C0C/SMH - Various Utilites for generating the CCR/CCD;06/15/08
|
||||||
W "No Entry at Top!"
|
W "No Entry at Top!"
|
||||||
Q
|
Q
|
||||||
;
|
;
|
||||||
|
UUID() ; GENERATE A RANDOM UUID (Version 4)
|
||||||
|
N I,J,ZS
|
||||||
|
S ZS="0123456789abcdef" S J=""
|
||||||
|
F I=1:1:36 S J=J_$S((I=9)!(I=14)!(I=19)!(I=24):"-",I=15:4,I=20:"a",1:$E(ZS,$R(16)+1))
|
||||||
|
Q J
|
||||||
|
;
|
||||||
FMDTOUTC(DATE,FORMAT) ; Convert Fileman Date to UTC Date Format; PUBLIC; Extrinsic
|
FMDTOUTC(DATE,FORMAT) ; Convert Fileman Date to UTC Date Format; PUBLIC; Extrinsic
|
||||||
; FORMAT is Format of Date. Can be either D (Day) or DT (Date and Time)
|
; FORMAT is Format of Date. Can be either D (Day) or DT (Date and Time)
|
||||||
; If not passed, or passed incorrectly, it's assumed that it is D.
|
; If not passed, or passed incorrectly, it's assumed that it is D.
|
||||||
|
|
Loading…
Reference in New Issue