拉取代码

controllers/sg/his_api_controller.go

@@ -45,7 +45,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/record/put", &HisApiController{}, "get:PutRecord")
 	beego.Router("/api/patient/info", &HisApiController{}, "get:GetHisPatientInfo")
 	beego.Router("/api/org/info", &HisApiController{}, "get:GetOrgInfo")
-	beego.Router("/api/testcard", &HisApiController{}, "get:TestGetBasBaseInfo")
+	//beego.Router("/api/testcard", &HisApiController{}, "get:TestGetBasBaseInfo")
 
 	//beego.Router("/api/testpay", &HisApiController{}, "get:TestPay")
 
@@ -91,56 +91,56 @@ func HisManagerApiRegistRouters() {
 //
 //}
 
-func (c *HisApiController) TestGetBasBaseInfo() {
-
-	//result := C.Init(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
-	//fmt.Println(result)
-	//cs1 := C.CString("")
-	//cs2 := C.CString("")
-	//C.ReadCardBas(cs1, IntPtr(1024), cs2, IntPtr(1024))
-	//fmt.Println(cs1)
-	//fmt.Println(cs2)
-	//C.free(unsafe.Pointer(cs1))
-	//C.free(unsafe.Pointer(cs2))
-
-	//
-
-	DllDef := syscall.MustLoadDLL("SSCard.dll")
-	Iinit := DllDef.MustFindProc("Init")
-	readCard := DllDef.MustFindProc("ReadCardBas")
-	ret, _, err := Iinit.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
-	if ret != 0 {
-		fmt.Println("SSCard的报错原因:", err)
-		fmt.Println("SSCard的运算结果为:", ret)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-		return
-	}
-
-	result := int(ret)
-	fmt.Println("SSCard的运算结果为1:", result)
-
-	//path := ""
-	//bytePath := []byte(  "\x00")
-	//bytePath2 := []byte(  "\x00")
-	//ssss
-
-	str := make([]byte, 256)
-	str1 := make([]byte, 256)
-	s2 := []byte(string(str))
-	s3 := []byte(string(str1))
-	ret2, _, err2 := readCard.Call((uintptr)(unsafe.Pointer(&s2[0])), IntPtr(256), (uintptr)(unsafe.Pointer(&s3[0])), IntPtr(256))
-	fmt.Println(" Add(4,5)的结果为:", ret2)
-	fmt.Println(" str:", s2)
-	fmt.Println(" str1:", s3)
-	if err2 != nil {
-		fmt.Println("SSCard的运算结果为:", ret2)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-		return
-	}
-
-	//DllDef := syscall.MustLoadDLL("SSCard.dll")
-
-}
+//func (c *HisApiController) TestGetBasBaseInfo() {
+//
+//	//result := C.Init(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
+//	//fmt.Println(result)
+//	//cs1 := C.CString("")
+//	//cs2 := C.CString("")
+//	//C.ReadCardBas(cs1, IntPtr(1024), cs2, IntPtr(1024))
+//	//fmt.Println(cs1)
+//	//fmt.Println(cs2)
+//	//C.free(unsafe.Pointer(cs1))
+//	//C.free(unsafe.Pointer(cs2))
+//
+//	//
+//
+//	DllDef := syscall.MustLoadDLL("SSCard.dll")
+//	Iinit := DllDef.MustFindProc("Init")
+//	readCard := DllDef.MustFindProc("ReadCardBas")
+//	ret, _, err := Iinit.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
+//	if ret != 0 {
+//		fmt.Println("SSCard的报错原因:", err)
+//		fmt.Println("SSCard的运算结果为:", ret)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+//		return
+//	}
+//
+//	result := int(ret)
+//	fmt.Println("SSCard的运算结果为1:", result)
+//
+//	//path := ""
+//	//bytePath := []byte(  "\x00")
+//	//bytePath2 := []byte(  "\x00")
+//	//ssss
+//
+//	str := make([]byte, 256)
+//	str1 := make([]byte, 256)
+//	s2 := []byte(string(str))
+//	s3 := []byte(string(str1))
+//	ret2, _, err2 := readCard.Call((uintptr)(unsafe.Pointer(&s2[0])), IntPtr(256), (uintptr)(unsafe.Pointer(&s3[0])), IntPtr(256))
+//	fmt.Println(" Add(4,5)的结果为:", ret2)
+//	fmt.Println(" str:", s2)
+//	fmt.Println(" str1:", s3)
+//	if err2 != nil {
+//		fmt.Println("SSCard的运算结果为:", ret2)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+//		return
+//	}
+//
+//	//DllDef := syscall.MustLoadDLL("SSCard.dll")
+//
+//}
 
 func (c *HisApiController) GetOrgInfo() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(9919)
@@ -509,16 +509,16 @@ func (c *HisApiController) GetHisPatientInfo() {
 //	return string(str), nil
 //}
 
-func CardInit() int {
-	DllTestDef := syscall.MustLoadDLL("SSCard.dll")
-	add := DllTestDef.MustFindProc("Init")
-	ret, _, err := add.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
-	if err != nil {
-		fmt.Println("SSCard的运算结果为:", ret)
-	}
-	result := int(ret)
-	return result
-}
+//func CardInit() int {
+//	DllTestDef := syscall.MustLoadDLL("SSCard.dll")
+//	add := DllTestDef.MustFindProc("Init")
+//	ret, _, err := add.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
+//	if err != nil {
+//		fmt.Println("SSCard的运算结果为:", ret)
+//	}
+//	result := int(ret)
+//	return result
+//}
 
 //func CardInit() int {
 //	ret, _, err := add.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))

controllers/sz/sz_his_api_controller.go

@@ -1882,9 +1882,19 @@ func (c *SZHisApiController) GetTreatmentProject() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 
-	//获取药品库数据
-	list, _ := service.GetMyPorjecgList(orgId)
-
+	ids := c.GetString("ids")
+	stringarr := strings.Split(ids, ",")
+	idss := make([]int64, 0)
+	for _, item := range stringarr {
+		itemsss, _ := strconv.ParseInt(item, 10, 64)
+		id := int64(itemsss)
+		idss = append(idss, id)
+	}
+	fmt.Println("idsss", idss)
+	//获取项目库数据
+	//list, _ := service.GetMyPorjecgList(orgId)
+	list, _ := service.GetBathchMyPorjecgList(idss)
+	fmt.Println("list2222222222", list)
 	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
@@ -2021,7 +2031,6 @@ func (c *SZHisApiController) GetRevocation() {
 	id, _ := c.GetInt64("id")
 	//用来区分是药品的撤销还是耗材的撤销  1.药品  2.诊疗项目 3.材料 5.辅助器具项目
 	is_mark, _ := c.GetInt64("is_mark")
-
 	type_id, _ := c.GetInt64("type_id")
 	fmt.Println("type_id2222222", type_id)
 	if type_id == 1 {
@@ -2179,135 +2188,139 @@ func (c *SZHisApiController) GetRevocation() {
 			}
 
 		}
-		if type_id == 2 {
-			//撤销
-			if is_mark == 1 {
-				//获取药品库数据
-				list, _ := service.GetMyPorjecgListDetail(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)))
-
-				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)
+	if type_id == 2 {
+		fmt.Println("222222222222222q2")
+		//撤销
+		if is_mark == 1 {
+			//获取药品库数据
+			list, _ := service.GetMyPorjecgListDetail(orgId, id)
 
-					var res Result
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					if res.Transreturncode == "00000000" {
-						//核销成功返回状态码
-						_, err := service.UpdateMyProjectById(id)
-						fmt.Println("err", err)
-					} else {
-						isSuccess = false
-						//失败
-
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugReturnFaildParamWrong)
-						return
-					}
-					fmt.Println(isSuccess)
+			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)))
+
+			for curpage = 1; curpage <= pagecount; curpage++ {
+				if curpage == 1 {
+					start = 1
+				} else {
+					start = (curpage-1)*pagesize + 1
 				}
-			}
-			//备案
-			if is_mark == 0 {
-				adminUserInfo := c.GetAdminUserInfo()
-				orgId := adminUserInfo.CurrentOrgId
-
-				//获取药品库数据
-				list, _ := service.GetMyPorjecgListDetail(orgId, id)
-
-				miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
-				var doctor_name string
-				var doctor_code string
-				doctor_name = "黄亦轩"
-				doctor_code = "1001"
-				var isSuccess bool = true
+				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.MyHisProject{
-						MedicalCode: item.MedicalCode, //社保目录
-						ProjectName: item.ProjectName,
-						Price:       item.Price,
-						Category:    item.Category,
-						Remark:      item.Remark,
+					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)
+				}
 
