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

controllers/sg/his_api_controller.go

 }
 
 func (c *HisApiController) GetBatchSettleList() {
-	orders, _ := service.GetAllHisOrder(9504)
+	orders, _ := service.GetAllHisOrderErr(9504, 9504)
 	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)
 		var tempOpspdiseinfo2 service.OpspdiseinfoStruct
 		var tempOpspdiseinfos []service.OpspdiseinfoStruct
 
-		diagnosis_ids := strings.Split(order.Diagnosis, ",")
+		diagnosis_ids := strings.Split(his.Diagnosis, ",")
 		var config []*models.HisXtDiagnoseConfig
 		for _, item := range diagnosis_ids {
 			id, _ := strconv.ParseInt(item, 10, 64)
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     9504,
+				Stage:     9505,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue