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

controllers/sg/his_api_controller.go

@@ -1743,7 +1743,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, 2100)
+		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2495)
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)