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

controllers/sg/his_api_controller.go

@@ -1000,7 +1000,7 @@ func (c *HisApiController) GetBatchSettleList() {
 	//stage, _ := c.GetInt64("stage")
 	orders, _ := service.GetAllHisOrder(org_id)
 	for _, item := range orders {
-		order_id := item.PatientId
+		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)
 		roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)