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

conf/app.conf

@@ -50,7 +50,7 @@ httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
-
+url = "http://192.168.1.88:6666/szsi-portal/transData"
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh
@@ -149,7 +149,7 @@ call_domain = http://hf.szjkhd.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
 org_id = 9538
-
+url  = "http://192.168.1.228:17001/szsi-portal/transData"
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/sz/sz_his_api_controller.go

@@ -330,8 +330,6 @@ func SZHisManagerApiRegistRouters() {
 	beego.Router("/sz/api/register/get", &SZHisApiController{}, "get:GetRegisterInfo")
 	//上传明细，预结算
 	//beego.Router("/sz/api/upload/get", &SZHisApiController{}, "get:GetUploadInfo")
-	//获取个人信息
-	//beego.Router("/sz/api/info/get", &SZHisApiController{}, /**/"get:GetInfo")
 
 	//结算
 	beego.Router("/sz/api/settle/get", &SZHisApiController{}, "get:GetSettleInfo")
@@ -3378,8 +3376,6 @@ func (c *SZHisApiController) GetDrugList() {
 	orgId := adminUserInfo.CurrentOrgId
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(orgId, admin_user_id)
-	fmt.Println("222222222222", roles)
-	fmt.Println("rolessssssss", roles.UserName)
 	ids := c.GetString("ids")
 
 	stringarr := strings.Split(ids, ",")
@@ -3395,14 +3391,6 @@ func (c *SZHisApiController) GetDrugList() {
 
 	//获取药品剂型
 	drugs, _ := service.GetDrugDosageForm(orgId)
-	for _, item := range list {
-
-		for _, it := range drugs {
-			if item.DrugDosageForm == it.Value {
-				item.DrugDosageName = it.Name
-			}
-		}
-	}
 	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
 	var doctor_code string
@@ -3411,12 +3399,13 @@ func (c *SZHisApiController) GetDrugList() {
 	doctor_code = "1001"
 
 	var isSuccess bool = true
-
+	timeLayout := "20060102"
 	//这里就可以查看开始和结束了
 	for _, item := range list {
-		detail := &models.DrugDetail{
+		recordDate := time.Unix(item.RecordDate, 0).Format(timeLayout)
 
-			MedicalInsuranceNumber: item.MedicalInsuranceNumber,
+		detail := &models.DrugDetail{
+			MedicalInsuranceNumber: item.SocialSecurityDirectoryCode,
 			Code:             item.Code,
 			DrugName:         item.DrugName,
 			DrugSpec:         item.DrugSpec,
@@ -3426,6 +3415,14 @@ func (c *SZHisApiController) GetDrugList() {
 			RetailPrice:      item.RetailPrice,
 			LastPrice:        item.LastPrice,
 			LimitRemark:      item.LimitRemark,
+			PrescriptionMark: strconv.FormatInt(item.PrescriptionMark, 10),
+			RecordDate:       recordDate,
+		}
+
+		for _, it := range drugs {
+			if item.DrugDosageForm == it.Value {
+				detail.DrugDosageName = it.Code
+			}
 		}
 
 		result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, detail)
@@ -3462,11 +3459,17 @@ func (c *SZHisApiController) GetDrugList() {
 			return
 		}
 		fmt.Println(isSuccess)
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.Transreturnmessage,
+		})
+		return
 	}
 }
 
 func (c *SZHisApiController) GetTreatmentProject() {
-	fmt.Println("触发了吗2222222222")
+
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 
@@ -3480,28 +3483,33 @@ func (c *SZHisApiController) GetTreatmentProject() {
 		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
 	doctor_name = roles.UserName
 	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,
+			SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
+			SpecailProject:              item.SpecailProject,
+			RecordDate:                  item.RecordDate,
 		}
 
 		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)
@@ -3523,7 +3531,7 @@ func (c *SZHisApiController) GetTreatmentProject() {
 		if res.Transreturncode == "00000000" {
 			//备案成功返回状态值
 			_, err := service.UpdateProjectById(item.ID)
-			fmt.Println("err22222", err)
+			fmt.Println("err", err)
 		} else {
 			isSuccess = false
 			//失败
@@ -3534,6 +3542,11 @@ func (c *SZHisApiController) GetTreatmentProject() {
 			return
 		}
 		fmt.Println(isSuccess)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.Transreturnmessage,
+		})
+		return
 	}
 
 }
