Merge branch 'develop' into product

app/containers/quickOrder/QuickOrderPage.js

@@ -1216,8 +1216,8 @@ class EquipConsuPage extends Component {
                                     R.map(R.applySpec({
                                     R.map(R.applySpec({
                                         value: R.prop('customer_doctor'),
                                         value: R.prop('customer_doctor'),
                                         name: R.prop('customer_doctor')
                                         name: R.prop('customer_doctor')
-                                    }),
-                                    R.filter(R.compose(isNotBlank, R.prop('customer_doctor'))))
+                                    })),
+                                    R.filter(R.compose(isNotBlank, R.prop('customer_doctor')))
                                 )(ship)
                                 )(ship)
                             }
                             }
                         }
                         }