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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true
@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9504
+org_id = 9919
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -54,6 +54,7 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 gdyb_paasid = "sg03_prd"
+
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh

controllers/sg/gdyb_controller.go

@@ -163,7 +163,7 @@ func (c *GdybController) PostFour() {
 	secret_key := c.GetString("secret_key")
 
 	var result string
-	if c.GetAdminUserInfo().CurrentOrgId == 10106 {
+	if insuplc_admdvs == "440781" { //
 		result = service.Gdyb2203A(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)
 	} else {
 		result = service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)

controllers/sz/sz_his_api_controller.go

@@ -3796,17 +3796,17 @@ func (c *SZHisApiController) GetDrugList() {
 
 		detail := &models.DrugDetail{
 			MedicalInsuranceNumber: item.SocialSecurityDirectoryCode,
-			Code:                   item.Code,
-			DrugName:               item.DrugName,
-			DrugSpec:               item.DrugSpec,
-			DrugDosageName:         item.DrugDosageName,
-			ManufacturerName:       item.ManufacturerName,
-			MinUnit:                item.MinUnit,
-			RetailPrice:            item.RetailPrice,
-			LastPrice:              item.LastPrice,
-			LimitRemark:            item.LimitRemark,
-			PrescriptionMark:       strconv.FormatInt(item.PrescriptionMark, 10),
-			RecordDate:             recordDate,
+			Code:             item.Code,
+			DrugName:         item.DrugName,
+			DrugSpec:         item.DrugSpec,
+			DrugDosageName:   item.DrugDosageName,
+			ManufacturerName: item.ManufacturerName,
+			MinUnit:          item.MinUnit,
+			RetailPrice:      item.RetailPrice,
+			LastPrice:        item.LastPrice,
+			LimitRemark:      item.LimitRemark,
+			PrescriptionMark: strconv.FormatInt(item.PrescriptionMark, 10),
+			RecordDate:       recordDate,
 		}
 
 		for _, it := range drugs {
@@ -3888,11 +3888,11 @@ func (c *SZHisApiController) GetTreatmentProject() {
 	for _, item := range list {
 
 		detail := &models.MyHisProject{
-			MedicalCode:                 item.MedicalCode, //社保目录
-			ProjectName:                 item.ProjectName,
-			Price:                       item.Price,
-			Category:                    item.Category,
-			Remark:                      item.Remark,
+			MedicalCode: item.MedicalCode, //社保目录
+			ProjectName: item.ProjectName,
+			Price:       item.Price,
+			Category:    item.Category,
+			Remark:      item.Remark,
 			SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
 			SpecailProject:              item.SpecailProject,
 			RecordDate:                  item.RecordDate,
@@ -3992,14 +3992,14 @@ func (c *SZHisApiController) GetRevocation() {
 					detail := &models.DrugDetail{
 
 						SocialSecurityDirectoryCode: item.MedicalInsuranceNumber, //社保目录
-						Code:                        item.Code,                   //协议机构内部目录编码
-						DrugName:                    item.DrugName,               //协议机构内部目录名称
-						DrugSpec:                    item.DrugSpec,
-						ManufacturerName:            item.ManufacturerName,
-						MinUnit:                     item.MinUnit,
-						RetailPrice:                 item.RetailPrice, //协议机构内部项目收费价格
-						LimitRemark:                 item.LimitRemark,
-						MedicalInsuranceNumber:      item.MedicalInsuranceNumber, //社保目录
+						Code:                   item.Code,     //协议机构内部目录编码
+						DrugName:               item.DrugName, //协议机构内部目录名称
+						DrugSpec:               item.DrugSpec,
+						ManufacturerName:       item.ManufacturerName,
+						MinUnit:                item.MinUnit,
+						RetailPrice:            item.RetailPrice, //协议机构内部项目收费价格
+						LimitRemark:            item.LimitRemark,
+						MedicalInsuranceNumber: item.MedicalInsuranceNumber, //社保目录
 					}
 					customs = append(customs, detail)
 				}
@@ -4073,15 +4073,15 @@ func (c *SZHisApiController) GetRevocation() {
 				detail := &models.DrugDetail{
 					MedicalInsuranceNumber:      item.MedicalInsuranceNumber,
 					SocialSecurityDirectoryCode: item.MedicalInsuranceNumber,
-					Code:                        item.Code,
-					DrugName:                    item.DrugName,
-					DrugSpec:                    item.DrugSpec,
-					DrugDosageName:              item.DrugDosageName,
-					ManufacturerName:            item.ManufacturerName,
-					MinUnit:                     item.MinUnit,
-					RetailPrice:                 item.RetailPrice,
-					LastPrice:                   item.LastPrice,
-					LimitRemark:                 item.LimitRemark,
+					Code:             item.Code,
+					DrugName:         item.DrugName,
+					DrugSpec:         item.DrugSpec,
+					DrugDosageName:   item.DrugDosageName,
+					ManufacturerName: item.ManufacturerName,
+					MinUnit:          item.MinUnit,
+					RetailPrice:      item.RetailPrice,
+					LastPrice:        item.LastPrice,
+					LimitRemark:      item.LimitRemark,
 				}
 
 				for _, it := range drugs {
@@ -4485,41 +4485,42 @@ func (c *SZHisApiController) GetDoctorList() {
 	var isSuccess bool = true
 
 	for _, item := range list {
+		depart, _ := service.GetDepartMentDetail(item.DepartmentId)
 
 		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:                                  "1",                                                                 //民族
-			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:                              item.Department,                                                     //科室编码
-			JobNumber:                               item.JobNumber,                                                      //工号
-			PostName:                                "",                                                                  //职位名称
-			TechnicalJobLevelCode:                   "",                                                                  //专业技术职务级别编码
-			IsActive:                                strconv.FormatInt(item.IsActive, 10),                                //在职与否
+			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:                       "1",                                         //民族
+			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:                   depart.Number,                               //科室编码
+			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,                                      //门诊大病类别
@@ -4608,39 +4609,39 @@ func (c *SZHisApiController) GetMedicalList() {
 		for _, item := range list {
 
 			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),                                //在职与否
+				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,                                      //门诊大病类别
@@ -4715,39 +4716,39 @@ func (c *SZHisApiController) GetMedicalList() {
 		var isSuccess bool = true
 		for _, item := range list {
 			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),                                //在职与否
+				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,                                      //门诊大病类别
@@ -4848,44 +4849,44 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 		for _, item := range list {
 
 			detail := &models.DocDetail{
-				StaffCode:                               "",            //医护人员编码
-				UserName:                                item.UserName, //医护人员姓名
-				RoleId:                                  item.Name,     //医护人员类别
-				Sex:                                     "",            //性别
-				CardType:                                "",            //证件类型
-				IdCard:                                  "",            //证件号码
-				Phone:                                   "",            //联系电话
-				WorkMajorName:                           "",            //现从事专业名称
-				Nation:                                  "",            //民族
-				BirthDay:                                20201022,      //出生日期
-				WorkTime:                                20201022,      //参加工作日期
-				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:                               20201022,      //开始日期
+				StaffCode:                    "",            //医护人员编码
+				UserName:                     item.UserName, //医护人员姓名
+				RoleId:                       item.Name,     //医护人员类别
+				Sex:                          "",            //性别
+				CardType:                     "",            //证件类型
+				IdCard:                       "",            //证件号码
+				Phone:                        "",            //联系电话
+				WorkMajorName:                "",            //现从事专业名称
+				Nation:                       "",            //民族
+				BirthDay:                     20201022,      //出生日期
+				WorkTime:                     20201022,      //参加工作日期
+				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:                               20201022, //开始日期
 				EndTime:                                 20201022,
 			}
 			customs = append(customs, detail)

models/dialysis.go

@@ -916,6 +916,7 @@ type SgjUserAdminRole struct {
 	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"`
+	DepartmentId                            int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
 	Mobile                                  string
 	Name                                    string
 	Department                              string `gorm:"column:department" json:"department" form:"department"`

models/drug.go

@@ -57,6 +57,8 @@ type BaseDrugLib struct {
 	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"`
+	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 

models/his_models.go

@@ -435,6 +435,8 @@ type VMDrug struct {
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (VMDrug) TableName() string {

models/self_drug_models.go

@@ -64,6 +64,8 @@ type XtBaseDrug struct {
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	IsMark                 int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (XtBaseDrug) TableName() string {

service/gdyb_service.go

@@ -541,6 +541,8 @@ type Custom struct {
 	FeedetlSn        string
 	Price            string
 	MedListCodg      string
+	LmtUsedFlag      int64
+	HospApprFlag     int64
 }
 
 type RequestResult struct {
@@ -614,6 +616,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", subItem.Price),
 						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
+						HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
 					}
 
 					customs = append(customs, cus)
@@ -633,6 +636,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 						MedListCodg:      subItem.HisProject.MedicalCode,
+						HospApprFlag:     -1,
 					}
 					customs = append(customs, cus)
 				}
@@ -647,6 +651,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 					MedListCodg:      subItem.XtHisAddtionConfig.Code,
+					HospApprFlag:     -1,
 				}
 				customs = append(customs, cus)
 			}
@@ -687,12 +692,26 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
 		feedetailInfo["orders_dr_code"] = ""                         // 受单医生编码
 		feedetailInfo["orders_dr_name"] = ""                         // 受单医生姓名
-		feedetailInfo["hosp_appr_flag"] = "1"                        // 医院审批标志
-		feedetailInfo["tcmdrug_used_way"] = ""                       // 中药使用方式
-		feedetailInfo["etip_flag"] = ""                              // 外检标志
-		feedetailInfo["etip_hosp_code"] = ""                         // 外检医院编码
-		feedetailInfo["dscg_tkdrug_flag"] = ""                       // 出院带药标志
-		feedetailInfo["matn_fee_flag"] = ""                          // 生育费用标志
+
+		if item.HospApprFlag != -1 {
+			if item.HospApprFlag == 1 {
+				feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
+			} else if item.HospApprFlag == 2 {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			} else if item.HospApprFlag == 3 {
+				feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+			} else {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			}
+		} else {
+			feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+		}
+
+		feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式
+		feedetailInfo["etip_flag"] = ""        // 外检标志
+		feedetailInfo["etip_hosp_code"] = ""   // 外检医院编码
+		feedetailInfo["dscg_tkdrug_flag"] = "" // 出院带药标志
+		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
 		feedetail = append(feedetail, feedetailInfo)
 	}
 	input["feedetail"] = feedetail
@@ -1294,10 +1313,10 @@ func Gdyb9102(baseParams models.BaseParams, file_name string, file_qury_no strin
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "9102"                                 // 交易编码
-	inputData["file_name"] = file_name                             //文件名
-	inputData["file_qury_no"] = "fsi/H44022900158/" + file_qury_no //文件数据
-	inputData["fixmedins_code"] = baseParams.FixmedinsCode         //编码
+	inputMessage["infno"] = "9102"                         // 交易编码
+	inputData["file_name"] = file_name                     //文件名
+	inputData["file_qury_no"] = file_qury_no               //文件数据
+	inputData["fixmedins_code"] = baseParams.FixmedinsCode //编码
 	input["fsDownloadIn"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -1526,7 +1545,7 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 	return str
 }
 
-func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type_code string, start_time string, ent_time string) string {
+func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type_code string, start_time string, ent_time string, list_type string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1539,7 +1558,7 @@ func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type
 	inputMessage["infno"] = "3301" // 交易编码
 	inputData["fixmedins_hilist_id"] = codg
 	inputData["fixmedins_hilist_name"] = name
-	inputData["list_type"] = list_type_code
+	inputData["list_type"] = list_type
 	inputData["med_list_codg"] = codg
 	inputData["begndate"] = start_time
 	inputData["enddate"] = ent_time
@@ -1553,7 +1572,7 @@ func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type
 	inputData["pacspec"] = ""
 	inputData["memo"] = ""
 
-	input["catalogcompin"] = inputData
+	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
@@ -1613,7 +1632,7 @@ func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type
 	inputData["begndate"] = "2021-01-01"
 	inputData["enddate"] = "2099-01-07"
 
-	input["catalogcompin"] = inputData
+	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
@@ -1791,6 +1810,10 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 
 	timeFormatTwo := tempTime.Format("2006-01-02")
 
+	t := time.Now()
+	last := time.Date(t.Year(), time.December, 31, 0, 0, 0, 0, time.UTC)
+	tm := time.Unix(last.Unix(), 0)
+
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
@@ -1809,7 +1832,7 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	inputData["begndate"] = timeFormatTwo          // 医师编码
 	inputData["tel"] = ""                          // 医师编码
 	inputData["addr"] = ""                         // 医师编码
-	inputData["enddate"] = "2099-12-31"            // 医师编码
+	inputData["enddate"] = tm.Format("2006-01-02") // 医师编码
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -1867,6 +1890,8 @@ func Gdyb2504(psnNo string, org_name string, doctor string, fixmedins_code strin
 	inputMessage["infno"] = "2504"                   // 交易编码
 	inputData["psn_no"] = psnNo                      // 人员编号 （来自1101接口返回）
 	inputData["trt_dcla_detl_sn"] = trt_dcla_detl_sn // 人员编号 （来自1101接口返回）
+	inputData["memo"] = "撤销备案"                       // 人员编号 （来自1101接口返回）
+
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
@@ -2498,7 +2523,7 @@ func CreatePsnNCDSRecord(record *models.GdybPsnNcdsRecord) {
 }
 
 func GetPsnNCDSRecordById(id int64) (record models.GdybPsnNcdsRecord, err error) {
-	err = readDb.Model(&models.GdybPsnNcdsRecord{}).Where("id = ?").First(&record).Error
+	err = readDb.Model(&models.GdybPsnNcdsRecord{}).Where("id = ?", id).First(&record).Error
 	return
 }
 

service/his_service.go

@@ -390,6 +390,8 @@ type BaseDrugLib struct {
 	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"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`
@@ -864,17 +866,17 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
 }
 
 func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_type string) (orders []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND settle_accounts_date <= ? AND settle_accounts_date >= ? AND insutype = ?", org_id, end_time, start_time, insutype).Find(&orders).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype).Find(&orders).Error
 	return
 }
 
 func GetOrderByTimeThree(start_time int64, end_time int64, org_id int64, insutype string, clr_type string) (orders []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1  AND is_medicine_insurance = 1 AND settle_accounts_date <= ? AND settle_accounts_date >= ? AND insutype = ?", org_id, end_time, start_time, insutype).Find(&orders).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1  AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time) <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype).Find(&orders).Error
 	return
 }
 
 func GetOrderByTimeTwo(start_time int64, end_time int64, org_id int64) (orders []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND is_medicine_insurance = 1 AND settle_accounts_date <= ? AND settle_accounts_date >= ? ", org_id, end_time, start_time).Find(&orders).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ?", org_id, end_time, start_time).Find(&orders).Error
 	return
 }