-					result := service.SzybML009(doctor_name, doctor_code, miConfig.Code, detail)
-					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)
 
-					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" {
+					//核销成功返回状态码
+					_, err := service.UpdateMyProjectById(id)
+					fmt.Println("err", err)
+				} else {
+					isSuccess = false
+					//失败
 
-					var res Result
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					if res.Transreturncode == "00000000" {
-						//备案成功返回状态值
-						_, err := service.UpdateProjectById(item.ID)
-						fmt.Println("err22222", err)
-					} else {
-						isSuccess = false
-						//失败
-
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
-						return
-					}
-					fmt.Println(isSuccess)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugReturnFaildParamWrong)
+					return
 				}
+				fmt.Println(isSuccess)
 			}
 		}
+		fmt.Println("is_marke", is_mark)
+		//备案
+		if is_mark == 0 {
+			fmt.Println("进来饿了吗32222222")
+			adminUserInfo := c.GetAdminUserInfo()
+			orgId := adminUserInfo.CurrentOrgId
+
+			//获取药品库数据
+			list, _ := service.GetMyPorjecgListDetail(orgId, id)
+
+			miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+			var doctor_name string
+			var doctor_code string
+			doctor_name = "黄亦轩"
+			doctor_code = "1001"
+			var isSuccess bool = true
+			for _, item := range list {
+				detail := &models.MyHisProject{
+					MedicalCode: item.MedicalCode, //社保目录
+					ProjectName: item.ProjectName,
+					Price:       item.Price,
+					Category:    item.Category,
+					Remark:      item.Remark,
+				}
+
+				result := service.SzybML009(doctor_name, doctor_code, miConfig.Code, detail)
+				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" {
+					//备案成功返回状态值
+					_, err := service.UpdateProjectById(item.ID)
+					fmt.Println("err22222", err)
+				} else {
+					isSuccess = false
+					//失败
+
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
+					return
+				}
+				fmt.Println(isSuccess)
+			}
+		}
 	}