@@ -3548,7 +3561,7 @@ func (c *SZHisApiController) GetRevocation() {
 	//用来区分是药品的撤销还是耗材的撤销  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 {
 		//撤销
 		if is_mark == 1 {
@@ -3585,7 +3598,7 @@ func (c *SZHisApiController) GetRevocation() {
 				fmt.Println(list[start-1 : stop])
 				var customs []*models.DrugDetail
 				for _, item := range list {
-					fmt.Println("医疗机构编码", item.MedicalInsuranceNumber, item.Code)
+
 					detail := &models.DrugDetail{
 
 						SocialSecurityDirectoryCode: item.MedicalInsuranceNumber, //社保目录
@@ -3623,7 +3636,7 @@ func (c *SZHisApiController) GetRevocation() {
 				if res.Transreturncode == "00000000" {
 					//撤销成功
 					_, err := service.UpdateDrugByIdDetail(id)
-					fmt.Println("err22222", err)
+					fmt.Println("err", err)
 				} else {
 					isSuccess = false
 					//失败
@@ -3635,6 +3648,11 @@ func (c *SZHisApiController) GetRevocation() {
 					return
 				}
 				fmt.Println(isSuccess)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.Transreturnmessage,
+				})
+				return
 			}
 
 		}
@@ -3644,21 +3662,12 @@ func (c *SZHisApiController) GetRevocation() {
 
 			adminUserInfo := c.GetAdminUserInfo()
 			orgId := adminUserInfo.CurrentOrgId
-			fmt.Println(orgId)
+
 			//获取药品库数据
 			list, _ := service.GetDrugListByDetail(orgId, id)
 			//获取药品剂型
 			drugs, _ := service.GetDrugDosageForm(orgId)
-			for _, item := range list {
-				fmt.Println(item.DrugDosageForm)
-				for _, it := range drugs {
 
-					if item.DrugDosageForm == it.Value {
-						item.DrugDosageName = it.Name
-					}
-				}
-			}
-			fmt.Print("长度", len(list))
 			miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 			var doctor_name string
 			var doctor_code string
@@ -3670,7 +3679,7 @@ func (c *SZHisApiController) GetRevocation() {
 
 			//这里就可以查看开始和结束了
 			for _, item := range list {
-				fmt.Print("长度", item.MedicalInsuranceNumber, item.Code)
+
 				detail := &models.DrugDetail{
 					MedicalInsuranceNumber:      item.MedicalInsuranceNumber,
 					SocialSecurityDirectoryCode: item.MedicalInsuranceNumber,
@@ -3685,6 +3694,13 @@ func (c *SZHisApiController) GetRevocation() {
 					LimitRemark:      item.LimitRemark,
 				}
 
+				for _, it := range drugs {
+
+					if item.DrugDosageForm == it.Value {
+						detail.DrugDosageName = it.Code
+					}
+				}
+
 				result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, detail)
 
 				var dat map[string]interface{}
@@ -3712,13 +3728,18 @@ func (c *SZHisApiController) GetRevocation() {
 					fmt.Println("err", err)
 				}
 				fmt.Println(isSuccess)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.Transreturnmessage,
+				})
+				return
 			}
 
 		}
 	}
 
 	if type_id == 2 {
-		fmt.Println("222222222222222q2")
+
 		//撤销
 		if is_mark == 1 {
 			//获取药品库数据
@@ -3794,9 +3815,14 @@ func (c *SZHisApiController) GetRevocation() {
 					return
 				}
 				fmt.Println(isSuccess)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.Transreturnmessage,
+				})
+				return
 			}
 		}
