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

controllers/sg/his_api_controller.go

@@ -997,7 +997,7 @@ func (c *HisApiController) GetSettleList() {
 func (c *HisApiController) GetBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
 	orders, _ := service.GetAllHisOrder(org_id)
-	admin_user_id, _ := c.GetInt64("admin_user_id")
+	//admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	for _, item := range orders {
 		order_id := item.ID
@@ -1005,7 +1005,7 @@ func (c *HisApiController) GetBatchSettleList() {
 		roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 		admin, _ := service.GetAdminUserByUserID(roles[0].AdminUserId)
-		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2495)
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 

service/his_service.go

@@ -1364,6 +1364,6 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 }
 
 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", 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 <> ''", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }