Changeset 124 for ruby/trunk/lib/models/rm

Timestamp:

May 20, 2009, 12:15:19 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #48,#50

Location:

ruby/trunk/lib/models/rm/data_types

Files:

• quantity.rb (modified) (3 diffs)
• text.rb (modified) (2 diffs)

ruby/trunk/lib/models/rm/data_types/quantity.rb

@@ -10 +10 @@
           attr_reader :other_refference_ranges, :normal_range, :normal_status
 
-          def initialize(normal_range=nil, other_reference_ranges=nil,
-                         normal_status = nil)
+          def initialize(normal_range=nil, normal_status = nil,
+                         other_reference_ranges=nil)
             self.normal_range = normal_range
+            self.normal_status = normal_status
             self.other_reference_ranges = other_reference_ranges
-            self.normal_status = normal_status
           end          
 
           def is_normal?
-            !normal_range.nil? or !normal_status.nil?
+            if @normal_range.nil? and @normal_status.nil?
+              return false
+            elsif !@normal_range.nil?
+              return @normal_range.has(@value)
+            elsif !@normal_status.nil?
+              return @normal_status.code_string == 'N'
+            end
           end
 
@@ -26 +32 @@
 
           def <=>(other)
-            raise NotImplementError, 'This method should be implemented'
+            raise NotImplementedError, 'This method should be implemented'
           end
 
@@ -88 +94 @@
         end
 
+        class Reference_Range
+          
+        end
+
         autoload :Date_Time, "rm/data_types/quantity/date_time.rb"
         

ruby/trunk/lib/models/rm/data_types/text.rb

@@ -130 +130 @@
         class DV_Coded_Text < DV_Text
           attr_reader :defining_code
+
           def initialize(value, defining_code, formatting = nil, 
                          hyperlink = nil, mappings = nil, language = nil, 
@@ -136 +137 @@
             self.defining_code = defining_code
           end
+
           def defining_code=(defining_code)
-            definition_exists(defining_code)
+            if defining_code.nil?
+              raise ArgumentError, "Defiinition must be exist" 
+            end
             @defining_code = defining_code
-          end
-          private
-          def definition_exists(defining_code)
-            raise ArgumentError, "Defiinition must be exist" if defining_code.nil?
           end
         end