-		fmt.Println("is_marke", is_mark)
+
 		//备案
 		if is_mark == 0 {
 
@@ -3822,7 +3848,7 @@ func (c *SZHisApiController) GetRevocation() {
 				}
 
 				result := service.SzybML009(doctor_name, doctor_code, miConfig.Code, detail)
-				fmt.Println("reuslt9999999999999999", result)
+				fmt.Println("reuslt", result)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result), &dat); err == nil {
 					fmt.Println(dat)
@@ -3844,7 +3870,7 @@ func (c *SZHisApiController) GetRevocation() {
 				if res.Transreturncode == "00000000" {
 					//备案成功返回状态值
 					_, err := service.UpdateProjectById(item.ID)
-					fmt.Println("err22222", err)
+					fmt.Println("err", err)
 				} else {
 					isSuccess = false
 					//失败
@@ -3856,6 +3882,11 @@ func (c *SZHisApiController) GetRevocation() {
 					return
 				}
 				fmt.Println(isSuccess)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.Transreturnmessage,
+				})
+				return
 			}
 		}
 	}
@@ -3936,6 +3967,11 @@ func (c *SZHisApiController) GetRevocation() {
 					return
 				}
 				fmt.Println(isSuccess)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.Transreturnmessage,
+				})
+				return
 			}
 		}
 		//备案
@@ -3943,10 +3979,10 @@ func (c *SZHisApiController) GetRevocation() {
 
 			adminUserInfo := c.GetAdminUserInfo()
 			orgId := adminUserInfo.CurrentOrgId
-			fmt.Println("3344555555555", orgId)
+
 			//获取所有耗材信息
 			list, _ := service.GetGoodListByDetail(orgId, id)
-			fmt.Println("list22222", list)
+
 			//获取单位
 			miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 			var doctor_name string
@@ -3957,7 +3993,7 @@ func (c *SZHisApiController) GetRevocation() {
 
 			var isSuccess bool = true
 			for _, item := range list {
-				fmt.Println("生产厂商", item.ManufacturerName)
+
 				detail := &models.XtGoodInformation{
 					GoodName:                    item.GoodName,
 					SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
@@ -3971,7 +4007,7 @@ func (c *SZHisApiController) GetRevocation() {
 				}
 
 				result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, detail)
-				fmt.Println("reuslt8888", result)
+				fmt.Println("reuslt", result)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result), &dat); err == nil {
 					fmt.Println(dat)
@@ -3984,22 +4020,33 @@ func (c *SZHisApiController) GetRevocation() {
 				var res Result
 				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res.Transreturnmessage,
+					})
 					return
 				}
 				if res.Transreturncode == "00000000" {
 
 					//备案成功返回状态
 					_, err := service.UpdateGoodInformaitonByDetail(item.ID)
-					fmt.Println("err2222222", err)
+					fmt.Println("err", err)
 				} else {
 					isSuccess = false
 					//失败
 
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res.Transreturnmessage,
+					})
 					return
 				}
 				fmt.Println(isSuccess)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.Transreturnmessage,
+				})
+				return
 			}
 		}
 
@@ -4011,9 +4058,9 @@ func (c *SZHisApiController) GetDoctorList() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
-	fmt.Println("or3gi", orgid)
+
 	ids := c.GetString("ids")
-	fmt.Println("ids2222222222", ids)
+
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(orgid, admin_user_id)
 	stringarr := strings.Split(ids, ",")
@@ -4027,7 +4074,7 @@ func (c *SZHisApiController) GetDoctorList() {
 	//list, _ := service.GetDoctorList(orgid)
 	//批量查询
 	list, _ := service.GetBatchDoctorList(idss)
-	fmt.Println("list22222222222", list)
+
 	//获取所有角色名称
 	roleList, _ := service.GetRoleList(orgid)
 
@@ -4048,7 +4095,7 @@ func (c *SZHisApiController) GetDoctorList() {
 	var isSuccess bool = true
 
 	for _, item := range list {
-		fmt.Println("医护类别", item.StudyMajorName)
+
 		detail := &models.DocDetail{
 			UserName:                     item.UserName,                               //医护姓名
 			RoleId:                       item.Name,                                   //医护人员类别
@@ -4057,7 +4104,7 @@ func (c *SZHisApiController) GetDoctorList() {
 			IdCard:                       item.IdCard,                                 //证件号码
 			Phone:                        item.Mobile,                                 //联系电话
 			WorkMajorName:                item.WorkMajorName,                          // 现从事专业名称
-			Nation:                       item.Nation,                                 //民族
+			Nation:                       "1",                                         //民族
 			BirthDay:                     20201022,                                    // 出生日期
 			WorkTime:                     20201022,                                    //参加工作日期
 			Education:                    strconv.FormatInt(item.Education, 10),       //学历
@@ -4092,7 +4139,7 @@ func (c *SZHisApiController) GetDoctorList() {
 		}
 
 		result := service.SzybYS001(doctor_name, doctor_code, miConfig.Code, detail)
-		fmt.Println("reuslt9999999999999999", result)
+		fmt.Println("reuslt", result)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -4105,13 +4152,16 @@ func (c *SZHisApiController) GetDoctorList() {
 		var res Result
 		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.Transreturnmessage,
+			})
 			return
 		}
 		if res.Transreturncode == "00000000" {
 			//批量插入数据
 			_, err := service.UpdateAdminUserRoleById(item.AdminUserId, orgid)
-			fmt.Println("err2222", err)
+			fmt.Println("err", err)
 		} else {
 			isSuccess = false
 			//失败
@@ -4123,6 +4173,11 @@ func (c *SZHisApiController) GetDoctorList() {
 			return
 		}
 		fmt.Println(isSuccess)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.Transreturnmessage,
+		})
+		return
 	}
 
 }
