拉取代码

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = prod
+runmode = dev
 
 #
 copyrequestbody = true

controllers/base_api_controller.go

@@ -90,7 +90,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibe.CreatedTime = 1538035409
 		subscibe.UpdatedTime = 1538035409
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
+		subscibes[9671] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = org_id
 		adminUserInfo.CurrentAppId = 8642
@@ -206,7 +206,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibe.CreatedTime = 1538035409
 		subscibe.UpdatedTime = 1538035409
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
+		subscibes[9671] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = org_id
 		adminUserInfo.AdminUser = &userAdmin

controllers/sz/sz_his_api_controller.go

@@ -1519,10 +1519,12 @@ func (c *SZHisApiController) GetSettleAccounts() {
 
 func (c *SZHisApiController) GetDrugList() {
 
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
 	//获取药品库数据
-	list, _ := service.GetDrugList(10028)
+	list, _ := service.GetDrugList(orgId)
 	//获取药品剂型
-	drugs, _ := service.GetDrugDosageForm(10028)
+	drugs, _ := service.GetDrugDosageForm(orgId)
 	for _, item := range list {
 		fmt.Println(item.DrugDosageForm)
 		for _, it := range drugs {
@@ -1533,7 +1535,7 @@ func (c *SZHisApiController) GetDrugList() {
 		}
 	}
 	fmt.Print("list22222222", list)
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
 
@@ -1568,15 +1570,15 @@ func (c *SZHisApiController) GetDrugList() {
 			detail := &models.DrugDetail{
 
 				MedicalInsuranceNumber: item.MedicalInsuranceNumber,
-				Code:             item.Code,
-				DrugName:         item.DrugName,
-				DrugSpec:         item.DrugSpec,
-				DrugDosageName:   item.DrugDosageName,
-				ManufacturerName: item.ManufacturerName,
-				MinUnit:          item.MinUnit,
-				RetailPrice:      item.RetailPrice,
-				LastPrice:        item.LastPrice,
-				LimitRemark:      item.LimitRemark,
+				Code:                   item.Code,
+				DrugName:               item.DrugName,
+				DrugSpec:               item.DrugSpec,
+				DrugDosageName:         item.DrugDosageName,
+				ManufacturerName:       item.ManufacturerName,
+				MinUnit:                item.MinUnit,
+				RetailPrice:            item.RetailPrice,
+				LastPrice:              item.LastPrice,
+				LimitRemark:            item.LimitRemark,
 			}
 			customs = append(customs, detail)
 		}
@@ -1613,11 +1615,13 @@ func (c *SZHisApiController) GetDrugList() {
 }
 
 func (c *SZHisApiController) GetTreatmentProject() {
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
 
 	//获取药品库数据
-	list, _ := service.GetDrugList(10028)
+	list, _ := service.GetDrugList(orgId)
 
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
 
@@ -1652,13 +1656,13 @@ func (c *SZHisApiController) GetTreatmentProject() {
 			detail := &models.DrugDetail{
 
 				MedicalInsuranceNumber: item.MedicalInsuranceNumber, //社保目录
-				Code:             item.Code,     //协议机构内部目录编码
-				DrugName:         item.DrugName, //协议机构内部目录名称
-				DrugSpec:         item.DrugSpec,
-				ManufacturerName: item.ManufacturerName,
-				MinUnit:          item.MinUnit,
-				RetailPrice:      item.RetailPrice, //协议机构内部项目收费价格
-				LimitRemark:      item.LimitRemark,
+				Code:                   item.Code,                   //协议机构内部目录编码
+				DrugName:               item.DrugName,               //协议机构内部目录名称
+				DrugSpec:               item.DrugSpec,
+				ManufacturerName:       item.ManufacturerName,
+				MinUnit:                item.MinUnit,
+				RetailPrice:            item.RetailPrice, //协议机构内部项目收费价格
+				LimitRemark:            item.LimitRemark,
 			}
 			customs = append(customs, detail)
 		}
@@ -1694,6 +1698,8 @@ func (c *SZHisApiController) GetTreatmentProject() {
 
 func (c *SZHisApiController) GetRevocation() {
 
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
 	id, _ := c.GetInt64("id")
 	//用来区分是药品的撤销还是耗材的撤销  1.药品  2.诊疗项目 3.材料 5.辅助器具项目
 
@@ -1701,9 +1707,9 @@ func (c *SZHisApiController) GetRevocation() {
 	fmt.Println("type_id2222222", type_id)
 	if type_id == 1 {
 		//获取药品库数据
-		list, _ := service.GetDrugListByDetail(10028, id)
+		list, _ := service.GetDrugListByDetail(orgId, id)
 
-		miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+		miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 		var doctor_name string
 		var doctor_code string
 
@@ -1756,25 +1762,6 @@ func (c *SZHisApiController) GetRevocation() {
 			} else {
 				fmt.Println(err)
 			}
-				MedicalInsuranceNumber: item.MedicalInsuranceNumber, //社保目录
-				Code:             item.Code,     //协议机构内部目录编码
-				DrugName:         item.DrugName, //协议机构内部目录名称
-				DrugSpec:         item.DrugSpec,
-				ManufacturerName: item.ManufacturerName,
-				MinUnit:          item.MinUnit,
-				RetailPrice:      item.RetailPrice, //协议机构内部项目收费价格
-				LimitRemark:      item.LimitRemark,
-			}
-			customs = append(customs, detail)
-		}
-		result := service.SzybML010(doctor_name, doctor_code, miConfig.Code, customs)
-		fmt.Println("reuslt9999999999999999", result)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
 
 			userJSONBytes, _ := json.Marshal(dat)
 
@@ -1796,130 +1783,131 @@ func (c *SZHisApiController) GetRevocation() {
 			fmt.Println(isSuccess)
 		}
 
-	}
+		if type_id == 3 {
 
-	if type_id == 3 {
+			//获取药品库数据
+			list, _ := service.GetGoodListByDetail(orgId, id)
 
-		//获取药品库数据
-		list, _ := service.GetGoodListByDetail(10028, id)
+			miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+			var doctor_name string
+			var doctor_code string
 
-		miConfig, _ := service.FindMedicalInsuranceInfo(10028)
-		var doctor_name string
-		var doctor_code string
+			doctor_name = "黄亦轩"
+			doctor_code = "1001"
 
-		doctor_name = "黄亦轩"
-		doctor_code = "1001"
+			var pagesize int = 50
+			var start int = 1
+			var stop int
+			var pagecount int
+			var curpage int
+			var isSuccess bool = true
+			//总页数,向上取整,注意除之前要先转换类型为float64
+			pagecount = int(math.Ceil(float64(len(list)) / float64(pagesize)))
+
+			var ress []*Result
+			for curpage = 1; curpage <= pagecount; curpage++ {
+				if curpage == 1 {
+					start = 1
+				} else {
+					start = (curpage-1)*pagesize + 1
+				}
+				stop = curpage * pagesize
+				if stop > len(list) {
+					stop = len(list)
+				}
+				//这里就可以查看开始和结束了
+				fmt.Println(list[start-1 : stop])
+				var customs []*models.DrugDetail
+				for _, item := range list {
+					fmt.Println("医疗机构编码", item.MedicalInsuranceNumber)
+					detail := &models.DrugDetail{
+						SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
+						ManufacturerName:            item.ManufacturerName,
+					}
+					customs = append(customs, detail)
+				}
+				result := service.SzybML010(doctor_name, doctor_code, miConfig.Code, customs, type_id)
+				fmt.Println("reuslt", result)
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
 
-		var pagesize int = 50
-		var start int = 1
-		var stop int
-		var pagecount int
-		var curpage int
-		var isSuccess bool = true
-		//总页数,向上取整,注意除之前要先转换类型为float64
-		pagecount = int(math.Ceil(float64(len(list)) / float64(pagesize)))
+				userJSONBytes, _ := json.Marshal(dat)
 
-		var ress []*Result
-		for curpage = 1; curpage <= pagecount; curpage++ {
-			if curpage == 1 {
-				start = 1
-			} else {
-				start = (curpage-1)*pagesize + 1
-			}
-			stop = curpage * pagesize
-			if stop > len(list) {
-				stop = len(list)
-			}
-			//这里就可以查看开始和结束了
-			fmt.Println(list[start-1 : stop])
-			var customs []*models.DrugDetail
-			for _, item := range list {
-				fmt.Println("医疗机构编码", item.MedicalInsuranceNumber)
-				detail := &models.DrugDetail{
-					SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
-					ManufacturerName:            item.ManufacturerName,
+				var res Result
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
 				}
-				customs = append(customs, detail)
-			}
-			result := service.SzybML010(doctor_name, doctor_code, miConfig.Code, customs, type_id)
-			fmt.Println("reuslt", result)
-			var dat map[string]interface{}
-			if err := json.Unmarshal([]byte(result), &dat); err == nil {
-				fmt.Println(dat)
-			} else {
-				fmt.Println(err)
-			}
-
-			userJSONBytes, _ := json.Marshal(dat)
+				if res.Transreturncode == "00000000" {
+					ress = append(ress, &res)
+				} else {
+					isSuccess = false
+					//失败
 
-			var res Result
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugReturnFaildParamWrong)
+					return
+				}
+				fmt.Println(isSuccess)
 			}
-			if res.Transreturncode == "00000000" {
-				ress = append(ress, &res)
-			} else {
-				isSuccess = false
-				//失败
 
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugReturnFaildParamWrong)
-				return
-			}
-			fmt.Println(isSuccess)
 		}
 
 	}
 
+	//func  (c *SZHisApiController) GetInformationQuery()  {
+	//
+	//  var doctor_name string
+	//  var doctor_code string
+	//
+	//  doctor_name = "黄亦轩"
+	//  doctor_code = "1001"
+	//  miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+	//  result := service.SzybML010(doctor_name, doctor_code, miConfig.Code, customs)
+	//  fmt.Println("reuslt9999999999999999", result)
+	//  var dat map[string]interface{}
+	//  if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	//    fmt.Println(dat)
+	//  } else {
+	//    fmt.Println(err)
+	//  }
+	//
+	//  userJSONBytes, _ := json.Marshal(dat)
+	//
+	//  var res Result
+	//  if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+	//    utils.ErrorLog("解析失败：%v", err)
+	//    c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//    return
+	//  }
+	//  if res.Transreturncode == "00000000" {
+	//    ress = append(ress, &res)
+	//  } else {
+	//    isSuccess = false
+	//    //失败
+	//
+	//    c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreSettleFaildParamWrong)
+	//    return
+	//  }
+	//  fmt.Println(isSuccess)
+	//
+	//}
 }
-
-//func  (c *SZHisApiController) GetInformationQuery()  {
-//
-//  var doctor_name string
-//  var doctor_code string
-//
-//  doctor_name = "黄亦轩"
-//  doctor_code = "1001"
-//  miConfig, _ := service.FindMedicalInsuranceInfo(10028)
-//  result := service.SzybML010(doctor_name, doctor_code, miConfig.Code, customs)
-//  fmt.Println("reuslt9999999999999999", result)
-//  var dat map[string]interface{}
-//  if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//    fmt.Println(dat)
-//  } else {
-//    fmt.Println(err)
-//  }
-//
-//  userJSONBytes, _ := json.Marshal(dat)
-//
-//  var res Result
-//  if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-//    utils.ErrorLog("解析失败：%v", err)
-//    c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//    return
-//  }
-//  if res.Transreturncode == "00000000" {
-//    ress = append(ress, &res)
-//  } else {
-//    isSuccess = false
-//    //失败
-//
-//    c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreSettleFaildParamWrong)
-//    return
-//  }
-//  fmt.Println(isSuccess)
-//
-//}
-
 func (c *SZHisApiController) GetDoctorList() {
 
+	adminUserInfo := c.GetAdminUserInfo()
+	orgid := adminUserInfo.CurrentOrgId
+	fmt.Println("or3gi", orgid)
 	//获取所有医生护士信息
-	list, _ := service.GetDoctorList(10028)
+	list, _ := service.GetDoctorList(orgid)
 	//获取所有角色名称
-	roleList, _ := service.GetRoleList(10028)
+	roleList, _ := service.GetRoleList(orgid)
 
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgid)
 	for _, item := range list {
 		for _, it := range roleList {
 			if item.RoleId == it.ID {
@@ -1959,39 +1947,39 @@ func (c *SZHisApiController) GetDoctorList() {
 		for _, item := range list {
 			fmt.Println("医护类别", item.Name)
 			detail := &models.DocDetail{
-				UserName:                     item.UserName,
-				RoleId:                       item.Name,
-				Sex:                          "",
-				CardType:                     "",
-				IdCard:                       "",
-				Phone:                        "",
-				WorkMajorName:                "",
-				Nation:                       "",
-				BirthDay:                     20201022,
-				WorkTime:                     12,
-				Education:                    "",
-				StudyMajorName:               "",
-				CertificateCode:              "", //证书编码
-				MedicalCode:                  "", //医师资格编码
-				MedicalRangeCode:             "", //医师执业范围代码
-				MedicalLevel:                 "", //医生级别
-				TypeJob:                      "", //职业类别
-				DoctorNumber:                 "", //医师编号
-				Licensing:                    "", //职业标志
-				DoctorServiceStatus:          "", //医师医保服务资格状态
-				MonitoringLevel:              "", //监控等级
-				DrugPsychotropicSubstances:   "", //毒麻精神药品资格
-				HealthCareCode:               "", // 母婴保健技术考核合格证书编号
-				PlanningTechnicalServiceCode: "", //计划生育技术服务人员合格证编号
-				PharmacistType:               "", //药师类别
-				PharmacistPracticeCategory:   "", //药师执业类别
-				PharmacistsLicensing:         "", //药师执业范围
-				PharmacistRegistrationNumber: "", //执业药师注册证编号
-				OfficeCode:                   "", //科室编码
-				JobNumber:                    "", //工号
-				PostName:                     "", //职位名称
-				TechnicalJobLevelCode:        "", //专业技术职务级别编码
-				IsActive:                     "", //在职与否
+				UserName:                                item.UserName,
+				RoleId:                                  item.Name,
+				Sex:                                     "",
+				CardType:                                "",
+				IdCard:                                  "",
+				Phone:                                   "",
+				WorkMajorName:                           "",
+				Nation:                                  "",
+				BirthDay:                                20201022,
+				WorkTime:                                12,
+				Education:                               "",
+				StudyMajorName:                          "",
+				CertificateCode:                         "",   //证书编码
+				MedicalCode:                             "",   //医师资格编码
+				MedicalRangeCode:                        "",   //医师执业范围代码
+				MedicalLevel:                            "",   //医生级别
+				TypeJob:                                 "",   //职业类别
+				DoctorNumber:                            "",   //医师编号
+				Licensing:                               "",   //职业标志
+				DoctorServiceStatus:                     "",   //医师医保服务资格状态
+				MonitoringLevel:                         "",   //监控等级
+				DrugPsychotropicSubstances:              "",   //毒麻精神药品资格
+				HealthCareCode:                          "",   // 母婴保健技术考核合格证书编号
+				PlanningTechnicalServiceCode:            "",   //计划生育技术服务人员合格证编号
+				PharmacistType:                          "",   //药师类别
+				PharmacistPracticeCategory:              "",   //药师执业类别
+				PharmacistsLicensing:                    "",   //药师执业范围
+				PharmacistRegistrationNumber:            "",   //执业药师注册证编号
+				OfficeCode:                              "",   //科室编码
+				JobNumber:                               "",   //工号
+				PostName:                                "",   //职位名称
+				TechnicalJobLevelCode:                   "",   //专业技术职务级别编码
+				IsActive:                                "",   //在职与否
 				PrescriptionQualificationIdentification: "",   //处方资格标识
 				IdentificationOutpatients:               "",   //门诊大病医师标识
 				OutpatientIllnessCategory:               "",   //门诊大病类别
@@ -2023,22 +2011,24 @@ func (c *SZHisApiController) GetDoctorList() {
 			isSuccess = false
 			//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDoctorLoginFaildParamWrong)
 			return
 		}
 		fmt.Println(isSuccess)
-
 	}
+
 }
 
 func (c *SZHisApiController) GetMedicalList() {
 
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
 	//获取所有医生护士信息
-	list, _ := service.GetDoctorList(10028)
+	list, _ := service.GetDoctorList(orgId)
 	//获取所有角色名称
-	roleList, _ := service.GetRoleList(10028)
+	roleList, _ := service.GetRoleList(orgId)
 
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	for _, item := range list {
 		for _, it := range roleList {
 			if item.RoleId == it.ID {
@@ -2116,43 +2106,7 @@ func (c *SZHisApiController) GetMedicalList() {
 				IdentificationOutpatients:               "1",        //门诊大病医师标识
 				OutpatientIllnessCategory:               "血友病",      //门诊大病类别
 				StartTime:                               20210311,   //开始日期
-				UserName:                     item.UserName,
-				RoleId:                       item.Name,
-				Sex:                          "",
-				CardType:                     "",
-				IdCard:                       "",
-				Phone:                        "",
-				WorkMajorName:                "",
-				Nation:                       "",
-				BirthDay:                     20201022,
-				WorkTime:                     12,
-				Education:                    "",
-				StudyMajorName:               "",
-				CertificateCode:              "", //证书编码
-				MedicalCode:                  "", //医师资格编码
-				MedicalRangeCode:             "", //医师执业范围代码
-				MedicalLevel:                 "", //医生级别
-				TypeJob:                      "", //职业类别
-				DoctorNumber:                 "", //医师编号
-				Licensing:                    "", //职业标志
-				DoctorServiceStatus:          "", //医师医保服务资格状态
-				MonitoringLevel:              "", //监控等级
-				DrugPsychotropicSubstances:   "", //毒麻精神药品资格
-				HealthCareCode:               "", // 母婴保健技术考核合格证书编号
-				PlanningTechnicalServiceCode: "", //计划生育技术服务人员合格证编号
-				PharmacistType:               "", //药师类别
-				PharmacistPracticeCategory:   "", //药师执业类别
-				PharmacistsLicensing:         "", //药师执业范围
-				PharmacistRegistrationNumber: "", //执业药师注册证编号
-				OfficeCode:                   "", //科室编码
-				JobNumber:                    "", //工号
-				PostName:                     "", //职位名称
-				TechnicalJobLevelCode:        "", //专业技术职务级别编码
-				IsActive:                     "", //在职与否
-				PrescriptionQualificationIdentification: "",   //处方资格标识
-				IdentificationOutpatients:               "",   //门诊大病医师标识
-				OutpatientIllnessCategory:               "",   //门诊大病类别
-				StartTime:                               1233, //开始日期
+
 			}
 			customs = append(customs, detail)
 		}
@@ -2190,12 +2144,14 @@ func (c *SZHisApiController) GetMedicalList() {
 
 func (c *SZHisApiController) GetUpdateMedicalList() {
 
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
 	//获取所有医生护士信息
-	list, _ := service.GetDoctorList(10028)
+	list, _ := service.GetDoctorList(orgId)
 	//获取所有角色名称
-	roleList, _ := service.GetRoleList(10028)
+	roleList, _ := service.GetRoleList(orgId)
 
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	for _, item := range list {
 		for _, it := range roleList {
 			if item.RoleId == it.ID {
@@ -2235,84 +2191,45 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 		for _, item := range list {
 			fmt.Println("医护类别", item.Name)
 			detail := &models.DocDetail{
-				StaffCode:                    "",            //医护人员编码
-				UserName:                     item.UserName, //医护人员姓名
-				RoleId:                       item.Name,     //医护人员类别
-				Sex:                          "",            //性别
-				CardType:                     "",            //证件类型
-				IdCard:                       "",            //证件号码
-				Phone:                        "",            //联系电话
-				WorkMajorName:                "",            //现从事专业名称
-				Nation:                       "",            //民族
-				BirthDay:                     20201022,      //出生日期
-				WorkTime:                     12,            //参加工作日期
-				Education:                    "",            //学历
-				StudyMajorName:               "",            //所学的专业名称
-				CertificateCode:              "",            //证书编码
-				MedicalCode:                  "",            //医师资格编码
-				MedicalRangeCode:             "",            //医师执业范围代码
-				MedicalLevel:                 "",            //医生级别
-				TypeJob:                      "",            //职业类别
-				DoctorNumber:                 "",            //医师编号
-				Licensing:                    "",            //职业标志
-				DoctorServiceStatus:          "",            //医师医保服务资格状态
-				MonitoringLevel:              "",            //监控等级
-				DrugPsychotropicSubstances:   "",            //毒麻精神药品资格
-				HealthCareCode:               "",            // 母婴保健技术考核合格证书编号
-				PlanningTechnicalServiceCode: "",            //计划生育技术服务人员合格证编号
-				PharmacistType:               "",            //药师类别
-				PharmacistPracticeCategory:   "",            //药师执业类别
-				PharmacistsLicensing:         "",            //药师执业范围
-				PharmacistRegistrationNumber: "",            //执业药师注册证编号
-				OfficeCode:                   "",            //科室编码
-				JobNumber:                    "",            //工号
-				PostName:                     "",            //职位名称
-				TechnicalJobLevelCode:        "",            //专业技术职务级别编码
-				IsActive:                     "",            //在职与否
-				PrescriptionQualificationIdentification: "",   //处方资格标识
-				IdentificationOutpatients:               "",   //门诊大病医师标识
-				OutpatientIllnessCategory:               "",   //门诊大病类别
-				StartTime:                               1233, //开始日期
+				StaffCode:                               "",            //医护人员编码
+				UserName:                                item.UserName, //医护人员姓名
+				RoleId:                                  item.Name,     //医护人员类别
+				Sex:                                     "",            //性别
+				CardType:                                "",            //证件类型
+				IdCard:                                  "",            //证件号码
+				Phone:                                   "",            //联系电话
+				WorkMajorName:                           "",            //现从事专业名称
+				Nation:                                  "",            //民族
+				BirthDay:                                20201022,      //出生日期
+				WorkTime:                                12,            //参加工作日期
+				Education:                               "",            //学历
+				StudyMajorName:                          "",            //所学的专业名称
+				CertificateCode:                         "",            //证书编码
+				MedicalCode:                             "",            //医师资格编码
+				MedicalRangeCode:                        "",            //医师执业范围代码
+				MedicalLevel:                            "",            //医生级别
+				TypeJob:                                 "",            //职业类别
+				DoctorNumber:                            "",            //医师编号
+				Licensing:                               "",            //职业标志
+				DoctorServiceStatus:                     "",            //医师医保服务资格状态
+				MonitoringLevel:                         "",            //监控等级
+				DrugPsychotropicSubstances:              "",            //毒麻精神药品资格
+				HealthCareCode:                          "",            // 母婴保健技术考核合格证书编号
+				PlanningTechnicalServiceCode:            "",            //计划生育技术服务人员合格证编号
+				PharmacistType:                          "",            //药师类别
+				PharmacistPracticeCategory:              "",            //药师执业类别
+				PharmacistsLicensing:                    "",            //药师执业范围
+				PharmacistRegistrationNumber:            "",            //执业药师注册证编号
+				OfficeCode:                              "",            //科室编码
+				JobNumber:                               "",            //工号
+				PostName:                                "",            //职位名称
+				TechnicalJobLevelCode:                   "",            //专业技术职务级别编码
+				IsActive:                                "",            //在职与否
+				PrescriptionQualificationIdentification: "",            //处方资格标识
+				IdentificationOutpatients:               "",            //门诊大病医师标识
+				OutpatientIllnessCategory:               "",            //门诊大病类别
+				StartTime:                               1233,          //开始日期
 				EndTime:                                 123333,
-				StaffCode:                               "H27224269", //医护人员编码
-				UserName:                                item.UserName,
-				RoleId:                                  "1",
-				Sex:                                     "1",
-				CardType:                                "01",
-				IdCard:                                  "430526199408156511",
-				Phone:                                   "13318464642",
-				WorkMajorName:                           "医生",
-				Nation:                                  "01",
-				BirthDay:                                20201022,
-				WorkTime:                                20201022,
-				Education:                               "21",
-				StudyMajorName:                          "医生",
-				CertificateCode:                         "y2222222", //证书编码
-				MedicalCode:                             "y2222222", //医师资格编码
-				MedicalRangeCode:                        "101",      //医师执业范围代码
-				MedicalLevel:                            "1",        //医生级别
-				TypeJob:                                 "1",        //职业类别
-				DoctorNumber:                            "22222",    //医师编号b
-				Licensing:                               "1",        //职业标志
-				DoctorServiceStatus:                     "1",        //医师医保服务资格状态
-				MonitoringLevel:                         "1",        //监控等级
-				DrugPsychotropicSubstances:              "1",        //毒麻精神药品资格
-				HealthCareCode:                          "1001",     // 母婴保健技术考核合格证书编号
-				PlanningTechnicalServiceCode:            "1002",     //计划生育技术服务人员合格证编号
-				PharmacistType:                          "1",        //药师类别
-				PharmacistPracticeCategory:              "1",        //药师执业类别
-				PharmacistsLicensing:                    "1",        //药师执业范围
-				PharmacistRegistrationNumber:            "000200",   //执业药师注册证编号
-				OfficeCode:                              "9933",     //科室编码
-				JobNumber:                               "82021344", //工号
-				PostName:                                "主任",       //职位名称
-				TechnicalJobLevelCode:                   "231",      //专业技术职务级别编码
-				IsActive:                                "1",        //在职与否
-				PrescriptionQualificationIdentification: "1",        //处方资格标识
-				IdentificationOutpatients:               "1",        //门诊大病医师标识
-				OutpatientIllnessCategory:               "血友病",      //门诊大病类别
-				StartTime:                               20210311,   //开始日期
-				EndTime:                                 20210313,
 			}
 			customs = append(customs, detail)
 		}
@@ -2350,11 +2267,13 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 
 func (c *SZHisApiController) GetGoodsList() {
 
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
 	//获取所有耗材信息
-	list, _ := service.GetGoodInformationList(10028)
+	list, _ := service.GetGoodInformationList(orgId)
 	fmt.Println("list22222", list)
 	//获取单位
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
 

enums/error_code.go

@@ -241,7 +241,8 @@ const ( // ErrorCode
 
 	ErrorCodePreSettleFaildParamWrong = 30001
 	ErrorDrugPreSettleFaildParamWrong = 30002
-	ErrorDrugReturnFaildParamWrong    = 3003
+	ErrorDrugReturnFaildParamWrong    = 30003
+	ErrorDoctorLoginFaildParamWrong   = 30004
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -466,6 +467,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeHisOrderNoExistParamWrong: "订单不存在",
 	ErrorDrugPreSettleFaildParamWrong:  "备案失败",
 	ErrorDrugReturnFaildParamWrong:     "撤销失败",
+	ErrorDoctorLoginFaildParamWrong:    "登记失败",
 }
 
 type SGJError struct {

service/his_service.go

@@ -991,7 +991,7 @@ func GetDrugDosageForm(orgid int64) (dataconfig []*models.XtDrugDataConfig, err
 
 func GetDoctorList(orgid int64) (role []*models.SgjUserAdminRole, err error) {
 
-	err = UserReadDB().Model(&role).Where("org_id = ? and status = 1 and id = 2722", orgid).Find(&role).Error
+	err = UserReadDB().Model(&role).Where("org_id = ? and status = 1 and id = 855", orgid).Find(&role).Error
 	return role, err
 }