+
 	if type_id == 3 {
 
 		//撤销
@@ -2345,7 +2358,7 @@ func (c *SZHisApiController) GetRevocation() {
 				fmt.Println(list[start-1 : stop])
 				var customs []*models.DrugDetail
 				for _, item := range list {
-					fmt.Println("医疗机构编码", item.MedicalInsuranceNumber)
+					fmt.Println("医疗机构编码", item.SocialSecurityDirectoryCode)
 					detail := &models.DrugDetail{
 						SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
 						ManufacturerName:            item.ManufacturerName,
@@ -2412,6 +2425,7 @@ func (c *SZHisApiController) GetRevocation() {
 					BuyPrice:                    item.BuyPrice,
 					SellPrice:                   item.SellPrice,
 					Remark:                      item.Remark,
+					SpecificationName:           item.SpecificationName,
 				}
 
 				result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, detail)
@@ -2494,8 +2508,20 @@ func (c *SZHisApiController) GetDoctorList() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
 	fmt.Println("or3gi", orgid)
+	ids := c.GetString("ids")
+	fmt.Println("ids2222222222", ids)
+	stringarr := strings.Split(ids, ",")
+	idss := make([]int64, 0)
+	for _, item := range stringarr {
+		itemsss, _ := strconv.ParseInt(item, 10, 64)
+		id := int64(itemsss)
+		idss = append(idss, id)
+	}
 	//获取所有医生护士信息
-	list, _ := service.GetDoctorList(orgid)
+	//list, _ := service.GetDoctorList(orgid)
+	//批量查询
+	list, _ := service.GetBatchDoctorList(idss)
+	fmt.Println("list22222222222", list)
 	//获取所有角色名称
 	roleList, _ := service.GetRoleList(orgid)
 
@@ -2513,31 +2539,246 @@ func (c *SZHisApiController) GetDoctorList() {
 	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
+	for _, item := range list {
+		fmt.Println("医护类别", item.StudyMajorName)
+		detail := &models.DocDetail{
+			UserName:                                item.UserName,                                                       //医护姓名
+			RoleId:                                  item.Name,                                                           //医护人员类别
+			Sex:                                     strconv.FormatInt(item.Sex, 10),                                     //性别
+			CardType:                                strconv.FormatInt(item.CardType, 10),                                //证件类型
+			IdCard:                                  item.IdCard,                                                         //证件号码
+			Phone:                                   item.Mobile,                                                         //联系电话
+			WorkMajorName:                           item.WorkMajorName,                                                  // 现从事专业名称
+			Nation:                                  item.Nation,                                                         //民族
+			BirthDay:                                20201022,                                                            // 出生日期
+			WorkTime:                                20201022,                                                            //参加工作日期
+			Education:                               strconv.FormatInt(item.Education, 10),                               //学历
+			StudyMajorName:                          item.StudyMajorName,                                                 //所学的专业名称
+			CertificateCode:                         item.MedicalCode,                                                    //医（药）师执业证书编码
+			MedicalCode:                             item.DoctorCode,                                                     //医（药）师资格证编码
+			MedicalRangeCode:                        strconv.FormatInt(item.DoctorRangeCode, 10),                         //医师执业范围代码
+			MedicalLevel:                            strconv.FormatInt(item.DoctorLevel, 10),                             //医生执业资格证中的医师级别
+			TypeJob:                                 strconv.FormatInt(item.DoctorTypeJob, 10),                           //医生执业资格证中的执业类别
+			DoctorNumber:                            item.DoctorNumber,                                                   //医保医师编号
+			Licensing:                               strconv.FormatInt(item.Licensing, 10),                               //多点执业标志
+			DoctorServiceStatus:                     "",                                                                  //医师医保服务资格状态
+			MonitoringLevel:                         "",                                                                  //监控等级
+			DrugPsychotropicSubstances:              "",                                                                  //毒麻精神药品资格
+			HealthCareCode:                          "",                                                                  // 母婴保健技术考核合格证书编号
+			PlanningTechnicalServiceCode:            "",                                                                  //计划生育技术服务人员合格证编号
+			PharmacistType:                          "",                                                                  //药师类别
+			PharmacistPracticeCategory:              "",                                                                  //药师执业类别
+			PharmacistsLicensing:                    "",                                                                  //药师执业范围
+			PharmacistRegistrationNumber:            "",                                                                  //执业药师注册证编号
+			OfficeCode:                              "",                                                                  //科室编码
+			JobNumber:                               item.JobNumber,                                                      //工号
+			PostName:                                "",                                                                  //职位名称
+			TechnicalJobLevelCode:                   "",                                                                  //专业技术职务级别编码
+			IsActive:                                strconv.FormatInt(item.IsActive, 10),                                //在职与否
+			PrescriptionQualificationIdentification: strconv.FormatInt(item.PrescriptionQualificationIdentification, 10), //处方资格标识
+			IdentificationOutpatients:               strconv.FormatInt(item.IdentificationOutpatients, 10),               //门诊大病医师标识
+			OutpatientIllnessCategory:               item.OutpatientIllnessCategory,                                      //门诊大病类别
+			StartTime:                               20201010,                                                            //开始日期
+			StaffCode:                               "",                                                                  //医护人员编码
+			EndTime:                                 0,                                                                   // 结束日期
+		}
+
+		result := service.SzybYS001(doctor_name, doctor_code, miConfig.Code, detail)
+		fmt.Println("reuslt9999999999999999", result)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
 		} else {
-			start = (curpage-1)*pagesize + 1
+			fmt.Println(err)
 		}
-		stop = curpage * pagesize
-		if stop > len(list) {
-			stop = len(list)
+
+		userJSONBytes, _ := json.Marshal(dat)
+
+		var res Result
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
 		}
-		//这里就可以查看开始和结束了
-		fmt.Println(list[start-1 : stop])
-		var customs []*models.DocDetail
+		if res.Transreturncode == "00000000" {
+			//批量插入数据
+			_, err := service.UpdateAdminUserRoleById(item.AdminUserId)
+			fmt.Println("err2222", err)
+		} else {
+			isSuccess = false
+			//失败
+
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDoctorLoginFaildParamWrong)
+			return
+		}
+		fmt.Println(isSuccess)
+	}
+
+}
+
+//func (c *SZHisApiController) GetDoctorList() {
+//
+//	adminUserInfo := c.GetAdminUserInfo()
+//	orgid := adminUserInfo.CurrentOrgId
+//	fmt.Println("or3gi", orgid)
+//	//获取所有医生护士信息
+//	list, _ := service.GetDoctorList(orgid)
+//	//获取所有角色名称
+//	roleList, _ := service.GetRoleList(orgid)
+//
+//	miConfig, _ := service.FindMedicalInsuranceInfo(orgid)
+//	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
+//
+//	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.DocDetail
+//		for _, item := range list {
+//			fmt.Println("医护类别", item.Name)
+//			sex := strconv.FormatInt(item.Sex, 10)
+//			card_type := strconv.FormatInt(item.CardType, 10)
+//			is_active := strconv.FormatInt(item.IsActive, 10)
+//
+//			detail := &models.DocDetail{
+//				UserName:                                item.UserName,
+//				RoleId:                                  item.Name,
+//				Sex:                                     sex,
+//				CardType:                                card_type,
+//				IdCard:                                  item.IdCard,
+//				Phone:                                   item.Mobile,
+//				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.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 {
+//			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.ErrorDoctorLoginFaildParamWrong)
+//			return
+//		}
+//		fmt.Println(isSuccess)
+//	}
+//
+//}
+
+func (c *SZHisApiController) GetMedicalList() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	id, _ := c.GetInt64("id")
+	fmt.Println("id22222222", id)
+	is_mark, _ := c.GetInt64("is_mark")
+
+	//去登记
+	if is_mark == 0 {
+		list, _ := service.GetDoctorListByDetail(orgId, id)
+		fmt.Println("list22222222222", list)
+		//获取所有角色名称
+		roleList, _ := service.GetRoleList(orgId)
+
+		miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 		for _, item := range list {
-			fmt.Println("医护类别", item.Name)
+			for _, it := range roleList {
+				if item.RoleId == it.ID {
+					item.Name = it.RoleName
+				}
+			}
+		}
+		var doctor_name string
+		var doctor_code string
+
+		doctor_name = "黄亦轩"
+		doctor_code = "1001"
+
+		var isSuccess bool = true
+
+		for _, item := range list {
+			fmt.Println("医护类别", item.Mobile)
 			sex := strconv.FormatInt(item.Sex, 10)
 			card_type := strconv.FormatInt(item.CardType, 10)
 			is_active := strconv.FormatInt(item.IsActive, 10)
@@ -2579,92 +2820,63 @@ func (c *SZHisApiController) GetDoctorList() {
 				PrescriptionQualificationIdentification: item.PharmacistRegistrationNumber,            //处方资格标识
 				IdentificationOutpatients:               "",                                           //门诊大病医师标识
 				OutpatientIllnessCategory:               item.OutpatientIllnessCategory,               //门诊大病类别
-				StartTime:                               1233,                                         //开始日期
+				StartTime:                               20201012,                                     //开始日期
 
 			}
-			customs = append(customs, detail)
-		}
+			result := service.SzybYS001(doctor_name, doctor_code, miConfig.Code, detail)
+			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)
+			}
 