@@ -4133,14 +4188,14 @@ func (c *SZHisApiController) GetMedicalList() {
 	orgId := adminUserInfo.CurrentOrgId
 
 	id, _ := c.GetInt64("id")
-	fmt.Println("id22222222", id)
+
 	is_mark, _ := c.GetInt64("is_mark")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(orgId, admin_user_id)
 	//去登记
 	if is_mark == 0 {
 		list, _ := service.GetDoctorListByDetail(orgId, id)
-		fmt.Println("list22222222222", list)
+
 		//获取所有角色名称
 		roleList, _ := service.GetRoleList(orgId)
 
@@ -4161,7 +4216,6 @@ func (c *SZHisApiController) GetMedicalList() {
 		var isSuccess bool = true
 
 		for _, item := range list {
-			fmt.Println("医护类别", item.Mobile)
 
 			detail := &models.DocDetail{
 				UserName:                     item.UserName,                               //医护姓名
@@ -4205,7 +4259,7 @@ func (c *SZHisApiController) GetMedicalList() {
 				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)
@@ -4218,7 +4272,10 @@ func (c *SZHisApiController) GetMedicalList() {
 			var res Result
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.Transreturnmessage,
+				})
 				return
 			}
 			if res.Transreturncode == "00000000" {
@@ -4236,6 +4293,11 @@ func (c *SZHisApiController) GetMedicalList() {
 				return
 			}
 			fmt.Println(isSuccess)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.Transreturnmessage,
+			})
+			return
 		}
 	}
 
@@ -4262,7 +4324,6 @@ func (c *SZHisApiController) GetMedicalList() {
 
 		var isSuccess bool = true
 		for _, item := range list {
-			fmt.Println("医护类别", item.Name)
 			detail := &models.DocDetail{
 				UserName:                     item.UserName,                               //医护姓名
 				RoleId:                       item.Name,                                   //医护人员类别
@@ -4305,7 +4366,7 @@ func (c *SZHisApiController) GetMedicalList() {
 				EndTime:                                 0,                                                                   // 结束日期
 			}
 			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)
@@ -4318,7 +4379,10 @@ func (c *SZHisApiController) GetMedicalList() {
 			var res Result
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.Transreturnmessage,
+				})
 				return
 			}
 			if res.Transreturncode == "00000000" {
@@ -4335,6 +4399,11 @@ func (c *SZHisApiController) GetMedicalList() {
 				return
 			}
 			fmt.Println(isSuccess)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.Transreturnmessage,
+			})
+			return
 
 		}
 	}
