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

conf/app.conf

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

controllers/sz/sz_his_api_controller.go

@@ -253,8 +253,9 @@ func SZHisManagerApiRegistRouters() {
 	beego.Router("/sz/api/drug/get", &SZHisApiController{}, "get:GetDrugList")
 	//协议机构诊疗项目
 	beego.Router("/sz/api/treatment/get", &SZHisApiController{}, "get:GetTreatmentProject")
-	//协议机构目录
+	//协议机构目录备案撤销
 	beego.Router("/sz/api/revocation/get", &SZHisApiController{}, "get:GetRevocation")
+
 	//定点机构约定信息查询
 	//beego.Router("/sz/api/information/query/get",&SZHisApiController{},"get:GetInformationQuery")
 	//-医药师信息登记
@@ -263,7 +264,9 @@ func SZHisManagerApiRegistRouters() {
 	beego.Router("/sz/api/medical/get", &SZHisApiController{}, "get:GetMedicalList")
 	//医药师信息更新
 	beego.Router("/sz/api/update/medical/get", &SZHisApiController{}, "get:GetUpdateMedicalList")
+	//协议机构材料目录备案
 
+	beego.Router("/sz/api/goods/get", &SZHisApiController{}, "get:GetGoodsList")
 }
 
 func IntPtr(n int) uintptr {
@@ -1722,21 +1725,23 @@ func ReadCardGetCode(request string) (string, string) {
 
 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 {
-			fmt.Println("2222", it.Value, it.Name)
+
 			if item.DrugDosageForm == it.Value {
 				item.DrugDosageName = it.Name
 			}
 		}
 	}
 	fmt.Print("list22222222", list)
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
 
@@ -1771,15 +1776,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)
 		}
@@ -1808,7 +1813,7 @@ func (c *SZHisApiController) GetDrugList() {
 			isSuccess = false
 			//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreSettleFaildParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
 			return
 		}
 		fmt.Println(isSuccess)
@@ -1816,11 +1821,14 @@ func (c *SZHisApiController) GetDrugList() {
 }
 
 func (c *SZHisApiController) GetTreatmentProject() {
+	fmt.Println("触发了吗2222222222")
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
 
 	//获取药品库数据
-	list, _ := service.GetDrugList(10028)
+	list, _ := service.GetMyPorjecgList(orgId)
 
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
 
@@ -1849,19 +1857,16 @@ func (c *SZHisApiController) GetTreatmentProject() {
 		}
 		//这里就可以查看开始和结束了
 		fmt.Println(list[start-1 : stop])
-		var customs []*models.DrugDetail
+		var customs []*models.ProjectDetail
 		for _, item := range list {
-			fmt.Println("医疗机构编码", item.MedicalInsuranceNumber)
-			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,
+			detail := &models.ProjectDetail{
+
+				SocialSecurityDirectoryCode: item.MedicalCode, //社保目录
+				ProjectName:                 item.ProjectName,
+				Price:                       item.Price,
+				Category:                    strconv.FormatInt(item.Category, 10),
+				Remark:                      item.Remark,
 			}
 			customs = append(customs, detail)
 		}
@@ -1888,7 +1893,7 @@ func (c *SZHisApiController) GetTreatmentProject() {
 			isSuccess = false
 			//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreSettleFaildParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
 			return
 		}
 		fmt.Println(isSuccess)
@@ -1897,10 +1902,294 @@ func (c *SZHisApiController) GetTreatmentProject() {
 
 func (c *SZHisApiController) GetRevocation() {
 
-	//获取药品库数据
-	list, _ := service.GetDrugList(10028)
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	id, _ := c.GetInt64("id")
+	//用来区分是药品的撤销还是耗材的撤销  1.药品  2.诊疗项目 3.材料 5.辅助器具项目
+
+	type_id, _ := c.GetInt64("type_id")
+	fmt.Println("type_id2222222", type_id)
+	if type_id == 1 {
+		//获取药品库数据
+		list, _ := service.GetDrugListByDetail(orgId, id)
+
+		miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+		var doctor_name string
+		var doctor_code string
+
+		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{
+
+					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, 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)
+
+			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.ErrorDrugReturnFaildParamWrong)
+				return
+			}
+			fmt.Println(isSuccess)
+		}
+
+		if type_id == 2 {
+
+			//获取药品库数据
+			list, _ := service.GetMyPorjecgListDetail(orgId, id)
+
+			miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+			var doctor_name string
+			var doctor_code string
 
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
+			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 {
+					detail := &models.DrugDetail{
+						SocialSecurityDirectoryCode: item.MedicalCode,
+					}
+					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)
+
+				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.ErrorDrugReturnFaildParamWrong)
+					return
+				}
+				fmt.Println(isSuccess)
+			}
+		}
+
+		if type_id == 3 {
+
+			//获取药品库数据
+			list, _ := service.GetGoodListByDetail(orgId, id)
+
+			miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+			var doctor_name string
+			var doctor_code string
+
+			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)
+				}
+
+				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.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) GetDoctorList() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgid := adminUserInfo.CurrentOrgId
+	fmt.Println("or3gi", orgid)
+	//获取所有医生护士信息
+	list, _ := service.GetDoctorList(9671)
+	//获取所有角色名称
+	roleList, _ := service.GetRoleList(9671)
+
+	miConfig, _ := service.FindMedicalInsuranceInfo(9671)
+	for _, item := range list {
+		for _, it := range roleList {
+			if item.RoleId == it.ID {
+				item.Name = it.RoleName
+			}
+		}
+	}
 	var doctor_name string
 	var doctor_code string
 
