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

controllers/sg/his_api_controller.go

@@ -996,8 +996,8 @@ func (c *HisApiController) GetSettleList() {
 
 func (c *HisApiController) GetBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	//stage, _ := c.GetInt64("stage")
-	orders, _ := service.GetAllHisOrder(org_id)
+	stage, _ := c.GetInt64("stage")
+	orders, _ := service.GetAllHisOrderErr(org_id, stage)
 
 	for _, item := range orders {
 		order_id := item.ID
@@ -1700,7 +1700,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg + "解析失败",
 				Status:    1,
 				PatientId: order_id,
-				Stage:     30,
+				Stage:     40,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue
@@ -1715,7 +1715,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     30,
+				Stage:     40,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue