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

controllers/sg/his_api_controller.go

 
 func (c *HisApiController) GetBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	stage, _ := c.GetInt64("stage")
-	orders, _ := service.GetAllHisOrderErr(org_id, stage)
+	//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)
 				ErrMsg:    res.ErrMsg + "解析失败",
 				Status:    1,
 				PatientId: order_id,
-				Stage:     21,
+				Stage:     30,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue
 				Mtime:     time.Now().Unix(),
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
-				PatientId: item.ID,
-				Stage:     20,
+				PatientId: order_id,
+				Stage:     30,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue

service/his_service.go

 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND setl_id <> '' AND id >= 2499", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND setl_id <> '' AND id > 35355 AND  fa_piao_code <> ''", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {