Merge branch 'master' of https://gitee.com/v_cms/zyt

server/app/adminapi/controller/doctor/AppointmentController.php

@@ -64,6 +64,24 @@ class AppointmentController extends BaseAdminController
         return $this->dataLists(new AppointmentLists());
     }
 
+    /**
+     * 后台编辑挂号记录（消费者处方-挂号列表等，perms: doctor.appointment/edit）
+     */
+    public function edit()
+    {
+        $params = (new AppointmentValidate())->post()->goCheck('adminEdit');
+        $post = $this->request->post();
+        if (array_key_exists('assistant_id', $post)) {
+            $params['assistant_id'] = $post['assistant_id'];
+        }
+        $result = AppointmentLogic::adminEdit($params, $this->adminId, $this->adminInfo);
+        if ($result === false) {
+            return $this->fail(AppointmentLogic::getError());
+        }
+
+        return $this->success('保存成功');
+    }
+
     /**
      * @notes 预约详情
      * @return \think\response\Json

server/app/adminapi/controller/stats/CommissionSettlementController.php

@@ -32,6 +32,8 @@ use app\adminapi\logic\stats\YejiStatsLogic;
 
  * - POST stats.commissionSettlement/confirmFinalize
 
+ * - POST stats.commissionSettlement/confirmRevoke
+
  * - GET  stats.commissionSettlement/deptOptions
 
  * - GET  stats.commissionSettlement/channelOptions
@@ -106,6 +108,16 @@ class CommissionSettlementController extends BaseAdminController
 
 
 
+    public function confirmRevoke()
+
+    {
+
+        return $this->data(YejiStatsLogic::commissionSettlementConfirmRevoke($this->request->post(), $this->adminId, $this->adminInfo));
+
+    }
+
+
+
     public function deptOptions()
 
     {

server/app/adminapi/controller/tcm/PrescriptionOrderController.php

@@ -20,6 +20,14 @@ class PrescriptionOrderController extends BaseAdminController
         return $this->dataLists(new PrescriptionOrderLists());
     }
 
+    /**
+     * 处方业务订单导出（与 lists 相同筛选条件，Excel；参数 export=1 预估 export=2 下载）
+     */
+    public function export()
+    {
+        return $this->dataLists(new PrescriptionOrderLists());
+    }
+
     /**
      * 指定诊单下可关联的支付单（待支付/已支付，创建/编辑业务订单时多选关联）
      */