-		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 {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
+			userJSONBytes, _ := json.Marshal(dat)
 
-		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" {
+				//登记成功
+				service.UpdateAdminUserRoleById(item.ID)
 
-		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
-			//失败
+			} else {
+				isSuccess = false
+				//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDoctorLoginFaildParamWrong)
-			return
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorDoctorLoginFaildParamWrong)
+				return
+			}
+			fmt.Println(isSuccess)
 		}
-		fmt.Println(isSuccess)
 	}
 
-}
+	//去撤销
+	if is_mark == 1 {
+		//获取所有医生护士信息
+		list, _ := service.GetDoctorListByDetail(orgId, id)
+		//获取所有角色名称
+		roleList, _ := service.GetRoleList(orgId)
 
-func (c *SZHisApiController) GetMedicalList() {
-
-	adminUserInfo := c.GetAdminUserInfo()
-	orgId := adminUserInfo.CurrentOrgId
-
-	id, _ := c.GetInt64("id")
-	fmt.Println("id22222222", id)
-	//获取所有医生护士信息
-	list, _ := service.GetDoctorListByDetail(orgId, id)
-	//获取所有角色名称
-	roleList, _ := service.GetRoleList(orgId)
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
-	for _, item := range list {
-		for _, it := range roleList {
-			if item.RoleId == it.ID {
-				item.Name = it.RoleName
+		miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+		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
-
-	doctor_name = "黄亦轩"
-	doctor_code = "1001"
+		var doctor_name string
+		var doctor_code string
 
-	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)))
+		doctor_name = "黄亦轩"
+		doctor_code = "1001"
 
-	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.DocDetail
+		var isSuccess bool = true
 		for _, item := range list {
 			fmt.Println("医护类别", item.Name)
 			detail := &models.DocDetail{
@@ -2708,37 +2920,36 @@ func (c *SZHisApiController) GetMedicalList() {
 				StartTime:                               20210311,   //开始日期
 
 			}
-			customs = append(customs, detail)
-		}
-
-		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 {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
+			result := service.SzybYS002(doctor_name, doctor_code, miConfig.Code, detail)
+			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)
+			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
-			//失败
+			var res Result
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Transreturncode == "00000000" {
+				//去撤销
+				service.UpdateAdminUserRoleById(item.ID)
+			} else {
+				isSuccess = false
+				//失败
+
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugReturnFaildParamWrong)
+				return
+			}
+			fmt.Println(isSuccess)
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugReturnFaildParamWrong)
-			return
 		}
-		fmt.Println(isSuccess)
-
 	}
 }
 
@@ -2869,9 +3080,18 @@ func (c *SZHisApiController) GetGoodsList() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	fmt.Println("3344555555555", orgId)
-	//获取所有耗材信息
-	list, _ := service.GetGoodInformationList(orgId)
+
+	ids := c.GetString("ids")
+	fmt.Println("ids2222222222", ids)
+	stringarr := strings.Split(ids, ",")
+	idss := make([]int64, 0)
+	for _, item := range stringarr {
+		itemsss, _ := strconv.ParseInt(item, 10, 64)
+		id := int64(itemsss)
+		idss = append(idss, id)
+	}
+	//批量获取所有耗材信息
+	list, _ := service.GetBatchGoodInformationList(idss)
 	fmt.Println("list22222", list)
 	//获取单位
 	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
@@ -2893,6 +3113,7 @@ func (c *SZHisApiController) GetGoodsList() {
 			BuyPrice:                    item.BuyPrice,
 			SellPrice:                   item.SellPrice,
 			Remark:                      item.Remark,
+			SpecificationName:           item.SpecificationName,
 		}
 
 		result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, detail)
@@ -2928,6 +3149,69 @@ func (c *SZHisApiController) GetGoodsList() {
 	}
 }
 
