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

controllers/sz/sz_his_api_controller.go

@@ -9,8 +9,7 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
-	"github.com/axgle/mahonia"
-	"math/rand"
+
 
 	//"github.com/axgle/mahonia"
 	"math"
@@ -460,6 +459,8 @@ func (c *SZHisApiController) ReadCard() {
 //		if adminRole.ID == 0 {
 //
 //			doctor_name = ""
+//			doctor_code = "1001"
+//			doctor_name = ""
 //			doctor_code = ""
 //
 //		} else {
@@ -2799,8 +2800,12 @@ func (c *SZHisApiController) GetDrugList() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	fmt.Println(orgId)
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(orgId, admin_user_id)
+	fmt.Println("222222222222", roles)
+	fmt.Println("rolessssssss", roles.UserName)
 	ids := c.GetString("ids")
+
 	stringarr := strings.Split(ids, ",")
 	idss := make([]int64, 0)
 	for _, item := range stringarr {
@@ -2826,7 +2831,7 @@ func (c *SZHisApiController) GetDrugList() {
 	var doctor_name string
 	var doctor_code string
 
-	doctor_name = "黄亦轩"
+	doctor_name = roles.UserName
 	doctor_code = "1001"
 
 	var isSuccess bool = true
@@ -2892,6 +2897,8 @@ func (c *SZHisApiController) GetTreatmentProject() {
 	ids := c.GetString("ids")
 	stringarr := strings.Split(ids, ",")
 	idss := make([]int64, 0)
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(orgId, admin_user_id)
 	for _, item := range stringarr {
 		itemsss, _ := strconv.ParseInt(item, 10, 64)
 		id := int64(itemsss)
@@ -2905,7 +2912,7 @@ func (c *SZHisApiController) GetTreatmentProject() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
-	doctor_name = "黄亦轩"
+	doctor_name = roles.UserName
 	doctor_code = "1001"
 	var isSuccess bool = true
 	for _, item := range list {
@@ -2960,6 +2967,8 @@ func (c *SZHisApiController) GetRevocation() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	id, _ := c.GetInt64("id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(orgId, admin_user_id)
 	//用来区分是药品的撤销还是耗材的撤销  1.药品  2.诊疗项目 3.材料 5.辅助器具项目
 	is_mark, _ := c.GetInt64("is_mark")
 	type_id, _ := c.GetInt64("type_id")
@@ -2974,7 +2983,7 @@ func (c *SZHisApiController) GetRevocation() {
 			var doctor_name string
 			var doctor_code string
 
-			doctor_name = "黄亦轩"
+			doctor_name = roles.UserName
 			doctor_code = "1001"
 
 			var pagesize int = 50
@@ -3078,7 +3087,7 @@ func (c *SZHisApiController) GetRevocation() {
 			var doctor_name string
 			var doctor_code string
 
-			doctor_name = "黄亦轩"
+			doctor_name = roles.UserName
 			doctor_code = "1001"
 
 			var isSuccess bool = true
@@ -3143,7 +3152,7 @@ func (c *SZHisApiController) GetRevocation() {
 			var doctor_name string
 			var doctor_code string
 
-			doctor_name = "黄亦轩"
+			doctor_name = roles.UserName
 			doctor_code = "1001"
 
 			var pagesize int = 50
@@ -3214,7 +3223,7 @@ func (c *SZHisApiController) GetRevocation() {
 		fmt.Println("is_marke", is_mark)
 		//备案
 		if is_mark == 0 {
-			fmt.Println("进来饿了吗32222222")
+
 			adminUserInfo := c.GetAdminUserInfo()
 			orgId := adminUserInfo.CurrentOrgId
 
@@ -3224,7 +3233,7 @@ func (c *SZHisApiController) GetRevocation() {
 			miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 			var doctor_name string
 			var doctor_code string
-			doctor_name = "黄亦轩"
+			doctor_name = roles.UserName
 			doctor_code = "1001"
 			var isSuccess bool = true
 			for _, item := range list {
@@ -3286,7 +3295,7 @@ func (c *SZHisApiController) GetRevocation() {
 			var doctor_name string
 			var doctor_code string
 
-			doctor_name = "黄亦轩"
+			doctor_name = roles.UserName
 			doctor_code = "1001"
 
 			var pagesize int = 50
@@ -3367,7 +3376,7 @@ func (c *SZHisApiController) GetRevocation() {
 			var doctor_name string
 			var doctor_code string
 
-			doctor_name = "黄亦轩"
+			doctor_name = roles.UserName
 			doctor_code = "1001"
 
 			var isSuccess bool = true
@@ -3429,6 +3438,8 @@ func (c *SZHisApiController) GetDoctorList() {
 	fmt.Println("or3gi", orgid)
 	ids := c.GetString("ids")
 	fmt.Println("ids2222222222", ids)
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(orgid, admin_user_id)
 	stringarr := strings.Split(ids, ",")
 	idss := make([]int64, 0)
 	for _, item := range stringarr {
@@ -3455,7 +3466,7 @@ func (c *SZHisApiController) GetDoctorList() {
 	var doctor_name string
 	var doctor_code string
 
-	doctor_name = "黄亦轩"
+	doctor_name = roles.UserName
 	doctor_code = "1001"
 
 	var isSuccess bool = true
@@ -3523,7 +3534,7 @@ func (c *SZHisApiController) GetDoctorList() {
 		}
 		if res.Transreturncode == "00000000" {
 			//批量插入数据
-			_, err := service.UpdateAdminUserRoleById(item.AdminUserId)
+			_, err := service.UpdateAdminUserRoleById(item.AdminUserId, orgid)
 			fmt.Println("err2222", err)
 		} else {
 			isSuccess = false
@@ -3548,7 +3559,8 @@ func (c *SZHisApiController) GetMedicalList() {
 	id, _ := c.GetInt64("id")
 	fmt.Println("id22222222", id)
 	is_mark, _ := c.GetInt64("is_mark")
-
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(orgId, admin_user_id)
 	//去登记
 	if is_mark == 0 {
 		list, _ := service.GetDoctorListByDetail(orgId, id)
@@ -3567,18 +3579,54 @@ func (c *SZHisApiController) GetMedicalList() {
 		var doctor_name string
 		var doctor_code string
 
-		doctor_name = "黄亦轩"
+		doctor_name = roles.UserName
 		doctor_code = "1001"
 
 		var isSuccess bool = true
 
 		for _, item := range list {
 			fmt.Println("医护类别", item.Mobile)
-			sex := strconv.FormatInt(item.Sex, 10)
-			card_type := strconv.FormatInt(item.CardType, 10)
-			is_active := strconv.FormatInt(item.IsActive, 10)
 
 			detail := &models.DocDetail{
+				UserName:                                item.UserName,                                                       //医护姓名
+				RoleId:                                  item.Name,                                                           //医护人员类别
+				Sex:                                     strconv.FormatInt(item.Sex, 10),                                     //性别
+				CardType:                                strconv.FormatInt(item.CardType, 10),                                //证件类型
+				IdCard:                                  item.IdCard,                                                         //证件号码
+				Phone:                                   item.Mobile,                                                         //联系电话
+				WorkMajorName:                           item.WorkMajorName,                                                  // 现从事专业名称
+				Nation:                                  item.Nation,                                                         //民族
+				BirthDay:                                20201022,                                                            // 出生日期
+				WorkTime:                                20201022,                                                            //参加工作日期
+				Education:                               strconv.FormatInt(item.Education, 10),                               //学历
+				StudyMajorName:                          item.StudyMajorName,                                                 //所学的专业名称
+				CertificateCode:                         item.MedicalCode,                                                    //医（药）师执业证书编码
+				MedicalCode:                             item.DoctorCode,                                                     //医（药）师资格证编码
+				MedicalRangeCode:                        strconv.FormatInt(item.DoctorRangeCode, 10),                         //医师执业范围代码
+				MedicalLevel:                            strconv.FormatInt(item.DoctorLevel, 10),                             //医生执业资格证中的医师级别
+				TypeJob:                                 strconv.FormatInt(item.DoctorTypeJob, 10),                           //医生执业资格证中的执业类别
+				DoctorNumber:                            item.DoctorNumber,                                                   //医保医师编号
+				Licensing:                               strconv.FormatInt(item.Licensing, 10),                               //多点执业标志
+				DoctorServiceStatus:                     "",                                                                  //医师医保服务资格状态
+				MonitoringLevel:                         "",                                                                  //监控等级
+				DrugPsychotropicSubstances:              "",                                                                  //毒麻精神药品资格
+				HealthCareCode:                          "",                                                                  // 母婴保健技术考核合格证书编号
+				PlanningTechnicalServiceCode:            "",                                                                  //计划生育技术服务人员合格证编号
+				PharmacistType:                          "",                                                                  //药师类别
+				PharmacistPracticeCategory:              "",                                                                  //药师执业类别
+				PharmacistsLicensing:                    "",                                                                  //药师执业范围
+				PharmacistRegistrationNumber:            "",                                                                  //执业药师注册证编号
+				OfficeCode:                              "",                                                                  //科室编码
+				JobNumber:                               item.JobNumber,                                                      //工号
+				PostName:                                "",                                                                  //职位名称
+				TechnicalJobLevelCode:                   "",                                                                  //专业技术职务级别编码
+				IsActive:                                strconv.FormatInt(item.IsActive, 10),                                //在职与否
+				PrescriptionQualificationIdentification: strconv.FormatInt(item.PrescriptionQualificationIdentification, 10), //处方资格标识
+				IdentificationOutpatients:               strconv.FormatInt(item.IdentificationOutpatients, 10),               //门诊大病医师标识
+				OutpatientIllnessCategory:               item.OutpatientIllnessCategory,                                      //门诊大病类别
+				StartTime:                               20201010,                                                            //开始日期
+				StaffCode:                               "",                                                                  //医护人员编码
+				EndTime:                                 0,                                                                   // 结束日期
 				UserName:                     item.UserName,
 				RoleId:                       item.Name,
 				Sex:                          sex,
@@ -3636,7 +3684,7 @@ func (c *SZHisApiController) GetMedicalList() {
 			}
 			if res.Transreturncode == "00000000" {
 				//登记成功
-				service.UpdateAdminUserRoleById(item.ID)
+				service.UpdateAdminUserRoleById(item.ID, orgId)
 
 			} else {
 				isSuccess = false
@@ -3677,6 +3725,45 @@ func (c *SZHisApiController) GetMedicalList() {
 		for _, item := range list {
 			fmt.Println("医护类别", item.Name)
 			detail := &models.DocDetail{
+				UserName:                                item.UserName,                                                       //医护姓名
+				RoleId:                                  item.Name,                                                           //医护人员类别
+				Sex:                                     strconv.FormatInt(item.Sex, 10),                                     //性别
+				CardType:                                strconv.FormatInt(item.CardType, 10),                                //证件类型
+				IdCard:                                  item.IdCard,                                                         //证件号码
+				Phone:                                   item.Mobile,                                                         //联系电话
+				WorkMajorName:                           item.WorkMajorName,                                                  // 现从事专业名称
+				Nation:                                  item.Nation,                                                         //民族
+				BirthDay:                                20201022,                                                            // 出生日期
+				WorkTime:                                20201022,                                                            //参加工作日期
+				Education:                               strconv.FormatInt(item.Education, 10),                               //学历
+				StudyMajorName:                          item.StudyMajorName,                                                 //所学的专业名称
+				CertificateCode:                         item.MedicalCode,                                                    //医（药）师执业证书编码
+				MedicalCode:                             item.DoctorCode,                                                     //医（药）师资格证编码
+				MedicalRangeCode:                        strconv.FormatInt(item.DoctorRangeCode, 10),                         //医师执业范围代码
+				MedicalLevel:                            strconv.FormatInt(item.DoctorLevel, 10),                             //医生执业资格证中的医师级别
+				TypeJob:                                 strconv.FormatInt(item.DoctorTypeJob, 10),                           //医生执业资格证中的执业类别
+				DoctorNumber:                            item.DoctorNumber,                                                   //医保医师编号
+				Licensing:                               strconv.FormatInt(item.Licensing, 10),                               //多点执业标志
+				DoctorServiceStatus:                     "",                                                                  //医师医保服务资格状态
+				MonitoringLevel:                         "",                                                                  //监控等级
+				DrugPsychotropicSubstances:              "",                                                                  //毒麻精神药品资格
+				HealthCareCode:                          "",                                                                  // 母婴保健技术考核合格证书编号
+				PlanningTechnicalServiceCode:            "",                                                                  //计划生育技术服务人员合格证编号
+				PharmacistType:                          "",                                                                  //药师类别
+				PharmacistPracticeCategory:              "",                                                                  //药师执业类别
+				PharmacistsLicensing:                    "",                                                                  //药师执业范围
+				PharmacistRegistrationNumber:            "",                                                                  //执业药师注册证编号
+				OfficeCode:                              "",                                                                  //科室编码
+				JobNumber:                               item.JobNumber,                                                      //工号
+				PostName:                                "",                                                                  //职位名称
+				TechnicalJobLevelCode:                   "",                                                                  //专业技术职务级别编码
+				IsActive:                                strconv.FormatInt(item.IsActive, 10),                                //在职与否
+				PrescriptionQualificationIdentification: strconv.FormatInt(item.PrescriptionQualificationIdentification, 10), //处方资格标识
+				IdentificationOutpatients:               strconv.FormatInt(item.IdentificationOutpatients, 10),               //门诊大病医师标识
+				OutpatientIllnessCategory:               item.OutpatientIllnessCategory,                                      //门诊大病类别
+				StartTime:                               20201010,                                                            //开始日期
+				StaffCode:                               "",                                                                  //医护人员编码
+				EndTime:                                 0,                                                                   // 结束日期
 				StaffCode:                    "H27224269",
 				UserName:                     item.UserName,
 				RoleId:                       item.Name,
@@ -3735,7 +3822,7 @@ func (c *SZHisApiController) GetMedicalList() {
 			}
 			if res.Transreturncode == "00000000" {
 				//去撤销
-				service.UpdateAdminUserRoleById(item.ID)
+				service.UpdateAdminUserRoleById(item.ID, orgId)
 			} else {
 				isSuccess = false
 				//失败
@@ -3882,6 +3969,8 @@ func (c *SZHisApiController) GetGoodsList() {
 
 	ids := c.GetString("ids")
 	fmt.Println("ids2222222222", ids)
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(orgId, admin_user_id)
 	stringarr := strings.Split(ids, ",")
 	idss := make([]int64, 0)
 	for _, item := range stringarr {
@@ -3897,7 +3986,7 @@ func (c *SZHisApiController) GetGoodsList() {
 	var doctor_name string
 	var doctor_code string
 
-	doctor_name = "黄亦轩"
+	doctor_name = roles.UserName
 	doctor_code = "1001"
 
 	var isSuccess bool = true

models/his_models.go

@@ -1148,28 +1148,29 @@ func (MyGoodInformation) TableName() string {
 }
 
 type MySgjUserAdminRole struct {
-	ID                                      int64  `gorm:"column:id" json:"id" form:"id"`
-	AdminUserId                             int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	OrgId                                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	AppId                                   int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
-	RoleId                                  int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
-	UserName                                string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	Avatar                                  string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	UserType                                int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
-	UserTitle                               int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
-	Intro                                   string `gorm:"column:intro" json:"intro" form:"intro"`
-	Status                                  int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime                                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	UserTitleName                           string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
-	RoleIds                                 string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
-	Message                                 string `gorm:"column:message" json:"message" form:"message"`
-	Sex                                     int64  `gorm:"column:sex" json:"sex" form:"sex"`
-	Birthday                                int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	Sort                                    int64  `gorm:"column:sort" json:"sort" form:"sort"`
-	IsSort                                  int64  `gorm:"column:is_sort" json:"is_sort" form:"is_sort"`
-	Department                              string `gorm:"column:department" json:"department" form:"department"`
-	DepartmentId                            int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message       string `gorm:"column:message" json:"message" form:"message"`
+	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Sort          int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	IsSort        int64  `gorm:"column:is_sort" json:"is_sort" form:"is_sort"`
+	Department    string `gorm:"column:department" json:"department" form:"department"`
+	DepartmentId  int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+
 	Age                                     int64  `gorm:"column:age" json:"age" form:"age"`
 	Nation                                  string `gorm:"column:nation" json:"nation" form:"nation"`
 	CardType                                int64  `gorm:"column:card_type" json:"card_type" form:"card_type"`

service/sz_his_service.go

@@ -1429,10 +1429,10 @@ func UpdateMyProjectById(id int64) (models.MyHisProject, error) {
 	return project, err
 }
 
-func UpdateAdminUserRoleById(id int64) (models.MySgjUserAdminRole, error) {
+func UpdateAdminUserRoleById(id int64, orgid int64) (models.MySgjUserAdminRole, error) {
 
 	role := models.MySgjUserAdminRole{}
-	err = UserWriteDB().Model(&role).Where("admin_user_id = ?", id).Updates(map[string]interface{}{"is_mark = ?": 1}).Error
+	err = UserWriteDB().Model(&role).Where("admin_user_id = ? and org_id = ?", id, orgid).Updates(map[string]interface{}{"is_mark = ?": 1}).Error
 	return role, err
 }