Changeset 767 for ccr/trunk

Timestamp:

May 19, 2010, 11:09:56 PM (15 years ago)

Author:

George Lilly

Message:

fixed bug in gender coding

Location:

ccr/trunk/p

Files:

• C0CACTOR.m (modified) (1 diff)
• C0CCCR0.m (modified) (1 diff)
• C0CDPT.m (modified) (1 diff)
• C0CUTIL.m (modified) (1 diff)

ccr/trunk/p/C0CACTOR.m

@@ -133 +133 @@
  S @AMAP@("ACTORFAMILYNAME")=$$FAMILY^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@("ACTORSSNTEXT")=""

ccr/trunk/p/C0CCCR0.m

@@ -676 +676 @@
  ;;<Text>@@ACTORGENDER@@</Text>
  ;;<Code>
- ;;<Value>@@ACTORGENDER@@</Value>
- ;;<CodingSystem>2.16.840.1.113883.5.1</CodingSystem>
+ ;;<Value>@@ACTORGENDERCODE@@</Value>
+ ;;<CodingSystem>HL7 AdministrativeGender</CodingSystem>
  ;;</Code>
  ;;</Gender>

ccr/trunk/p/C0CDPT.m

@@ -112 +112 @@
  Q $$FMDTOUTC^C0CUTIL(DOB,"D")
 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
  Q $$GET1^DIQ(2,DFN,.09)

ccr/trunk/p/C0CUTIL.m

@@ -21 +21 @@
  W "No Entry at Top!"
  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