Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -1736,7 +1736,7 @@ func (c *HisApiController) GetSettleListHospital() {
 }
 
 func (c *HisApiController) GetBatchSettleList() {
-	orders, _ := service.GetAllHisOrderErr(9504, 9504)
+	orders, _ := service.GetAllHisOrderErr(9504, 9505)
 	for _, item := range orders {
 		order_id := item.PatientId
 		order, _ := service.GetHisOrderByIDTwo(order_id)