* merged commits from 'maxwell lou' by time '20131028_09:52';HEADmaster

* moved 'ValueKind' model from 'recommend/models' to 'indicator/models'
* added field 'type' for 'indicator.models.Indicator'
* added field 'kind' for 'indicator.models.IndicatorRecord',
  'InnateConfine'
* updated methods for models 'Indicator', 'IndicatorRecord',
  'InnateConfine'
* updated views and templates for 'apps/indicator'
* added 'INDICATOR_RECOMMEND_PERIOD' into 'settings.py'
* added 'type' field for 'indicator.models.Indicator' in
  'search_indexes.py'
* added a confirm step for 'EditHistoryData' page when delete a record

* removed dir 'backupdata'; 'queries.txt' moved to 'backup' dir
* moved *.json to 'backup' dir
* removed 'apps/managers*.py'
* updated 'indicator/popup/IndexDesc.html'
* created dir 'apps/indicator/obsolete';
* moved 'indicator/forms.py' to dir 'obsolete';
* splitted views related forms.py from 'views.py', and placed in
  'obsolete/views_forms.py'

* loadded newest data into database
* cleaned pervious data files in 'backup' dir
* updated 'README.txt'; added a solution to a redis problem

* added field 'type' of 'indicator.models.Indicator';
  for filtering search results and only returning 'NORMAL_TYPE'

10 files changed, 196 insertions, 96 deletions

diff --git a/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html b/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html
index 24d8078..9651a93 100644
--- a/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html
+++ b/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html
@@ -3,7 +3,7 @@
 {% load dict_get %}
 
 {% block title %}
-指标状态 | 随访工具 | 97 随访
+指标状态 | 随访工具 | 医时代
 {% endblock %}
 
 {% block css %}
@@ -39,17 +39,17 @@
   <!-- TODO -->
   <div id="login_container">
     <div class="logged-in" id="login">
-      <img class="user-photo" alt="" src="{% static "images/userPhoto.jpg" %}">
-      <span class="number-block green-block user-level">6</span>
+      <!--img class="user-photo" alt="" src="{% static "images/userPhoto.jpg" %}">
+      <span class="number-block green-block user-level">6</span-->
       <span class="drop-down-area">
-        <span class="user-name">username</span>
+        <span class="user-name">isuifangqa</span>
         <img class="drop-down-menu-button" alt="" src="{% static "images/icon_down.png" %}">
       </span>
       <div class="drop-down-menu" tabindex="0" onblur="javascript:alert('blur');" onfocus="javascript:alert('focus')">
         <div class="text-pointer"></div>
         <ul class="links">
-          <li><a href="javascript:void(0)">修改密码</a></li>
-          <li><a href="javascript:void(0)">完善信息</a></li>
+          <!--li><a href="javascript:void(0)">修改密码</a></li>
+          <li><a href="javascript:void(0)">完善信息</a></li-->
           <li class="last"><a href="javascript:void(0)">退出</a></li>
         </ul>
       </div>
@@ -66,7 +66,7 @@
     <div class="new_delete_title">
       <div class="content">添加或删除关注指标</div>
       <div class="search">
-        <input type="text" value="" placeholder="直接搜索指标" id="search_kw" />
+        <input type="text" name="q" placeholder="直接找寻指标" id="search_kw" value="{{ q }}"/>
         <img id="search_btn" src="{% static "images/search.png" %}">
       </div>
       <div style="clear: both;"></div>
@@ -77,7 +77,7 @@
       <div id="index_all" class="index_type {% if page_condition == "all" %}selected{% endif %}">
         <a href="?tab=all">所有指标</a>
       </div>
-      <!-- 指标类别，页面只能容纳 7 个 -->
+      <!-- 指标类别，一行只能容纳 7 个按钮 -->
       {% for cat in categories %}
       <div class="index_type {% if selected_catid == cat.id %}selected{% endif %}">
         <a href="?tab={{ cat.id }}">{{ cat.name }}</a>
@@ -93,32 +93,32 @@
         <div class="all_condition" style="display: {% if page_condition == "all" %}block{% else %}none{% endif %};">
           <div class="index_all_title">所有指标</div>
           <div class="index_all_letter">
