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

controllers/sg/his_api_controller.go

@@ -996,11 +996,11 @@ func (c *HisApiController) GetSettleList() {
 
 func (c *HisApiController) GetBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	orders, _ := service.GetAllHisOrder(org_id)
+	orders, _ := service.GetAllHisOrderErr(org_id)
 	//admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	for _, item := range orders {
-		order_id := item.ID
+		order_id := item.PatientId
 		order, _ := service.GetHisOrderByIDTwo(order_id)
 		roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
@@ -1699,8 +1699,8 @@ func (c *HisApiController) GetBatchSettleList() {
 				Mtime:     time.Now().Unix(),
 				ErrMsg:    res.ErrMsg + "解析失败",
 				Status:    1,
-				PatientId: item.ID,
-				Stage:     20,
+				PatientId: order_id,
+				Stage:     21,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue

service/his_service.go

@@ -1367,3 +1367,7 @@ 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
 	return
 }
+func GetAllHisOrderErr(org_id int64) (his []*models.HisOrderError, err error) {
+	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = ? AND status = 1 AND stage = 21", org_id).Find(&his).Error
+	return
+}