+//func (c *SZHisApiController) GetGoodsList() {
+//
+//	adminUserInfo := c.GetAdminUserInfo()
+//	orgId := adminUserInfo.CurrentOrgId
+//	fmt.Println("3344555555555", orgId)
+//	//获取所有耗材信息
+//	list, _ := service.GetGoodInformationList(orgId)
+//	fmt.Println("list22222", list)
+//	//获取单位
+//	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
+//	var doctor_name string
+//	var doctor_code string
+//
+//	doctor_name = "黄亦轩"
+//	doctor_code = "1001"
+//
+//	var isSuccess bool = true
+//	for _, item := range list {
+//		fmt.Println("生产厂商", item.ManufacturerName)
+//		detail := &models.XtGoodInformation{
+//			GoodName:                    item.GoodName,
+//			SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
+//			ManufacturerName:            item.ManufacturerName,
+//			ProductionType:              item.ProductionType,
+//			SpecialMedical:              item.SpecialMedical,
+//			BuyPrice:                    item.BuyPrice,
+//			SellPrice:                   item.SellPrice,
+//			Remark:                      item.Remark,
+//		}
+//
+//		result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, detail)
+//		fmt.Println("reuslt8888", 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" {
+//
+//			//备案成功返回状态
+//			_, err := service.UpdateGoodInformaitonByDetail(item.ID)
+//			fmt.Println("err2222222", err)
+//		} else {
+//			isSuccess = false
+//			//失败
+//
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
+//			return
+//		}
+//		fmt.Println(isSuccess)
+//	}
+//}
+
 //func (c *SZHisApiController) GetGoodsList() {
 //
 //	adminUserInfo := c.GetAdminUserInfo()

models/dialysis.go

@@ -869,29 +869,27 @@ func (GobalTemplate) TableName() string {
 }
 
 type SgjUserAdminRole struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
-	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
-	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
-	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
-	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
-	Status        int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Message       string `gorm:"column:message" json:"message" form:"message"`
-	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
-	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
-	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
-	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
-	OrgLogo       string `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
-	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
-	Name          string
-
+	ID                                      int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId                             int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId                                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId                                   int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId                                  int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName                                string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar                                  string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType                                int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle                               int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro                                   string `gorm:"column:intro" json:"intro" form:"intro"`
+	Status                                  int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Message                                 string `gorm:"column:message" json:"message" form:"message"`
+	Sex                                     int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday                                int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	UserTitleName                           string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds                                 string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	OrgName                                 string `gorm:"column:org_name" json:"org_name" form:"org_name"`
+	OrgLogo                                 string `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
+	Creator                                 int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	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"`
@@ -919,6 +917,7 @@ type SgjUserAdminRole struct {
 	IsActive                                int64  `gorm:"column:is_active" json:"is_active" form:"is_active"`
 	ActiveStatus                            int64  `gorm:"column:active_status" json:"active_status" form:"active_status"`
 	Mobile                                  string
+	Name                                    string
 }
 
 //func (SgjUserAdminRole) TableName() string {

models/his_models.go

@@ -1085,8 +1085,120 @@ type MyHisProject struct {
 	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"`
+	IsMark                    int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
 }
 
 func (MyHisProject) TableName() string {
 	return "xt_his_project"
 }
