Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/moonclub/models/Docters.php

@@ -8,8 +8,8 @@
  */
 class Docters extends MongoAr{
   public $_id;
-  public $diagnos_order_id; // 诊脉编号
-  public $order;// 订单编号
+  public $num; // 诊脉编号
+  public $xyh_order_id;// 订单编号
   public $status;// 未预约 0 已预约 1 已诊脉
   public $user_name;// 医生姓名
   public $diagnos_address;// 诊脉地址
@@ -51,8 +51,8 @@ class Docters extends MongoAr{
   public function parseRow($row,$output=array()){
     $newRow = array();
     $newRow['id'] = (string)$row['_id'];
-    $newRow['diagnos_order_id'] = CommonFn::get_val_if_isset($row,'diagnos_order_id','');
-    $newRow['order'] = CommonFn::get_val_if_isset($row,'order','');
+    $newRow['num'] = CommonFn::get_val_if_isset($row,'num','');
+    $newRow['xyh_order_id'] = CommonFn::get_val_if_isset($row,'xyh_order_id','');
     $newRow['status'] = CommonFn::get_val_if_isset($row,'status','');
     $newRow['user_name'] = CommonFn::get_val_if_isset($row,'user_name','');
     $newRow['diagnos_address'] = CommonFn::get_val_if_isset($row,'diagnos_address','');