@@ -4387,7 +4456,7 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 		fmt.Println(list[start-1 : stop])
 		var customs []*models.DocDetail
 		for _, item := range list {
-			fmt.Println("医护类别", item.Name)
+
 			detail := &models.DocDetail{
 				StaffCode:                    "",            //医护人员编码
 				UserName:                     item.UserName, //医护人员姓名
@@ -4399,7 +4468,7 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 				WorkMajorName:                "",            //现从事专业名称
 				Nation:                       "",            //民族
 				BirthDay:                     20201022,      //出生日期
-				WorkTime:                     12,            //参加工作日期
+				WorkTime:                     20201022,      //参加工作日期
 				Education:                    "",            //学历
 				StudyMajorName:               "",            //所学的专业名称
 				CertificateCode:              "",            //证书编码
@@ -4423,17 +4492,17 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 				PostName:                     "",            //职位名称
 				TechnicalJobLevelCode:        "",            //专业技术职务级别编码
 				IsActive:                     "",            //在职与否
-				PrescriptionQualificationIdentification: "",   //处方资格标识
-				IdentificationOutpatients:               "",   //门诊大病医师标识
-				OutpatientIllnessCategory:               "",   //门诊大病类别
-				StartTime:                               1233, //开始日期
-				EndTime:                                 123333,
+				PrescriptionQualificationIdentification: "",       //处方资格标识
+				IdentificationOutpatients:               "",       //门诊大病医师标识
+				OutpatientIllnessCategory:               "",       //门诊大病类别
+				StartTime:                               20201022, //开始日期
+				EndTime:                                 20201022,
 			}
 			customs = append(customs, detail)
 		}
 
 		result := service.SzybYS003(doctor_name, doctor_code, miConfig.Code, customs)
-		fmt.Println("reuslt9999999999999999", result)
+
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -4446,7 +4515,10 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 		var res Result
 		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.Transreturnmessage,
+			})
 			return
 		}
 		if res.Transreturncode == "00000000" {
@@ -4455,11 +4527,18 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 			isSuccess = false
 			//失败
 
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorDrugPreSettleFaildParamWrong)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.Transreturnmessage,
+			})
 			return
 		}
 		fmt.Println(isSuccess)
-
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.Transreturnmessage,
+		})
+		return
 	}
 }
 