@@ -1929,23 +2218,56 @@ func (c *SZHisApiController) GetRevocation() {
 		}
 		//这里就可以查看开始和结束了
 		fmt.Println(list[start-1 : stop])
-		var customs []*models.DrugDetail
+		var customs []*models.DocDetail
 		for _, item := range list {
-			fmt.Println("医疗机构编码", item.MedicalInsuranceNumber)
-			detail := &models.DrugDetail{
+			fmt.Println("医护类别", item.Name)
+			sex := strconv.FormatInt(item.Sex, 10)
+			card_type := strconv.FormatInt(item.CardType, 10)
+			is_active := strconv.FormatInt(item.IsActive, 10)
 
-				MedicalInsuranceNumber: item.MedicalInsuranceNumber, //社保目录
-				Code:             item.Code,     //协议机构内部目录编码
-				DrugName:         item.DrugName, //协议机构内部目录名称
-				DrugSpec:         item.DrugSpec,
-				ManufacturerName: item.ManufacturerName,
-				MinUnit:          item.MinUnit,
-				RetailPrice:      item.RetailPrice, //协议机构内部项目收费价格
-				LimitRemark:      item.LimitRemark,
+			detail := &models.DocDetail{
+				UserName:                                item.UserName,
+				RoleId:                                  item.Name,
+				Sex:                                     sex,
+				CardType:                                card_type,
+				IdCard:                                  item.IdCard,
+				Phone:                                   "",
+				WorkMajorName:                           item.WorkMajorName,
+				Nation:                                  item.Nation,
+				BirthDay:                                20201022,
+				WorkTime:                                12,
+				Education:                               strconv.FormatInt(item.Education, 10),
+				StudyMajorName:                          item.StudyMajorName,
+				CertificateCode:                         "",                                           //证书编码
+				MedicalCode:                             item.MedicalCode,                             //医师资格编码
+				MedicalRangeCode:                        strconv.FormatInt(item.MedicalRangeCode, 10), //医师执业范围代码
+				MedicalLevel:                            strconv.FormatInt(item.MedicalLevel, 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:            item.PharmacistRegistrationNumber,            //执业药师注册证编号
+				OfficeCode:                              "",                                           //科室编码
+				JobNumber:                               item.JobNumber,                               //工号
+				PostName:                                "",                                           //职位名称
+				TechnicalJobLevelCode:                   "",                                           //专业技术职务级别编码
+				IsActive:                                is_active,                                    //在职与否
+				PrescriptionQualificationIdentification: item.PharmacistRegistrationNumber,            //处方资格标识
+				IdentificationOutpatients:               "",                                           //门诊大病医师标识
+				OutpatientIllnessCategory:               item.OutpatientIllnessCategory,               //门诊大病类别
+				StartTime:                               1233,                                         //开始日期
 			}
 			customs = append(customs, detail)
 		}
-		result := service.SzybML010(doctor_name, doctor_code, miConfig.Code, customs)
+
+		result := service.SzybYS001(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 {
@@ -1968,59 +2290,27 @@ func (c *SZHisApiController) GetRevocation() {
 			isSuccess = false
 			//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreSettleFaildParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDoctorLoginFaildParamWrong)
 			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) GetMedicalList() {
 
-func (c *SZHisApiController) GetDoctorList() {
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
 
+	id, _ := c.GetInt64("id")
+	fmt.Println("id22222222", id)
 	//获取所有医生护士信息
-	list, _ := service.GetDoctorList(10028)
+	list, _ := service.GetDoctorListByDetail(orgId, id)
 	//获取所有角色名称
-	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 {
@@ -2060,48 +2350,50 @@ 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:                     "", //在职与否
-				PrescriptionQualificationIdentification: "",   //处方资格标识
-				IdentificationOutpatients:               "",   //门诊大病医师标识
-				OutpatientIllnessCategory:               "",   //门诊大病类别
-				StartTime:                               1233, //开始日期
+				StaffCode:                               "H27224269",
+				UserName:                                item.UserName,
+				RoleId:                                  item.Name,
+				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,   //开始日期
+
 			}
 			customs = append(customs, detail)
 		}
 
-		result := service.SzybYS001(doctor_name, doctor_code, miConfig.Code, customs)
+		result := service.SzybYS002(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 {
@@ -2124,7 +2416,7 @@ func (c *SZHisApiController) GetDoctorList() {
 			isSuccess = false
 			//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreSettleFaildParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugReturnFaildParamWrong)
 			return
 		}
 		fmt.Println(isSuccess)
@@ -2132,14 +2424,16 @@ func (c *SZHisApiController) GetDoctorList() {
 	}
 }
 
-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 {
@@ -2179,48 +2473,50 @@ func (c *SZHisApiController) GetMedicalList() {
 		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:                     "", //在职与否
-				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,
 			}
 			customs = append(customs, detail)
 		}
 
-		result := service.SzybYS002(doctor_name, doctor_code, miConfig.Code, customs)
+		result := service.SzybYS003(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 {
@@ -2243,7 +2539,7 @@ func (c *SZHisApiController) GetMedicalList() {
 			isSuccess = false
 			//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreSettleFaildParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
 			return
 		}
 		fmt.Println(isSuccess)
@@ -2251,21 +2547,15 @@ func (c *SZHisApiController) GetMedicalList() {
 	}
 }
 
-func (c *SZHisApiController) GetUpdateMedicalList() {
+func (c *SZHisApiController) GetGoodsList() {
 
-	//获取所有医生护士信息
-	list, _ := service.GetDoctorList(10028)
-	//获取所有角色名称
-	roleList, _ := service.GetRoleList(10028)
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(10028)
-	for _, item := range list {
-		for _, it := range roleList {
-			if item.RoleId == it.ID {
-				item.Name = it.RoleName
-			}
-		}
-	}
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	//获取所有耗材信息
+	list, _ := service.GetGoodInformationList(orgId)
+	fmt.Println("list22222", list)
+	//获取单位
+	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
 
@@ -2294,55 +2584,24 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 		}
 		//这里就可以查看开始和结束了
 		fmt.Println(list[start-1 : stop])
-		var customs []*models.DocDetail
+		var customs []*models.GoodDetail
 		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, //开始日期
-				EndTime:                                 123333,
+
+			detail := &models.GoodDetail{
+				GoodName:                    item.GoodName,
+				SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
+				ManufacturerName:            item.ManufacturerName,
+				ProductionType:              item.ProductionType,
+				SpecialMedical:              item.SpecialMedical,
+				BuyPrice:                    item.BuyPrice,
+				SellPrice:                   item.SellPrice,
+				Remark:                      item.Remark,
 			}
 			customs = append(customs, detail)
 		}
 
-		result := service.SzybYS003(doctor_name, doctor_code, miConfig.Code, customs)
-		fmt.Println("reuslt9999999999999999", result)
+		result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, customs)
+		fmt.Println("reuslt8888", result)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -2364,7 +2623,7 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 			isSuccess = false
 			//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreSettleFaildParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
 			return
 		}
 		fmt.Println(isSuccess)

enums/error_code.go

@@ -36,7 +36,7 @@ const ( // ErrorCode
 	ErrorCodeDBDelete         = 8003
 	ErrorCodeDBSelectNoResult = 8004
 	ErrorCodeDataException    = 8005
-
+	ErrorDrugDataException    = 8006
 	// 业务逻辑操作错误 9000+
 	ErrorCodeRoleNotExist           = 9001
 	ErrorCodeAdminUserNotExist      = 9002
@@ -240,6 +240,9 @@ const ( // ErrorCode
 	ErrorCodeHisOrderNoExistParamWrong = 30000
 
 	ErrorCodePreSettleFaildParamWrong = 30001
+	ErrorDrugPreSettleFaildParamWrong = 30002
+	ErrorDrugReturnFaildParamWrong    = 30003
+	ErrorDoctorLoginFaildParamWrong   = 30004
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -274,7 +277,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeDBDelete:         "数据库删除出错",
 	ErrorCodeDBSelectNoResult: "查询无结果",
 	ErrorCodeDataException:    "数据异常",
-
+	ErrorDrugDataException:    "",
 	// 业务逻辑操作错误
 	ErrorCodeRoleNotExist:           "角色不存在",
 	ErrorCodeAdminUserNotExist:      "管理员不存在",
@@ -462,6 +465,9 @@ var ErrCodeMsgs = map[int]string{
 
 	ErrorCodePreSettleFaildParamWrong:  "预结算失败",
 	ErrorCodeHisOrderNoExistParamWrong: "订单不存在",
+	ErrorDrugPreSettleFaildParamWrong:  "备案失败",
+	ErrorDrugReturnFaildParamWrong:     "撤销失败",
+	ErrorDoctorLoginFaildParamWrong:    "登记失败",
 }
 
 type SGJError struct {

models/dialysis.go

@@ -891,6 +891,33 @@ type SgjUserAdminRole struct {
 	OrgLogo       string `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
 	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	Name          string
+
+	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"`
+	IdCard                                  string `gorm:"column:id_card" json:"id_card" form:"id_card"`
+	Education                               int64  `gorm:"column:education" json:"education" form:"education"`
+	StudyMajorName                          string `gorm:"column:study_major_name" json:"study_major_name" form:"study_major_name"`
+	WorkMajorName                           string `gorm:"column:work_major_name" json:"work_major_name" form:"work_major_name"`
+	RoleType                                int64  `gorm:"column:role_type" json:"role_type" form:"role_type"`
+	MedicalCode                             string `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	DoctorCode                              string `gorm:"column:doctor_code" json:"doctor_code" form:"doctor_code"`
+	Licensing                               int64  `gorm:"column:licensing" json:"licensing" form:"licensing"`
+	JobNumber                               string `gorm:"column:job_number" json:"job_number" form:"job_number"`
+	PrescriptionQualificationIdentification int64  `gorm:"column:prescription_qualification_identification" json:"prescription_qualification_identification" form:"prescription_qualification_identification"`
+	IdentificationOutpatients               int64  `gorm:"column:identification_outpatients" json:"identification_outpatients" form:"identification_outpatients"`
+	StartTime                               int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	MedicalRangeCode                        int64  `gorm:"column:medical_range_code" json:"medical_range_code" form:"medical_range_code"`
+	MedicalLevel                            int64  `gorm:"column:medical_level" json:"medical_level" form:"medical_level"`
+	MedicalTypeJob                          int64  `gorm:"column:medical_type_job" json:"medical_type_job" form:"medical_type_job"`
+	PharmacistRegistrationNumber            string `gorm:"column:pharmacist_registration_number" json:"pharmacist_registration_number" form:"pharmacist_registration_number"`
+	DoctorRangeCode                         int64  `gorm:"column:doctor_range_code" json:"doctor_range_code" form:"doctor_range_code"`
+	DoctorLevel                             int64  `gorm:"column:doctor_level" json:"doctor_level" form:"doctor_level"`
+	DoctorTypeJob                           int64  `gorm:"column:doctor_type_job" json:"doctor_type_job" form:"doctor_type_job"`
+	DoctorNumber                            string `gorm:"column:doctor_number" json:"doctor_number" form:"doctor_number"`
+	OutpatientIllnessCategory               string `gorm:"column:outpatient_illness_category" json:"outpatient_illness_category" form:"outpatient_illness_category"`
+	IsActive                                int64  `gorm:"column:is_active" json:"is_active" form:"is_active"`
+	ActiveStatus                            int64  `gorm:"column:active_status" json:"active_status" form:"active_status"`
 }
 
 func (SgjUserAdminRole) TableName() string {

models/drug.go

@@ -147,3 +147,105 @@ type BaseDrugList struct {
 	ManufacturerName       string  `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
 	DrugDosageName         string
 }
+
+type XtGoodInformation struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodCode                    string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName           string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId                  int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit                    int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice                    float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice                   float64 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount      int64   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount              int64   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                     int64   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
+	FilmArea                    string  `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                       int64   `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality         string  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                    int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                     int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName                    string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind                    int64   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus                  string  `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64   `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64   `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	CommdityCode                string  `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string  `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string  `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	ManufacturerName            string  `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
+}
+
+type GoodInformation struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodCode                    string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName           string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId                  int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit                    int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice                    float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice                   float64 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount      int64   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount              int64   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                     int64   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
+	FilmArea                    string  `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                       int64   `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality         string  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                    int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                     int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName                    string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind                    int64   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus                  string  `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64   `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64   `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	CommdityCode                string  `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string  `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string  `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	ManufacturerName            string  `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
+}

models/his_models.go

@@ -1049,3 +1049,44 @@ type XtRole struct {
 func (XtRole) TableName() string {
 	return "sgj_user_role"
 }
+
+type MyHisProject struct {
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName               string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Pinyin                    string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                      string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                      string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify              int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	ExecutiveSection          int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
+	MedicalCoverage           int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	StatisticalClassification int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	DiseaseDirectory          int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
+	IsRecord                  int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	MedicalCode               string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	TubeColor                 int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	MedicalStatus             int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
+	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sign                      int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	DefaultNumber             string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
+	IsDefault                 int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsCharge                  int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
+	IsEstimate                int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
+	IsWorkload                int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
+	Sort                      string  `gorm:"column:sort" json:"sort" form:"sort"`
+	DoctorAdvice              int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime               int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	SingleDose                string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency        string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	DeliveryWay               string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	Total                     string  `gorm:"column:total" json:"total" form:"total"`
+	Category                  int64   `gorm:"column:category" json:"category" form:"category"`
+}
+
+func (MyHisProject) TableName() string {
+	return "xt_his_project"
+}

models/sz_his_models.go

@@ -20,16 +20,17 @@ type CustomDetail struct {
 }
 
 type DrugDetail struct {
-	MedicalInsuranceNumber string  //社保目录编码
-	Code                   string  // 药品本位码
-	DrugName               string  //医药机构内部目录名称
-	DrugSpec               string  //规格
-	DrugDosageName         string  //剂型
-	MinUnit                string  //计价单位
-	ManufacturerName       string  //厂家
-	RetailPrice            float64 //药品收费价格
-	LastPrice              float64 // 药品进货价格
-	LimitRemark            string  //药品备注
+	MedicalInsuranceNumber      string  //社保目录编码
+	Code                        string  // 药品本位码
+	DrugName                    string  //医药机构内部目录名称
+	DrugSpec                    string  //规格
+	DrugDosageName              string  //剂型
+	MinUnit                     string  //计价单位
+	ManufacturerName            string  //厂家
+	RetailPrice                 float64 //药品收费价格
+	LastPrice                   float64 // 药品进货价格
+	LimitRemark                 string  //药品备注
+	SocialSecurityDirectoryCode string  //社保目录编码
 }
 
 type DocDetail struct {
@@ -73,3 +74,24 @@ type DocDetail struct {
 	StaffCode                               string //医护人员编码
 	EndTime                                 int64  // 结束日期
 }
+
+type GoodDetail struct {
+	SpecificationName           string
+	GoodName                    string
+	MinUnit                     string  //计价单位
+	ManufacturerName            string  //厂家
+	BuyPrice                    float64 //进货价格
+	SellPrice                   float64 //出售价格
+	SocialSecurityDirectoryCode string  //社保目录编码
+	ProductionType              string  //生产地类别
+	SpecialMedical              string  //特殊医用材料标识
+	Remark                      string  //备注
+}
+
+type ProjectDetail struct {
+	SocialSecurityDirectoryCode string  //社保目录编码
+	ProjectName                 string  //协议机构内部目录名称
+	Price                       float64 //协议机构内部项目收费价格
+	Category                    string  //协议机构项目类别
+	Remark                      string  //备注
+}

service/his_service.go

@@ -976,7 +976,7 @@ func GetDrugList(orgID int64) (drug []*models.BaseDrugList, err error) {
 	table := XTReadDB().Table("xt_manufacturer as m")
 	fmt.Print(table)
 	if orgID > 0 {
-		db = db.Where("x.org_id = ? and x.id = 278", orgID)
+		db = db.Where("x.org_id = ? ", orgID)
 	}
 	err = db.Select("x.id,x.medical_insurance_number,x.code,x.drug_name,x.drug_spec,x.drug_type,x.min_unit,x.last_price,x.retail_price,x.limit_remark,x.drug_dosage_form,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&drug).Error
 
@@ -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", orgid).Find(&role).Error
+	err = UserReadDB().Model(&role).Where("org_id = ? and status = 1 and user_type = 2", orgid).Find(&role).Error
 	return role, err
 }
 
@@ -1000,3 +1000,56 @@ func GetRoleList(orgid int64) (role []*models.SgjUserRole, err error) {
 	err = UserReadDB().Model(&role).Where("org_id = ? and status =1", orgid).Find(&role).Error
 	return role, err
 }
+
+func GetDrugListByDetail(orgID int64, id int64) (drug []*models.BaseDrugList, err error) {
+
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_manufacturer as m")
+	fmt.Print(table)
+	if orgID > 0 {
+		db = db.Where("x.org_id = ? and x.id = ?", orgID, id)
+	}
+	err = db.Select("x.id,x.medical_insurance_number,x.code,x.drug_name,x.drug_spec,x.drug_type,x.min_unit,x.last_price,x.retail_price,x.limit_remark,x.drug_dosage_form,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&drug).Error
+
+	return drug, err
+}
+
+func GetGoodInformationList(orgid int64) (good []*models.GoodInformation, err error) {
+
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status=1")
+	table := XTReadDB().Table("xt_manufacturer as m")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.social_security_directory_code,x.good_name,x.specification_name,x.production_type,x.special_medical,x.good_unit,x.buy_price,x.sell_price,x.remark,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&good).Error
+	return good, err
+}
+
+func GetGoodListByDetail(orgid int64, id int64) (good []*models.GoodInformation, err error) {
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status=1")
+	table := XTReadDB().Table("xt_manufacturer as m")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ? and x.id= ?", orgid, id)
+	}
+	err = db.Select("x.id,x.social_security_directory_code,x.good_name,x.specification_name,x.production_type,x.special_medical,x.good_unit,x.buy_price,x.sell_price,x.remark,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&good).Error
+	return good, err
+}
+
+func GetDoctorListByDetail(orgid int64, id int64) (role []*models.SgjUserAdminRole, err error) {
+
+	err = UserReadDB().Model(&role).Where("org_id = ? and status = 1 and id = ? and user_type = 2", orgid, id).Find(&role).Error
+	return role, err
+}
+
+func GetMyPorjecgList(orgid int64) (project []*models.MyHisProject, err error) {
+
+	err = XTReadDB().Model(&project).Where("user_org_id = ? and status = 1", orgid).Find(&project).Error
+	return project, err
+}
+
+func GetMyPorjecgListDetail(orgid int64, id int64) (project []*models.MyHisProject, err error) {
+	err = XTReadDB().Model(&project).Where("user_org_id = ? and status = 1 and id = ?", orgid, id).Find(&project).Error
+	return project, err
+}

service/sz_his_service.go

@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"math/rand"
 	"net/http"
+	"strconv"
 	"time"
 	_ "unsafe"
 )
@@ -637,7 +638,7 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
 	return inputMessage
 }
 
-func SzybML009(doctor string, doctor_code string, fixmedins_code string, datas []*models.DrugDetail) string {
+func SzybML009(doctor string, doctor_code string, fixmedins_code string, datas []*models.ProjectDetail) string {
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
@@ -649,14 +650,14 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, datas [
 
 	for _, item := range datas {
 		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["ake001"] = item.MedicalInsuranceNumber //社保目录编码
-		feedetailInfo["ake005"] = "110100002"                 //协议机构内部目录编码
-		feedetailInfo["ake006"] = item.DrugName               // 协议机构内部目录名称
-		feedetailInfo["bkf131"] = "4"                         //协议机构项目类别
-		feedetailInfo["bkm062"] = "0"                         // 门诊特检项目标识
-		feedetailInfo["bka506"] = item.RetailPrice            // 协议机构内部项目收费价格
-		feedetailInfo["aae030"] = 20210407                    // 备案日期
-		feedetailInfo["aae013"] = item.LimitRemark            // 备注
+		feedetailInfo["ake001"] = item.SocialSecurityDirectoryCode //社保目录编码
+		feedetailInfo["ake005"] = "110100002"                      //协议机构内部目录编码
+		feedetailInfo["ake006"] = item.ProjectName                 // 协议机构内部目录名称
+		feedetailInfo["bkf131"] = item.Category                    //协议机构项目类别
+		feedetailInfo["bkm062"] = "0"                              // 门诊特检项目标识
+		feedetailInfo["bka506"] = item.Price                       // 协议机构内部项目收费价格
+		feedetailInfo["aae030"] = 20210407                         // 备案日期
+		feedetailInfo["aae013"] = item.Remark                      // 备注
 		feedetail = append(feedetail, feedetailInfo)
 	}
 	fmt.Println("feeedDetal2333333333", feedetail)
@@ -698,7 +699,7 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, datas [
 
 }
 
-func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas []*models.DrugDetail) string {
+func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas []*models.DrugDetail, typeId int64) string {
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
@@ -710,7 +711,7 @@ func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas [
 
 	for _, item := range datas {
 		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["ake003"] = "1"
+		feedetailInfo["ake003"] = strconv.FormatInt(typeId, 10)
 		feedetailInfo["ake001"] = item.MedicalInsuranceNumber //社保目录编码
 		feedetailInfo["ake005"] = "110100002"                 //协议机构内部目录编码
 		feedetail = append(feedetail, feedetailInfo)
@@ -761,13 +762,14 @@ func SzybYS001(doctor string, doctor_code string, fixmedins_code string, datas [
 	inputData := make(map[string]interface{})
 
 	inputData["listsize"] = len(datas)
-	inputMessage["transType"] = "ML010" // 交易编码
+	inputMessage["transType"] = "YS001" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
 	for _, item := range datas {
+		fmt.Println("item222222", item.RoleId)
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["aac003"] = item.UserName
-		feedetailInfo["bka633"] = item.RoleId
+		feedetailInfo["bka633"] = "1"
 		feedetailInfo["aac004"] = item.Sex
 		feedetailInfo["aac058"] = item.CardType
 		feedetailInfo["aac147"] = item.IdCard
@@ -852,14 +854,14 @@ func SzybYS002(doctor string, doctor_code string, fixmedins_code string, datas [
 	inputData := make(map[string]interface{})
 
 	inputData["listsize"] = len(datas)
-	inputMessage["transType"] = "ML010" // 交易编码
+	inputMessage["transType"] = "YS002" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
 	for _, item := range datas {
 		fmt.Println("item2222", item)
 		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["bkc320"] = 1111
-		feedetailInfo["bke155"] = ""
+		feedetailInfo["bkc320"] = "H27224269"
+		feedetailInfo["bke155"] = "4"
 		feedetail = append(feedetail, feedetailInfo)
 	}
 
@@ -908,12 +910,12 @@ func SzybYS003(doctor string, doctor_code string, fixmedins_code string, datas [
 	inputData := make(map[string]interface{})
 
 	inputData["listsize"] = len(datas)
-	inputMessage["transType"] = "ML010" // 交易编码
+	inputMessage["transType"] = "YS003" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
 	for _, item := range datas {
 		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["bkc320"] = ""
+		feedetailInfo["bkc320"] = item.StaffCode
 		feedetailInfo["aac003"] = item.UserName
 		feedetailInfo["bka633"] = item.RoleId
 		feedetailInfo["aac004"] = item.Sex
@@ -992,6 +994,71 @@ func SzybYS003(doctor string, doctor_code string, fixmedins_code string, datas [
 	return str
 }
 
+func SzybYML007(doctor string, doctor_code string, fixmedins_code string, datas []*models.GoodDetail) string {
+
+	//生成输入报文
+	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
+
+	inputData := make(map[string]interface{})
+
+	inputData["listsize"] = len(datas)
+	inputMessage["transType"] = "ML007" // 交易编码
+	feedetail := make([]map[string]interface{}, 0)
+
+	for _, item := range datas {
+		fmt.Println("item222222222", item.BuyPrice)
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["ake001"] = item.SocialSecurityDirectoryCode // 社保目录编码
+		feedetailInfo["ake005"] = "110100002"                      //协议机构内部目录编码
+		feedetailInfo["ake006"] = item.GoodName                    //医药机构内部目录名称
+		feedetailInfo["bka053"] = item.ManufacturerName            //生产厂家
+		feedetailInfo["ake004"] = "1"                              //生产地类别
+		feedetailInfo["ckf261"] = "1"                              //特殊医用材料标识
+		feedetailInfo["aka067"] = "支"                              //计价单位
+		feedetailInfo["aka074"] = "ftp"                            //规格
+		feedetailInfo["bka505"] = item.BuyPrice                    //进货价
+		feedetailInfo["bka506"] = item.SellPrice                   // 收获价
+		feedetailInfo["aae013"] = item.Remark                      //备注
+		feedetail = append(feedetail, feedetailInfo)
+	}
+
+	inputData["inputlist"] = feedetail
+	inputMessage["transBody"] = inputData
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://192.168.1.99:10000"
+	url := "http://192.168.1.228:17001/szsi-portal/transData"
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str
+}
+
 func GetDoseCode(dose_id int64, user_org_id int64) (error, string) {
 	var data models.DictDataconfig
 	err := readDb.Model(&models.DictDataconfig{}).Where(" (org_id = ? Or org_id = 0) AND parent_id = 4 AND module = 'system' AND status = 1 AND value = ?", user_org_id, dose_id).First(&data).Error