+
+type MyGoodInformation 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"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+}
+
+func (MyGoodInformation) TableName() string {
+	return "xt_good_information"
+}
+
+type MySgjUserAdminRole struct {
+	ID                                      int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId                             int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId                                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId                                   int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId                                  int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName                                string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar                                  string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType                                int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle                               int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro                                   string `gorm:"column:intro" json:"intro" form:"intro"`
+	Status                                  int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserTitleName                           string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds                                 string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message                                 string `gorm:"column:message" json:"message" form:"message"`
+	Sex                                     int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday                                int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Sort                                    int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	IsSort                                  int64  `gorm:"column:is_sort" json:"is_sort" form:"is_sort"`
+	Department                              string `gorm:"column:department" json:"department" form:"department"`
+	DepartmentId                            int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	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"`
+	IsMark                                  int64  `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+}
+
+func (MySgjUserAdminRole) TableName() string {
+	return "sgj_user_admin_role"
+}

models/sz_his_models.go

@@ -40,19 +40,19 @@ type DocDetail struct {
 	CardType                                string //证件类型
 	IdCard                                  string //证件号码
 	Phone                                   string //联系电话
-	WorkMajorName                           string // 从事专业名称
+	WorkMajorName                           string // 现从事专业名称
 	Nation                                  string //民族
 	BirthDay                                int64  // 出生日期
 	WorkTime                                int64  //参加工作日期
 	Education                               string //学历
-	StudyMajorName                          string //所学专业名称
-	CertificateCode                         string //证书编码
-	MedicalCode                             string //医师资格编码
+	StudyMajorName                          string //所学的专业名称
+	CertificateCode                         string //bkc323	医（药）师执业证书编码
+	MedicalCode                             string //医（药）师资格证编码
 	MedicalRangeCode                        string //医师执业范围代码
-	MedicalLevel                            string //医生级别
-	TypeJob                                 string //职业类别
-	DoctorNumber                            string //医师编号
-	Licensing                               string //职业标志
+	MedicalLevel                            string //医生执业资格证中的医师级别
+	TypeJob                                 string //医生执业资格证中的执业类别
+	DoctorNumber                            string //医保医师编号
+	Licensing                               string //多点执业标志
 	DoctorServiceStatus                     string //医师医保服务资格状态
 	MonitoringLevel                         string //监控等级
 	DrugPsychotropicSubstances              string //毒麻精神药品资格

routers/router.go

@@ -1,7 +1,8 @@
 package routers
 
 import (
-	"gdyb/controllers/sg"
+	"gdyb/controllers/sz"
+
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
@@ -20,8 +21,8 @@ func init() {
 		AllowCredentials: true,
 	}))
 
-	sg.HisManagerApiRegistRouters()
-	sg.GdybRegistRouters()
-	//sz.SZHisManagerApiRegistRouters()
+	//sg.HisManagerApiRegistRouters()
+	//sg.GdybRegistRouters()
+	sz.SZHisManagerApiRegistRouters()
 
 }

service/his_project_service.go

@@ -716,3 +716,17 @@ func GetBatchDrugList(idss []int64) (drug []*models.BaseDrugList, err error) {
 
 	return drug, err
 }
+
+func GetBatchGoodInformationList(idss []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 len(idss) == 1 {
+		db = db.Where("x.id = ?", idss[0])
+	} else {
+		db = db.Where("x.id IN(?)", idss)
+	}
+	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
+}

service/his_service.go

@@ -1045,7 +1045,7 @@ func GetGoodListByDetail(orgid int64, id int64) (good []*models.GoodInformation,
 
 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
+	err = UserReadDB().Model(&role).Where("org_id = ? and status = 1 and admin_user_id = ? and user_type = 2", orgid, id).Scan(&role).Error
 	return role, err
 }
 
@@ -1059,3 +1059,29 @@ func GetMyPorjecgListDetail(orgid int64, id int64) (project []*models.MyHisProje
 	err = XTReadDB().Model(&project).Where("user_org_id = ? and status = 1 and id = ?", orgid, id).Find(&project).Error
 	return project, err
 }
+
+func GetBathchMyPorjecgList(idss []int64) (project []*models.MyHisProject, err error) {
+	db := XTReadDB().Table("xt_his_project")
+	if len(idss) == 1 {
+		err = db.Where("status = 1 and id = ?", idss[0]).Find(&project).Error
+	} else {
+		err = db.Where("status = 1 and id IN(?)", idss).Find(&project).Error
+	}
+
+	return project, err
+}
+
+func GetBatchDoctorList(idss []int64) (role []*models.SgjUserAdminRole, err error) {
+
+	db := UserReadDB().Table("sgj_user_admin_role as x").Where("x.status =1")
+	table := UserReadDB().Table("sgj_user_admin as a")
+	fmt.Println(table)
+	if len(idss) == 1 {
+		db = db.Where("x.status = 1 and x.admin_user_id = ?", idss[0])
+	} else {
+		db = db.Where("x.status = 1 and x.admin_user_id IN(?)", idss)
+	}
+	err = db.Select("x.age,x.id,x.admin_user_id,x.org_id,x.app_id,x.role_id,x.user_name,x.avatar,x.user_type,x.user_title,x.intro,x.user_title_name,x.role_ids,x.message,x.sex,x.birthday,x.sort,x.is_sort,x.department,x.department_id,x.nation,x.card_type,x.id_card,x.education,x.study_major_name,x.work_major_name,x.role_type,x.medical_code,x.doctor_code,x.licensing,x.job_number,x.prescription_qualification_identification,x.identification_outpatients,x.start_time,x.medical_range_code,x.medical_level,x.medical_type_job,x.pharmacist_registration_number,x.doctor_range_code,x.doctor_level,x.doctor_type_job,x.doctor_number,x.outpatient_illness_category,x.is_active,x.active_status,a.mobile").Joins("left join sgj_user_admin as a on a.id = x.admin_user_id").Scan(&role).Error
+	return role, err
+
+}

service/sz_his_service.go

@@ -607,6 +607,7 @@ func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedru
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "JY003" // 交易编码
 
+	inputData["listsize"] = 1
 	inputMessage["transType"] = "ML008" // 交易编码S
 	feedetail := make([]map[string]interface{}, 0)
 	feedetailInfo := make(map[string]interface{})
@@ -707,7 +708,7 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *mo
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
-
+	inputData["listsize"] = 1
 	inputMessage["transType"] = "ML009" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
@@ -835,8 +836,8 @@ func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas [
 	for _, item := range datas {
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["ake003"] = strconv.FormatInt(typeId, 10)
-		feedetailInfo["ake001"] = item.MedicalInsuranceNumber //社保目录编码
-		feedetailInfo["ake005"] = item.MedicalInsuranceNumber //协议机构内部目录编码
+		feedetailInfo["ake001"] = item.SocialSecurityDirectoryCode //社保目录编码
+		feedetailInfo["ake005"] = item.SocialSecurityDirectoryCode //协议机构内部目录编码
 		feedetail = append(feedetail, feedetailInfo)
 	}
 
@@ -878,58 +879,55 @@ func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas [
 
 }
 
-func SzybYS001(doctor string, doctor_code string, fixmedins_code string, datas []*models.DocDetail) string {
+func SzybYS001(doctor string, doctor_code string, fixmedins_code string, doc *models.DocDetail) string {
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
 
-	inputData["listsize"] = len(datas)
+	inputData["listsize"] = 1
 	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"] = "1"
-		feedetailInfo["aac004"] = item.Sex
-		feedetailInfo["aac058"] = item.CardType
-		feedetailInfo["aac147"] = item.IdCard
-		feedetailInfo["aae005"] = item.Phone
-		feedetailInfo["bkc322"] = item.WorkMajorName
-		feedetailInfo["aac005"] = item.Nation
-		feedetailInfo["aac006"] = item.BirthDay
-		feedetailInfo["aac007"] = item.WorkTime
-		feedetailInfo["aac011"] = item.Education
-		feedetailInfo["aac183"] = item.StudyMajorName
-		feedetailInfo["bkc323"] = item.CertificateCode
-		feedetailInfo["bke955"] = item.MedicalCode
-		feedetailInfo["akc055"] = item.MedicalRangeCode
-		feedetailInfo["bcc950"] = item.MedicalLevel
-		feedetailInfo["bcc955"] = item.TypeJob
-		feedetailInfo["bka503"] = item.DoctorNumber
-		feedetailInfo["bkc324"] = item.Licensing
-		feedetailInfo["bkc326"] = item.DoctorServiceStatus
-		feedetailInfo["bkc328"] = item.MonitoringLevel
-		feedetailInfo["bkc329"] = item.DrugPsychotropicSubstances
-		feedetailInfo["bke801"] = item.HealthCareCode
-		feedetailInfo["bkc330"] = item.PlanningTechnicalServiceCode
-		feedetailInfo["bkc332"] = item.PharmacistType
-		feedetailInfo["bkc333"] = item.PharmacistPracticeCategory
-		feedetailInfo["bkc334"] = item.PharmacistsLicensing
-		feedetailInfo["bkc335"] = item.PharmacistRegistrationNumber
-		feedetailInfo["akf001"] = item.OfficeCode
-		feedetailInfo["acc501"] = item.JobNumber
-		feedetailInfo["ahc451"] = item.PostName
-		feedetailInfo["aaf009"] = item.TechnicalJobLevelCode
-		feedetailInfo["bkc321"] = item.IsActive
-		feedetailInfo["ckc302"] = item.PrescriptionQualificationIdentification
-		feedetailInfo["bkc325"] = item.IdentificationOutpatients
-		feedetailInfo["ckc304"] = item.OutpatientIllnessCategory
-		feedetailInfo["aae030"] = item.StartTime
-		feedetail = append(feedetail, feedetailInfo)
-	}
+	feedetailInfo := make(map[string]interface{})
+	feedetailInfo["aac003"] = doc.UserName                                //医护人员姓名
+	feedetailInfo["bka633"] = "1"                                         //医护人员类别
+	feedetailInfo["aac004"] = doc.Sex                                     //性别
+	feedetailInfo["aac058"] = doc.CardType                                //证件类型
+	feedetailInfo["aac147"] = doc.IdCard                                  //证件号码
+	feedetailInfo["aae005"] = doc.Phone                                   //联系电话
+	feedetailInfo["bkc322"] = doc.WorkMajorName                           //现从事专业名称
+	feedetailInfo["aac005"] = doc.Nation                                  //民族
+	feedetailInfo["aac006"] = doc.BirthDay                                //出生日期
+	feedetailInfo["aac007"] = doc.WorkTime                                //参加工作日期
+	feedetailInfo["aac011"] = doc.Education                               //学历
+	feedetailInfo["aac183"] = doc.StudyMajorName                          //所学的专业名称
+	feedetailInfo["bkc323"] = doc.CertificateCode                         //医（药）师执业证书编码
+	feedetailInfo["bke955"] = doc.MedicalCode                             //医（药）师资格证编码
+	feedetailInfo["akc055"] = doc.MedicalRangeCode                        //	医师执业范围代码
+	feedetailInfo["bcc950"] = doc.MedicalLevel                            //医生执业资格证中的医师级别
+	feedetailInfo["bcc955"] = doc.TypeJob                                 //医生执业资格证中的执业类别
+	feedetailInfo["bka503"] = doc.DoctorNumber                            //医保医师编号
+	feedetailInfo["bkc324"] = doc.Licensing                               //多点执业标志
+	feedetailInfo["bkc326"] = doc.DoctorServiceStatus                     //医师医保服务资格状态
+	feedetailInfo["bkc328"] = doc.MonitoringLevel                         //监控等级
+	feedetailInfo["bkc329"] = doc.DrugPsychotropicSubstances              //毒麻精神药品资格
+	feedetailInfo["bke801"] = doc.HealthCareCode                          //母婴保健技术考核合格证书编号
+	feedetailInfo["bkc330"] = doc.PlanningTechnicalServiceCode            //bkc330	计划生育技术服务人员合格证编号
+	feedetailInfo["bkc332"] = doc.PharmacistType                          //药师类别
+	feedetailInfo["bkc333"] = doc.PharmacistPracticeCategory              //药师执业类别
+	feedetailInfo["bkc334"] = doc.PharmacistsLicensing                    //药师执业范围
+	feedetailInfo["bkc335"] = doc.PharmacistRegistrationNumber            //执业药师注册证编号
+	feedetailInfo["akf001"] = doc.OfficeCode                              //所属科室编码
+	feedetailInfo["acc501"] = doc.JobNumber                               //工号
+	feedetailInfo["ahc451"] = doc.PostName                                //职务名称
+	feedetailInfo["aaf009"] = doc.TechnicalJobLevelCode                   //专业技术职务级别编码
+	feedetailInfo["bkc321"] = doc.IsActive                                //在职与否
+	feedetailInfo["ckc302"] = doc.PrescriptionQualificationIdentification //处方资格标识
+	feedetailInfo["bkc325"] = doc.IdentificationOutpatients               //门诊大病医师 标识
+	feedetailInfo["ckc304"] = doc.OutpatientIllnessCategory               //门诊大病类别
+	feedetailInfo["aae030"] = doc.StartTime                               //开始日期
+	feedetail = append(feedetail, feedetailInfo)
 
 	inputData["inputlist"] = feedetail
 	inputMessage["transBody"] = inputData
@@ -969,24 +967,112 @@ func SzybYS001(doctor string, doctor_code string, fixmedins_code string, datas [
 
 }
 
-func SzybYS002(doctor string, doctor_code string, fixmedins_code string, datas []*models.DocDetail) string {
+//func SzybYS001(doctor string, doctor_code string, fixmedins_code string, datas []*models.DocDetail) string {
+//	//生成输入报文
+//	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
+//
+//	inputData := make(map[string]interface{})
+//
+//	inputData["listsize"] = len(datas)
+//	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"] = "1"
+//		feedetailInfo["aac004"] = item.Sex
+//		feedetailInfo["aac058"] = item.CardType
+//		feedetailInfo["aac147"] = item.IdCard
+//		feedetailInfo["aae005"] = item.Phone
+//		feedetailInfo["bkc322"] = item.WorkMajorName
+//		feedetailInfo["aac005"] = item.Nation
+//		feedetailInfo["aac006"] = item.BirthDay
+//		feedetailInfo["aac007"] = item.WorkTime
+//		feedetailInfo["aac011"] = item.Education
+//		feedetailInfo["aac183"] = item.StudyMajorName
+//		feedetailInfo["bkc323"] = item.CertificateCode
+//		feedetailInfo["bke955"] = item.MedicalCode
+//		feedetailInfo["akc055"] = item.MedicalRangeCode
+//		feedetailInfo["bcc950"] = item.MedicalLevel
+//		feedetailInfo["bcc955"] = item.TypeJob
+//		feedetailInfo["bka503"] = item.DoctorNumber
+//		feedetailInfo["bkc324"] = item.Licensing
+//		feedetailInfo["bkc326"] = item.DoctorServiceStatus
+//		feedetailInfo["bkc328"] = item.MonitoringLevel
+//		feedetailInfo["bkc329"] = item.DrugPsychotropicSubstances
+//		feedetailInfo["bke801"] = item.HealthCareCode
+//		feedetailInfo["bkc330"] = item.PlanningTechnicalServiceCode
+//		feedetailInfo["bkc332"] = item.PharmacistType
+//		feedetailInfo["bkc333"] = item.PharmacistPracticeCategory
+//		feedetailInfo["bkc334"] = item.PharmacistsLicensing
+//		feedetailInfo["bkc335"] = item.PharmacistRegistrationNumber
+//		feedetailInfo["akf001"] = item.OfficeCode
+//		feedetailInfo["acc501"] = item.JobNumber
+//		feedetailInfo["ahc451"] = item.PostName
+//		feedetailInfo["aaf009"] = item.TechnicalJobLevelCode
+//		feedetailInfo["bkc321"] = item.IsActive
+//		feedetailInfo["ckc302"] = item.PrescriptionQualificationIdentification
+//		feedetailInfo["bkc325"] = item.IdentificationOutpatients
+//		feedetailInfo["ckc304"] = item.OutpatientIllnessCategory
+//		feedetailInfo["aae030"] = item.StartTime
+//		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 SzybYS002(doctor string, doctor_code string, fixmedins_code string, datas *models.DocDetail) string {
 
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
 
-	inputData["listsize"] = len(datas)
+	inputData["listsize"] = 1
 	inputMessage["transType"] = "YS002" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
-	for _, item := range datas {
-		fmt.Println("item2222", item)
-		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["bkc320"] = "H27224269"
-		feedetailInfo["bke155"] = "4"
-		feedetail = append(feedetail, feedetailInfo)
-	}
+	feedetailInfo := make(map[string]interface{})
+	feedetailInfo["bkc320"] = datas.DoctorNumber
+	feedetailInfo["bke155"] = "4"
+	feedetail = append(feedetail, feedetailInfo)
 
 	inputData["inputlist"] = feedetail
 	inputMessage["transBody"] = inputData
@@ -1123,24 +1209,23 @@ func SzybYML007(doctor string, doctor_code string, fixmedins_code string, infor
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
-
+	inputData["listsize"] = 1
 	inputMessage["transType"] = "ML007" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
 	feedetailInfo := make(map[string]interface{})
 	feedetailInfo["ake001"] = infor.SocialSecurityDirectoryCode // 社保目录编码
-	//feedetailInfo["ake001"] = "3333333333" // 社保目录编码
+
 	feedetailInfo["ake005"] = infor.SocialSecurityDirectoryCode //协议机构内部目录编码
-	//feedetailInfo["ake006"] = item.GoodName                    //医药机构内部目录名称
-	feedetailInfo["ake006"] = "222222"                //医药机构内部目录名称
-	feedetailInfo["bka053"] = infor.ManufacturerName  //生产厂家
-	feedetailInfo["ake004"] = infor.ProductionType    //生产地类别
-	feedetailInfo["ckf261"] = infor.SpecialMedical    //特殊医用材料标识
-	feedetailInfo["aka067"] = "支"                     //计价单位
-	feedetailInfo["aka074"] = infor.SpecificationName //规格
-	feedetailInfo["bka505"] = infor.BuyPrice          //进货价
-	feedetailInfo["bka506"] = infor.SellPrice         // 收获价
-	feedetailInfo["aae013"] = infor.Remark            //备注
+	feedetailInfo["ake006"] = infor.GoodName                    //医药机构内部目录名称
+	feedetailInfo["bka053"] = infor.ManufacturerName            //生产厂家
+	feedetailInfo["ake004"] = infor.ProductionType              //生产地类别
+	feedetailInfo["ckf261"] = infor.SpecialMedical              //特殊医用材料标识
+	feedetailInfo["aka067"] = "支"                               //计价单位
+	feedetailInfo["aka074"] = infor.SpecificationName           //规格
+	feedetailInfo["bka505"] = infor.BuyPrice                    //进货价
+	feedetailInfo["bka506"] = infor.SellPrice                   // 收获价
+	feedetailInfo["aae013"] = infor.Remark                      //备注
 	feedetail = append(feedetail, feedetailInfo)
 
 	inputData["inputlist"] = feedetail
@@ -1285,14 +1370,14 @@ func UpdateDrugByIdDetail(id int64) (models.XtBaseDrug, error) {
 	return drug, err
 }
 
-func UpdateGoodInformaitonByDetail(id int64) (models.XtGoodInformation, error) {
-	information := models.XtGoodInformation{}
+func UpdateGoodInformaitonByDetail(id int64) (models.MyGoodInformation, error) {
+	information := models.MyGoodInformation{}
 	err := XTWriteDB().Model(&information).Where("id=?", id).Updates(map[string]interface{}{"is_mark": 1}).Error
 	return information, err
 }
 
-func UpdateGoodInfoById(id int64) (models.XtGoodInformation, error) {
-	information := models.XtGoodInformation{}
+func UpdateGoodInfoById(id int64) (models.MyGoodInformation, error) {
+	information := models.MyGoodInformation{}
 	err := XTWriteDB().Model(&information).Where("id=?", id).Updates(map[string]interface{}{"is_mark": 0}).Error
 	return information, err
 }
@@ -1308,3 +1393,10 @@ func UpdateMyProjectById(id int64) (models.MyHisProject, error) {
 	err := XTWriteDB().Model(&project).Where("id = ?", id).Updates(map[string]interface{}{"is_mark": 0}).Error
 	return project, err
 }
+
+func UpdateAdminUserRoleById(id int64) (models.MySgjUserAdminRole, error) {
+
+	role := models.MySgjUserAdminRole{}
+	err = UserWriteDB().Model(&role).Where("admin_user_id = ?", id).Updates(map[string]interface{}{"is_mark = ?": 1}).Error
+	return role, err
+}