-            <div>A</div>
-            <div>B</div>
-            <div>C</div>
-            <div>D</div>
-            <div>E</div>
-            <div>F</div>
-            <div>G</div>
-            <div>H</div>
-            <div>I</div>
-            <div>J</div>
-            <div>K</div>
-            <div>L</div>
-            <div>M</div>
-            <div>N</div>
-            <div>O</div>
-            <div>P</div>
-            <div>Q</div>
-            <div>R</div>
-            <div>S</div>
-            <div>T</div>
-            <div>U</div>
-            <div>V</div>
-            <div>W</div>
-            <div>X</div>
-            <div>Y</div>
-            <div>Z</div>
+            <div class="letter" id="A">A</div>
+            <div class="letter" id="B">B</div>
+            <div class="letter" id="C">C</div>
+            <div class="letter" id="D">D</div>
+            <div class="letter" id="E">E</div>
+            <div class="letter" id="F">F</div>
+            <div class="letter" id="G">G</div>
+            <div class="letter" id="H">H</div>
+            <div class="letter" id="I">I</div>
+            <div class="letter" id="J">J</div>
+            <div class="letter" id="K">K</div>
+            <div class="letter" id="L">L</div>
+            <div class="letter" id="M">M</div>
+            <div class="letter" id="N">N</div>
+            <div class="letter" id="O">O</div>
+            <div class="letter" id="P">P</div>
+            <div class="letter" id="Q">Q</div>
+            <div class="letter" id="R">R</div>
+            <div class="letter" id="S">S</div>
+            <div class="letter" id="T">T</div>
+            <div class="letter" id="U">U</div>
+            <div class="letter" id="V">V</div>
+            <div class="letter" id="W">W</div>
+            <div class="letter" id="X">X</div>
+            <div class="letter" id="Y">Y</div>
+            <div class="letter" id="Z">Z</div>
           </div> <!-- end: index_all_letter -->
           <div style="clear:both;"></div>
           {# display all indicators if in 'all' condition #}
@@ -127,21 +127,21 @@
           <div class="index_letter_container">
             {# display all indicators by letter index #}
             {% for l in letters %}
-              {% with l_inds=indicators|dict_get:l %}
-                {% if l_inds|length >= 1 %}
-                  <div class="index_lines {{ l|upper }} to_add">
-                    <div class="letter_title">{{ l|upper }}</div>
-                    {% for ind in l_inds %}
-                      <div class="index_line" index_id="{{ ind|dict_get:"id" }}">
-                        <div class="index_name">{{ ind|dict_get:"name" }}</div>
-                        <div class="index_category"></div>
-                        <div class="icon"></div>
-                        <div style="clear:both"></div>
-                      </div>
-                    {% endfor %}
-                  </div>
-                {% endif %}
-              {% endwith %}
+            {% with l_inds=indicators|dict_get:l %}
+            {% if l_inds|length >= 1 %}
+            <div class="index_lines to_add letter_section" id="sec_{{ l|upper }}">
+              <div class="letter_title">{{ l|upper }}</div>
+              {% for ind in l_inds %}
+              <div class="index_line" index_id="{{ ind|dict_get:"id" }}">
+                <div class="index_name">{{ ind|dict_get:"name" }}</div>
+                <div class="index_category"></div>
+                <div class="icon"></div>
+                <div style="clear:both"></div>
+              </div>
+              {% endfor %}
+            </div>
+            {% endif %}
+            {% endwith %}
             {% endfor %} {# end: display all indicators #}
           </div> <!-- end: index_letter_container -->
           {% endif %} {# end: page_condition == all #}
@@ -154,7 +154,7 @@
           <div class="index_title_container">
             <div class="index_title">{{ selected_category.name }}</div>
             <div class="example_sheet">
-              <a href="javascript:void(0)">仿真化验单</a>
+              <a href="{{ selected_category.description }}" class="thickbox" target="_blank">仿真化验单</a>
             </div>
             <div style="clear:both;"></div>
           </div>
@@ -250,7 +250,7 @@
 
   <div class="link_container">
     <div class="status_link">
-      <a href="{% url indicator_status %}">查看指标状态</a>
+      <a href="{% url indicator_status %}">完成并返回</a>
     </div>
   </div>
 {% endblock page %}
diff --git a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html
index 5a6659f..362083b 100644
--- a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html
+++ b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html
@@ -4,7 +4,7 @@
 {% load divisible_by %}
 
 {% block title %}
-指标状态 | 随访工具 | 97 随访
+指标状态 | 随访工具 | 医时代
 {% endblock %}
 
 {% block css %}
@@ -274,6 +274,9 @@
       {% elif ind|dict_get:"dataType" == DATA_TYPES|dict_get:"PM_TYPE" %}
         {# PM_TYPE #}
         {# TODO #}
+      {% elif ind|dict_get:"dataType" == DATA_TYPES|dict_get:"KIND_TYPE" %}
+        {# KIND_TYPE #}
+        {# TODO #}
       {% else %}
         {# unknown TYPE #}
       {% endif %} {# end: DATA_TYPES #}
@@ -289,17 +292,17 @@
   <!-- TODO -->
   <div id="login_container">
     <div class="logged-in" id="login">
-      <img class="user-photo" alt="user_photo" src="{% static "images/userPhoto.jpg" %}" />
-      <span class="number-block green-block user-level">6</span>
+      <!--img class="user-photo" alt="user_photo" src="{% static "images/userPhoto.jpg" %}" />
+      <span class="number-block green-block user-level">6</span-->
       <span class="drop-down-area">
-        <span class="user-name">username</span>
-        <img class="drop-down-menu-button" alt="" src="{% static "images/icon_down.png" %}" />
+        <span class="user-name">isuifangqa</span>
+        <!--img class="drop-down-menu-button" alt="" src="{% static "images/icon_down.png" %}" /-->
       </span>
       <div class="drop-down-menu" tabindex="0" onblur="javascript:alert('blur');" onfocus="javascript:alert('focus')">
         <div class="text-pointer"></div>
         <ul class="links">
-          <li><a href="javascript:void(0)">修改密码</a></li>
-          <li><a href="javascript:void(0)">完善信息</a></li>
+          <!--li><a href="javascript:void(0)">修改密码</a></li>
+          <li><a href="javascript:void(0)">完善信息</a></li-->
           <li class="last"><a href="javascript:void(0)">退出</a></li>
         </ul>
       </div>
@@ -308,7 +311,7 @@
 
   <div id="right_container">
     <div id="index_status_container">
-      <div class="index_title">指标状态</div>
+      <div class="index_title">随访医学指标</div>
 
       {% comment %}
       <!-- 这里需要后端读取cookie，来判断用户是否已经点击大叉。
@@ -330,7 +333,7 @@
           <div class="refer_range">
             <span class="refer_text">{{ ind|dict_get:"ref_text" }}</span>
             <span class="refer_value">{{ ind|dict_get:"ref_value"|safe }}</span>
-            <span class="data_unit">{% if ind|dict_get:"std_unit_symbol" %}({{ ind|dict_get:"std_unit_symbol" }}){% endif %}</span>
+            <span class="data_unit">{% if ind|dict_get:"std_unit_symbol"%}{{ ind|dict_get:"std_unit_symbol"|safe}}{% endif %}</span>
           </div>
 
           <div class="edit_data">
@@ -342,7 +345,7 @@
             <div class="last_edit_data" style="display: block;">
             {% endif %}
               <span class="data_value">{{ ind|dict_get:"last_record"|dict_get:"value_html"|safe }}</span>
-              <span class="data_unit">{% if ind|dict_get:"std_unit_symbol" %}({{ ind|dict_get:"std_unit_symbol" }}){% endif %}</span>
+              <span class="data_unit">{% if ind|dict_get:"std_unit_symbol" %}{{ ind|dict_get:"std_unit_symbol" }}{% endif %}</span>
             </div>
             <img class="small_edit_icon" alt="edit_icon" src="{% static "images/pen.png" %}" />
             <!-- explain_icon -->
@@ -397,14 +400,18 @@
                 <input type="radio" id="plus_r" name="pm_data" value="+" />
                 <label for="plus_r">阳性(+)</label>
               </div>
+              {% elif ind|dict_get:"dataType" == DATA_TYPES|dict_get:"KIND_TYPE" %}
+              {# KIND_TYPE #}
+              TODO
               {% else %}
               {# UNKNOWN TYPE #}
               ERROR: unknown data type
               {% endif %}
             </div>
-            <div class="data_unit">{% if ind|dict_get:"std_unit_symbol" %}({{ ind|dict_get:"std_unit_symbol" }}){% endif %}</div>
-            <div class="confirm_edit_icon"></div>
+            <div class="data_unit">{% if ind|dict_get:"std_unit_symbol" %}{{ ind|dict_get:"std_unit_symbol" }}{% endif %}</div>
             <div class="cancel_edit_icon"></div>
+            <div class="confirm_edit_icon"></div>
+            
             <div style="clear:both;"></div>
             <div class="date">
               <div class="datepicker_container">
@@ -435,7 +442,7 @@
           <div class="card_bottom">
             <div class="understand_index"><a class="thickbox" href="{% url indicator_indexdesc %}?card_id={{ ind|dict_get:"id" }}&amp;url_type=html&amp;no_title=true&amp;TB_iframe=true&amp;height=367&amp;width=630">了解该指标</a></div>
             <!-- TODO -->
-            <div class="simulation_sheet"><a href="{% static "images/demo_sheet.png" %}" class="thickbox">仿真化验单</a></div>
+            <div class="simulation_sheet"><a href="http://image.97suifang.com/media/imgs/2013/10/21/%E4%B8%A4%E5%AF%B9%E5%8D%8A.jpg" class="thickbox">仿真化验单</a></div>
             <div class="detail_history">
               <a href="javascript:void(0)">详细历史记录</a>
             </div>
@@ -450,7 +457,7 @@
             width参数为弹出层页面宽度+2，
             card_id参数为 "卡片id"
           {% endcomment %}
-          <a class="card_delete_icon card_delete thickbox" href="{% url indicator_deletecardtip %}?card_id={{ ind|dict_get:"id" }}&amp;url_type=html&amp;no_title=true&amp;TB_iframe=true&amp;height=166&amp;width=630"></a>
+          <a class="card_delete_icon card_delete thickbox" href="{% url indicator_deletecardtip %}?card_id={{ ind|dict_get:"id" }}&amp;url_type=html&amp;no_title=true&amp;TB_iframe=true&amp;height=180&amp;width=650"></a>
         </div> <!-- end: index_card -->
       {% endfor %} {# end: indicators #}
 
diff --git a/97suifangqa/apps/indicator/templates/indicator/SideBar.html b/97suifangqa/apps/indicator/templates/indicator/SideBar.html
index 95ad4e9..a545c94 100644
--- a/97suifangqa/apps/indicator/templates/indicator/SideBar.html
+++ b/97suifangqa/apps/indicator/templates/indicator/SideBar.html
@@ -2,12 +2,13 @@
 {% load static from staticfiles %}
 
 {% block title %}
-边栏 | 随访工具 | 97 随访
+边栏 | 随访工具 | 医时代
 {% endblock %}
 
 {% block css %}
   <link rel="stylesheet" type="text/css" href="{% static "css/normalize.css" %}"/>
   <link rel="stylesheet" type="text/css" href="{% static "css/sidebar.css" %}"/>
+  <link rel="stylesheet" type="text/css" href="{% static "css/nav.css" %}"/>
 {% endblock %}
 
 {% block scripts %}
@@ -16,13 +17,32 @@
 
 {% block page %}
   <div id="sidebar_container">
+    
     <!-- ====================== navigation ====================== -->
-    <div id="nav_container">
+    <nav id="nav-ribbon" role="navigation">
+	<div class="controls-wrap">
+		<div class="head-background"></div>
+		<div class="links-wrap">
+			<ul class="links inline">
+				<li class="first"><a href="/blog/index" target="_blank">返回首页</a></li>
+				<!--li><a href="{% url list_blogs %}">知识库</a></li-->
+				<li><a href="/indicator/status" target="_blank">随访工具</a></li>
+				<!--li class="last"><a href="">我的花费</a></li-->
+			</ul>
+		</div>
+		<div class="tail">导航</div>
+		<div class="tail-cut"></div>
+	</div>
+</nav>
+    
+    
+    
+    <!--div id="nav_container">
       <div class="head-background"></div>
       <div class="hidden_navs">
         <ul>
-          <li><a href="javascript:void(0)">首页</a></li>
-          <li><a href="javascript:void(0)">医学知识</a></li>
+          <li><a href="/blog">首页</a></li>
+          <li><a href="/indicator/status">随访工具</a></li>
         </ul>
       </div>
       <div class="default_nav">
@@ -30,37 +50,57 @@
           <a href="javascript:void(0)">导航</a>
         </div>
         <div class="tail-cut"></div>
-        <div class="curr_nav">随访工具</div>
-      </div>
+        <!--div class="curr_nav">随访工具</div-->
+      <!--/div>
     </div>
-    <div class="clear"></div>
+    <div class="clear"></div-->
 
     <!-- ====================== compare ====================== -->
     <div id="compare_container">
-      <div class="post-question">
+      <!--div class="post-question">
         <form action="" class="searchdiv" method="get">
           <input type="text" value="" class="question" placeholder="在这里搜索关键词" name="q">
-          <input type="submit" class="submit" value="提问">
+          <input type="submit" class="submit" value="搜 索">
         </form>
-      </div>
+      </div-->
       <div class="similar_container">
-	<div class="vertical_bar_component">
+	<!--div class="vertical_bar_component">
 	  <img src="{% static "images/gradient_bar.png" %}" />
-	</div>
-        <div class="similar_content">
+	</div-->
+        <h3 style="font-szie:20px;margin-bottom:5px;">为您推荐临床治疗经验：</h3>
+        <div class="related-questions">
+		<a href="/blog/2/" target="_blank">e抗原阳性慢乙肝患者接受聚乙二醇干扰素alfa治疗前哪些起始因素可以预测未来疗效好与坏</a><br><br>
+		<span>Gastroenterology 胃肠病学      推荐指数：78%</span>
+		</div>
+		
+		<div class="related-questions">
+		<a href="">聚乙二醇干扰素alfa-2a治疗时，病毒和e抗原到底是谁更重要？还是应该结合地去看？</a><br><br>
+		<span>Hepatology 肝脏病学     推荐指数：74%</span>
+		</div>
+		
+		<div class="related-questions">
+		<a href="/blog/3/" target="_blank">用聚乙二醇干扰素治疗B型与C型e抗原阳性慢乙肝患者时，哪些患者乙肝e抗原血清学转换几率低？和疗程和剂量有哪些关系？</a><br><br>
+		<span>Hepatology 肝脏病学     推荐指数：70%</span>
+		</div>
+        
+      </div>
+      
+        <!--div class="similar_content">
           <div class="similar_title">经比对，下文中的被研究患者与您很像：</div>
-          <div class="specifix_content" id="specifix_content1"><div class="specifix_text">有 80% 的患者有感到头疼</div></div>
+          <div class="specifix_content" id="specifix_content1"><div class="specifix_text">聚乙二醇干扰素alfa-2a治疗e抗原（HBeAg）阳性慢乙肝患者时，e抗原与病毒（DNA）预测疗效</div></div>
           <div class="specifix_content" id="specifix_content2"><div class="specifix_text">有 10% 的患者有感到头疼并且也感觉到肌疼</div></div>
           <div class="specifix_content" id="specifix_content3"><div class="specifix_text">有 20% 的患者ALT到达过正常值</div></div>
           <div class="specifix_content" id="specifix_content4"><div class="specifix_text">有 3% 的患者有感到肌疼</div></div>
+        </div-->
+    </div>
+    <div class="clear"></div>
+      
+        <div>
+        	<a href="/blog" target="_blank"><input type="submit" value="推荐更多" class="submit"></a>
         </div>
-      </div>
-      <div class="clear"></div>
-      <div class="compare_btn">
-        <div class="compare_btn_in">比对文献</div>
-      </div>
+     
       <div class="logo_container">
-        <img src="{% static "images/slilogo.png" %}" />
+        <a href="../../blog/index" target="_blank"><img src="{% static "images/slilogo.png" %}" /></a>
       </div>
     </div>
 
diff --git a/97suifangqa/apps/indicator/templates/indicator/index.html b/97suifangqa/apps/indicator/templates/indicator/index.html
index 408ce67..57af738 100644
--- a/97suifangqa/apps/indicator/templates/indicator/index.html
+++ b/97suifangqa/apps/indicator/templates/indicator/index.html
@@ -2,7 +2,7 @@
 {% load static from staticfiles %}
 
 {% block title %}
-首页 | 随访工具 | 97 随访
+首页 | 随访工具 | 医时代
 {% endblock %}
 
 {% block body %}
diff --git a/97suifangqa/apps/indicator/templates/indicator/nav-ribbon.html b/97suifangqa/apps/indicator/templates/indicator/nav-ribbon.html
new file mode 100644
index 0000000..bf8d690
--- /dev/null
+++ b/97suifangqa/apps/indicator/templates/indicator/nav-ribbon.html
@@ -0,0 +1,15 @@
+<nav id="nav-ribbon" role="navigation">

+	<div class="controls-wrap">

+		<div class="head-background"></div>

+		<div class="links-wrap">

+			<ul class="links inline">

+				<li class="first"><a href="/blog">首页</a></li>

+				<!--li><a href="{% url list_blogs %}">知识库</a></li-->

+				<li><a href="/indicator/status">随访工具</a></li>

+				<!--li class="last"><a href="">我的花费</a></li-->

+			</ul>

+		</div>

+		<div class="tail">导航</div>

+		<div class="tail-cut"></div>

+	</div>

+</nav>
\ No newline at end of file
diff --git a/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html b/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html
index 4bdac43..9859e0d 100644
--- a/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html
+++ b/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html
@@ -2,7 +2,7 @@
 {% load static from staticfiles %}
 
 {% block title %}
-取消关注卡片提示 | 随访工具 | 97 随访
+取消关注卡片提示 | 随访工具 | 医时代
 {% endblock %}
 
 {% block css %}
diff --git a/97suifangqa/apps/indicator/templates/indicator/popup/EditHistoryData.html b/97suifangqa/apps/indicator/templates/indicator/popup/EditHistoryData.html
index efe8588..e310fab 100644
--- a/97suifangqa/apps/indicator/templates/indicator/popup/EditHistoryData.html
+++ b/97suifangqa/apps/indicator/templates/indicator/popup/EditHistoryData.html
@@ -3,7 +3,7 @@
 {% load dict_get %}
 
 {% block title %}
-编辑历史数据 | 随访工具 | 97 随访
+编辑历史数据 | 随访工具 | 医时代
 {% endblock %}
 
 {% block css %}
@@ -41,7 +41,8 @@
         'FLOAT_TYPE': '{{ indicator_obj.FLOAT_TYPE }}',
         'RANGE_TYPE': '{{ indicator_obj.RANGE_TYPE }}',
         'FLOAT_RANGE_TYPE': '{{ indicator_obj.FLOAT_RANGE_TYPE }}',
-        'PM_TYPE': '{{ indicator_obj.PM_TYPE }}'
+        'PM_TYPE': '{{ indicator_obj.PM_TYPE }}',
+        'KIND_TYPE': '{{ indicator_obj.KIND_TYPE }}'
     };
     var data_type = '{{ indicator_obj.dataType }}';
     // indicator record
@@ -64,7 +65,7 @@
       <div class="refer_range">
         <span class="refer_text">{{ indicator_dict|dict_get:"ref_text" }}</span>
         <span class="refer_value">{{ indicator_dict|dict_get:"ref_value"|safe }}</span>
-        <span class="data_unit">{% if indicator_dict|dict_get:"std_unit_symbol" %}({{ indicator_dict|dict_get:"std_unit_symbol" }}){% endif %}</span>
+        <span class="data_unit">{% if indicator_dict|dict_get:"std_unit_symbol" %}{{ indicator_dict|dict_get:"std_unit_symbol" }}{% endif %}</span>
       </div>
       <div class="edit_data">
         <div class="date">
@@ -73,8 +74,8 @@
         </div>
         <div class="data">
           <span class="prompt">结果</span>
-          <span class="data_value">{{ record_dict|dict_get:"value_html"|safe }}</span>
-          <span class="data_unit">{% if record_dict|dict_get:"unit_symbol" %}({{ record_dict|dict_get:"unit_symbol" }}){% endif %}</span>
+          <span class="data_value">{{ record_dict|dict_get:"value_html"|safe }}&nbsp;</span>
+          <span class="data_unit">{% if record_dict|dict_get:"unit_symbol" %}{{ record_dict|dict_get:"unit_symbol" }}{% endif %}</span>
         </div>
         <div class="state">
           <span class="prompt">状态</span>
@@ -91,7 +92,19 @@
         </div>
         <input type="button" id="edit_btn" value="修改记录" />
         <input type="button" id="delete_btn" value="删除记录" />
+        <div style="clear:both;"></div>
       </div>
+
+      <div class="delete_prompt" style="display:none;">
+        <div class="prompt_btns" id="cancel_delete_btn">
+          <img alt="cancel_delete" src="{% static "images/cancel_edit.png" %}" />
+        </div>
+        <div class="prompt_btns" id="confirm_delete_btn">
+          <img alt="confirm_delete" src="{% static "images/confirm_edit.png" %}" />
+        </div>
+        <div class="prompt">确认删除该记录？</div>
+      </div>
+
       <div class="editing_data">
         {% csrf_token %}
         <div class="date">
@@ -102,6 +115,7 @@
           </div>
         </div>
         <div class="data data_type_{{ indicator_obj.dataType }}">
+          
           <div class="prompt">修改记录</div>
           {% if indicator_obj.dataType == indicator_obj.INTEGER_TYPE %}
           {# INTEGER_TYPE #}
@@ -123,12 +137,15 @@
             <input type="radio" id="plus_r" name="pm_data" value="+" />
             <label for="plus_r">阳性(+)</label>
           </div>
+          {% elif indicator_obj.dataType == indicator_obj.KIND_TYPE %}
+          {# KIND_TYPE #}
+          TODO
           {% else %}
           {# UNKNOWN TYPE #}
           ERROR: unknown data type
           {% endif %}
         </div>
-        <div class="data_unit">{% if record_dict|dict_get:"unit_symbol" %}({{ record_dict|dict_get:"unit_symbol" }}){% endif %}</div>
+        <div class="data_unit">{% if record_dict|dict_get:"unit_symbol" %}{{ record_dict|dict_get:"unit_symbol" }}{% endif %}</div>
         <div class="reason">
           <div class="prompt">修改原因</div>
           <input class="reason_input to_validate" type="text" value="" />
diff --git a/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html b/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html
index 0d3f62c..0b5f708 100644
--- a/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html
+++ b/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html
@@ -2,7 +2,7 @@
 {% load static from staticfiles %}
 
 {% block title %}
-指标注释 | 随访工具 | 97 随访
+指标注释 | 随访工具 | 医时代
 {% endblock %}
 
 {% block css %}
@@ -68,6 +68,18 @@
 
 {% block page %}
 	<div id="index_desc_container">
+    <!-- 直接使用 indicator 的 description 信息 -->
+		<div class="index_desc_title_line">
+      <div class="index_desc_title">
+        {{ indicator.name }}
+      </div>
+			<div class="index_desc_close"></div>
+		</div>
+    <div class="index_desc_content">
+      {{ indicator.description|safe }}
+    </div>
+    <!-- 使用与 indicator 关联的 annotation 来提供详情 -->
+    {% comment %}
 		<div class="index_desc_title_line">
       <div class="index_desc_title">
         {% if annotation_not_found %}
@@ -85,6 +97,7 @@
       {{ annotation.detail|safe }}
       {% endif %}
     </div>
+    {% endcomment %}
     <div class="collection" id="collection_btn">
       {% if is_collected %}
       点击取消收藏 (已有{{ collected_times }}人收藏)
@@ -92,9 +105,9 @@
       收藏该注释 (已有{{ collected_times }}人收藏)
       {% endif %}
     </div>
-    <div class="go_library">
+    <!--div class="go_library">
       <input type="button" class="go_library_btn" value="前往医学知识库" />
-    </div>
+    </div-->
 	</div>
 {% endblock page %}
 
diff --git a/97suifangqa/apps/indicator/templates/indicator/show_indicator.html b/97suifangqa/apps/indicator/templates/indicator/show_indicator.html
index 0ecd027..ea70b26 100644
--- a/97suifangqa/apps/indicator/templates/indicator/show_indicator.html
+++ b/97suifangqa/apps/indicator/templates/indicator/show_indicator.html
@@ -32,6 +32,10 @@
       <td>{{ object.addByUser.username }}</td>
     </tr>
     <tr>
+      <td>type:</td>
+      <td>{{ object.type }}</td>
+    </tr>
+    <tr>
       <td>categories_name:</td>
       <td>
         {% for c in object.categories.all %}
diff --git a/97suifangqa/apps/indicator/templates/indicator/show_record.html b/97suifangqa/apps/indicator/templates/indicator/show_record.html
index 49c7918..14a3671 100644
--- a/97suifangqa/apps/indicator/templates/indicator/show_record.html
+++ b/97suifangqa/apps/indicator/templates/indicator/show_record.html
@@ -44,6 +44,10 @@
       <td>{{ object.val_min }}</td>
     </tr>
     <tr>
+      <td>kind:</td>
+      <td>{{ object.kind }}</td>
+    </tr>
+    <tr>
       <td>notes:</td>
       <td>{{ object.notes }}</td>
     </tr>