拉取代码

controllers/base_api_controller.go

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

controllers/sz/sz_his_api_controller.go

@@ -1615,11 +1615,12 @@ func (c *SZHisApiController) GetDrugList() {
 }
 
 func (c *SZHisApiController) GetTreatmentProject() {
+	fmt.Println("触发了吗2222222222")
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 
 	//获取药品库数据
-	list, _ := service.GetDrugList(orgId)
+	list, _ := service.GetMyPorjecgList(orgId)
 
 	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
@@ -1650,19 +1651,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)
 		}
@@ -1783,6 +1781,77 @@ func (c *SZHisApiController) GetRevocation() {
 			fmt.Println(isSuccess)
 		}
 
+		if type_id == 2 {
+
+			//获取药品库数据
+			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)))
+
+			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 {
 
 			//获取药品库数据
@@ -1903,11 +1972,11 @@ func (c *SZHisApiController) GetDoctorList() {
 	orgid := adminUserInfo.CurrentOrgId
 	fmt.Println("or3gi", orgid)
 	//获取所有医生护士信息
-	list, _ := service.GetDoctorList(orgid)
+	list, _ := service.GetDoctorList(9671)
 	//获取所有角色名称
-	roleList, _ := service.GetRoleList(orgid)
+	roleList, _ := service.GetRoleList(9671)
 
-	miConfig, _ := service.FindMedicalInsuranceInfo(orgid)
+	miConfig, _ := service.FindMedicalInsuranceInfo(9671)
 	for _, item := range list {
 		for _, it := range roleList {
 			if item.RoleId == it.ID {
@@ -1946,44 +2015,48 @@ func (c *SZHisApiController) GetDoctorList() {
 		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:                                     "",
-				CardType:                                "",
-				IdCard:                                  "",
+				Sex:                                     sex,
+				CardType:                                card_type,
+				IdCard:                                  item.IdCard,
 				Phone:                                   "",
-				WorkMajorName:                           "",
-				Nation:                                  "",
+				WorkMajorName:                           item.WorkMajorName,
+				Nation:                                  item.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, //开始日期
+				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)
 		}
@@ -2023,8 +2096,11 @@ func (c *SZHisApiController) GetMedicalList() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
+
+	id, _ := c.GetInt64("id")
+	fmt.Println("id22222222", id)
 	//获取所有医生护士信息
-	list, _ := service.GetDoctorList(orgId)
+	list, _ := service.GetDoctorListByDetail(orgId, id)
 	//获取所有角色名称
 	roleList, _ := service.GetRoleList(orgId)
 
@@ -2134,7 +2210,7 @@ func (c *SZHisApiController) GetMedicalList() {
 			isSuccess = false
 			//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugReturnFaildParamWrong)
 			return
 		}
 		fmt.Println(isSuccess)

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/his_models.go

@@ -1046,3 +1046,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

@@ -87,3 +87,11 @@ type GoodDetail struct {
 	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 and id = 855", 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
 }
 
@@ -1020,7 +1020,7 @@ func GetGoodInformationList(orgid int64) (good []*models.GoodInformation, err er
 	table := XTReadDB().Table("xt_manufacturer as m")
 	fmt.Println(table)
 	if orgid > 0 {
-		db = db.Where("x.org_id = ? and x.id= 976", orgid)
+		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
@@ -1036,3 +1036,20 @@ func GetGoodListByDetail(orgid int64, id int64) (good []*models.GoodInformation,
 	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

@@ -638,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)
 
@@ -650,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)