Merge branch 'featrue/duxin' into 'test'

hospitalid替换成doctorid

See merge request !27

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -58,7 +58,6 @@ class LevelTwoState extends BaseState<LevelTwoPage>
 
   @override
   void initState() {
-    // DioUtil.getInstance().setProxy("172.30.8.245");
     super.initState();
     _model.plan_id = widget.planId;
     _model.init(() {
@@ -548,7 +547,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                     context, widget.PAGE_NAME, "${widget.planId}", "", "");
               },
               child: Container(
-                margin: EdgeInsets.only(left: 15,right: 15),
+                margin: EdgeInsets.only(left: 15, right: 15),
                 width: ScreenUtil().setWidth(137),
                 height: 40,
                 decoration: BoxDecoration(
@@ -557,7 +556,6 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                 alignment: Alignment.center,
                 child: baseText("获取底价", 14, Colors.white, bold: true),
               )),
-
         ],
       ),
     );

lib/ClueModel/page/mechanismBox/MechanismBoxPage.dart

@@ -226,10 +226,10 @@ class MechanismBox implements IBottomPicker {
         behavior: HitTestBehavior.opaque,
         onTap: () {
           print(hospital.toJson());
-          if (doctor_ids.indexOf(hospital.hosiptalId) != -1) {
-            doctor_ids.remove(hospital.hosiptalId);
+          if (doctor_ids.indexOf(hospital.doctorId) != -1) {
+            doctor_ids.remove(hospital.doctorId);
           } else {
-            doctor_ids.add(hospital.hosiptalId);
+            doctor_ids.add(hospital.doctorId);
           }
           hospital.isCheck = !hospital.isCheck;
           focusNode.unfocus();
@@ -388,12 +388,8 @@ class MechanismBox implements IBottomPicker {
                             NativeToast.showNativeToast('请选择1-3个机构咨询');
                           } else {
                             if (txt.isNotEmpty) {
-                              print(doctor_ids.join(','));
                               _model.sendMessage(
                                   doctor_ids.join(','), txt, plan_id, (i) {
-                                print(doctor_ids);
-                                print(txt);
-                                print(plan_id);
                                 if (i == 0) {
                                   dismissCall();
                                   textController.text = '';

lib/ClueModel/server/entity/LevelOneFeedList.dart

@@ -202,6 +202,7 @@ class BaseAttrs {
 class Hospital {
   String portrait;
   String hosiptalId;
+  String doctorId;
   String name;
   String minPrice;
   String maxPrice;
@@ -224,6 +225,7 @@ class Hospital {
   Hospital.fromJson(Map<String, dynamic> json) {
     portrait = json['portrait'];
     hosiptalId = json['hospital_id'];
+    doctorId = json['doctor_id'];
     name = json['name'];
     minPrice = json['min_price'];
     maxPrice = json['max_price'];
@@ -237,6 +239,7 @@ class Hospital {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     data['portrait'] = this.portrait;
     data['hospital_id'] = this.hosiptalId;
+    data['doctor_id'] = this.doctorId;
     data['name'] = this.name;
     data['min_price'] = this.minPrice;
     data['max_price'] = this.maxPrice;