@@ -4469,7 +4548,7 @@ func (c *SZHisApiController) GetGoodsList() {
 	orgId := adminUserInfo.CurrentOrgId
 
 	ids := c.GetString("ids")
-	fmt.Println("ids2222222222", ids)
+
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(orgId, admin_user_id)
 	stringarr := strings.Split(ids, ",")
@@ -4481,7 +4560,7 @@ func (c *SZHisApiController) GetGoodsList() {
 	}
 	//批量获取所有耗材信息
 	list, _ := service.GetBatchGoodInformationList(idss)
-	fmt.Println("list22222", list)
+
 	//获取单位
 	miConfig, _ := service.FindMedicalInsuranceInfo(orgId)
 	var doctor_name string
@@ -4492,7 +4571,6 @@ func (c *SZHisApiController) GetGoodsList() {
 
 	var isSuccess bool = true
 	for _, item := range list {
-		fmt.Println("生产厂商", item.ManufacturerName)
 		detail := &models.XtGoodInformation{
 			GoodName:                    item.GoodName,
 			SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
@@ -4506,7 +4584,7 @@ func (c *SZHisApiController) GetGoodsList() {
 		}
 
 		result := service.SzybYML007(doctor_name, doctor_code, miConfig.Code, detail)
-		fmt.Println("reuslt8888", result)
+		fmt.Println("reuslt", result)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -4526,7 +4604,7 @@ func (c *SZHisApiController) GetGoodsList() {
 
 			//备案成功返回状态
 			_, err := service.UpdateGoodInformaitonByDetail(item.ID)
-			fmt.Println("err2222222", err)
+			fmt.Println("err", err)
 		} else {
 			isSuccess = false
 			//失败
@@ -4538,6 +4616,11 @@ func (c *SZHisApiController) GetGoodsList() {
 			return
 		}
 		fmt.Println(isSuccess)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.Transreturnmessage,
+		})
+		return
 	}
 }
 

models/drug.go

@@ -99,59 +99,65 @@ func (MedicineInsurancePercentage) TableName() string {
 }
 
 type BaseDrugList struct {
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	DrugAlias              string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
-	DrugAliasPinyin        string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
-	DrugAliasWubi          string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
-	DrugCategory           int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec               string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType               int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit         string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace        string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm         int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
-	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	LastPrice              float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugControl            int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
-	Number                 string  `gorm:"column:number" json:"number" form:"number"`
-	DrugClassify           string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
-	DrugDose               float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
-	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	PharmacologyCategory   int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
-	StatisticsCategory     int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
-	Code                   string  `gorm:"column:code" json:"code" form:"code"`
-	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"`
-	Agent                  string  `gorm:"column:agent" json:"agent" form:"agent"`
-	DrugStatus             string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	LimitRemark            string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
-	DeliveryWay            string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency     string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	SingleDose             float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	PrescribingNumber      float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	Label                  int64   `gorm:"column:label" json:"label" form:"label"`
-	Sort                   int64   `gorm:"column:sort" json:"sort" form:"sort"`
-	IsUseDoctorAdvice      int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
-	IsDefault              int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	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"`
-	IsChargeUse            int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
-	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"`
-	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	ManufacturerName       string  `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
-	DrugDosageName         string
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                        string  `gorm:"column:code" json:"code" form:"code"`
+	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"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	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"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	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"`
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ManufacturerName            string  `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
+	DrugDosageName              string
+	PrescriptionMark            int64  `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
+	RecordDate                  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugRemark                  string `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
+	SocialSecurityDirectoryCode string `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	DoseCode                    string `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
+	IsMark                      int64  `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
 }
 
 type XtGoodInformation struct {

models/his_models.go

@@ -1027,6 +1027,7 @@ type XtDrugDataConfig struct {
 	Title          string    `gorm:"column:title" json:"title" form:"title"`
 	Content        string    `gorm:"column:content" json:"content" form:"content"`
 	Orders         int64     `gorm:"column:orders" json:"orders" form:"orders"`
+	Code           string    `gorm:"column:code" json:"code" form:"code"`
 }
 
 func (XtDrugDataConfig) TableName() string {
@@ -1054,41 +1055,44 @@ func (XtRole) TableName() string {
 }
 
 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"`
-	IsMark                    int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	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"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 }
 
 func (MyHisProject) TableName() string {

models/sz_his_models.go

@@ -31,6 +31,8 @@ type DrugDetail struct {
 	LastPrice                   float64 // 药品进货价格
 	LimitRemark                 string  //药品备注
 	SocialSecurityDirectoryCode string  //社保目录编码
+	RecordDate                  string  //备案日期
+	PrescriptionMark            string
 }
 type DocDetail struct {
 	UserName                                string //医护姓名

service/his_project_service.go

@@ -706,13 +706,12 @@ func GetBatchDrugList(idss []int64) (drug []*models.BaseDrugList, err error) {
 	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
 	table := XTReadDB().Table("xt_manufacturer as m")
 	fmt.Print(table)
-	fmt.Println("长度22222222", len(idss))
 	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.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
+	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,x.social_security_directory_code,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&drug).Error
 
 	return drug, err
 }

service/sz_his_service.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"gdyb/models"
+	"github.com/astaxie/beego"
 	"io/ioutil"
 	"math/rand"
 	"net/http"
@@ -671,10 +672,7 @@ func msToTime(ms int64) string {
 func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedrug *models.DrugDetail) string {
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
-
 	inputData := make(map[string]interface{})
-	inputMessage["transType"] = "JY003" // 交易编码
-
 	inputData["listsize"] = 1
 	inputMessage["transType"] = "ML008" // 交易编码S
 	feedetail := make([]map[string]interface{}, 0)
@@ -685,13 +683,12 @@ func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedru
 	feedetailInfo["ake006"] = basedrug.DrugName
 	feedetailInfo["aka074"] = basedrug.DrugSpec
 	feedetailInfo["aka070"] = basedrug.DrugDosageName
-	//feedetailInfo["aka070"] = "片"
 	feedetailInfo["aka067"] = basedrug.MinUnit
 	feedetailInfo["bka053"] = basedrug.ManufacturerName
 	feedetailInfo["aka064"] = "1"
 	feedetailInfo["bka505"] = basedrug.LastPrice
 	feedetailInfo["bka506"] = basedrug.RetailPrice
-	feedetailInfo["aae030"] = 20210406
+	feedetailInfo["aae030"], _ = strconv.ParseInt(basedrug.RecordDate, 10, 64)
 	feedetailInfo["aae013"] = basedrug.LimitRemark
 	feedetail = append(feedetail, feedetailInfo)
 
@@ -705,9 +702,8 @@ func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedru
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	//url := "http://192.168.1.99:10000"
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
+
+	url := beego.AppConfig.String("url")
 
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -761,7 +757,7 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
 	inputMessage["serialNumber"] = fixmedins_code + year + month + day +
 		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
 	//inputMessage["serialNumber"] = "G554020210406" + fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
-	//inputMessage["verifyCode"] = "000000|8ec5b7745a5cc45b631f23b4bf1e417e"
+	inputMessage["verifyCode"] = "000000|8ec5b7745a5cc45b631f23b4bf1e417e"
 
 	inputMessage["transReturnCode"] = ""                                           //
 	inputMessage["transReturnMessage"] = ""                                        //
@@ -773,26 +769,28 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
 }
 
 func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *models.MyHisProject) string {
+	timeLayout := "20060102"
+	record_date := time.Unix(pro.RecordDate, 0).Format(timeLayout)
+	recordDate, _ := strconv.ParseInt(record_date, 10, 64)
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
-
+	inputData["listsize"] = 1
 	inputMessage["transType"] = "ML009" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
 
 	feedetailInfo := make(map[string]interface{})
-	feedetailInfo["ake001"] = pro.MedicalCode //社保目录编码
-	feedetailInfo["ake005"] = pro.MedicalCode //协议机构内部目录编码
-	feedetailInfo["ake006"] = pro.ProjectName // 协议机构内部目录名称
-	feedetailInfo["bkf131"] = pro.Category    //协议机构项目类别
-	feedetailInfo["bkm062"] = "0"             // 门诊特检项目标识
-	feedetailInfo["bka506"] = pro.Price       // 协议机构内部项目收费价格
-	feedetailInfo["aae030"] = 20210407        // 备案日期
-	feedetailInfo["aae013"] = pro.Remark      // 备注
+	feedetailInfo["ake001"] = pro.SocialSecurityDirectoryCode           //社保目录编码
+	feedetailInfo["ake005"] = pro.SocialSecurityDirectoryCode           //协议机构内部目录编码
+	feedetailInfo["ake006"] = pro.ProjectName                           // 协议机构内部目录名称
+	feedetailInfo["bkf131"] = pro.Category                              //协议机构项目类别
+	feedetailInfo["bkm062"] = strconv.FormatInt(pro.SpecailProject, 10) // 门诊特检项目标识
+	feedetailInfo["bka506"] = pro.Price                                 // 协议机构内部项目收费价格
+	feedetailInfo["aae030"] = recordDate                                // 备案日期
+	feedetailInfo["aae013"] = pro.Remark                                // 备注
 	feedetail = append(feedetail, feedetailInfo)
 
-	fmt.Println("feeedDetal2333333333", feedetail)
 	inputData["inputlist"] = feedetail
 	inputMessage["transBody"] = inputData
 
@@ -803,9 +801,7 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *mo
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	//url := "http://192.168.1.99:10000"
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
+	url := beego.AppConfig.String("url")
 
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -921,9 +917,7 @@ func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas [
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	//url := "http://192.168.1.99:10000"
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
+	url := beego.AppConfig.String("url")
 
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -1010,9 +1004,7 @@ func SzybYS001(doctor string, doctor_code string, fixmedins_code string, doc *mo
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	//url := "http://192.168.1.99:10000"
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
+	url := beego.AppConfig.String("url")
 
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -1156,9 +1148,7 @@ func SzybYS002(doctor string, doctor_code string, fixmedins_code string, datas *
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	//url := "http://192.168.1.99:10000"
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
+	url := beego.AppConfig.String("url")
 
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -1249,9 +1239,7 @@ func SzybYS003(doctor string, doctor_code string, fixmedins_code string, datas [
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	//url := "http://192.168.1.99:10000"
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
+	url := beego.AppConfig.String("url")
 
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -1312,9 +1300,7 @@ func SzybYML007(doctor string, doctor_code string, fixmedins_code string, infor
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	//url := "http://192.168.1.99:10000"
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
+	url := beego.AppConfig.String("url")
 
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {