拉取代码

controllers/sz/sz_his_api_controller.go

@@ -9,7 +9,7 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
-	"github.com/axgle/mahonia"
+	//"github.com/axgle/mahonia"
 	"math/rand"
 
 	//"github.com/axgle/mahonia"
@@ -3004,126 +3004,126 @@ func (c *SZHisApiController) GetSettleAccounts() {
 }
 
 //费用录入取消
-func (c *SZHisApiController) CancelOrderDetail() {
-	order_id, _ := c.GetInt64("order_id")
-	record_time := c.GetString("record_time")
-	patient_id, _ := c.GetInt64("patient_id")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	adminUser := c.GetAdminUserInfo()
-	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
-	fmt.Println(err)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	recordDateTime := theTime.Unix()
-	var order models.HisOrder
-	order, _ = service.GetHisOrderByID(order_id)
-
-	if order.ID == 0 {
-		order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
-
-	}
-
-	order_infos, _ := service.GetHisOrderInfoByNumber(order.Number)
-
-	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	//结算流程
-	var doctor_name string
-	var doctor_code string
-	if roles.ID == 0 {
-		doctor_name = "管理员"
-		doctor_code = "1001"
-	} else {
-		doctor_name = roles.UserName
-		doctor_code = strconv.FormatInt(admin_user_id, 10)
-
-	}
-	var customs []*models.CustomDetail
-
-	for _, item := range order_infos {
-		cus := &models.CustomDetail{
-			PrescriptionNumber: item.OrderNumber,
-			ChargeSerialNumber: item.FeedetlSn,
-		}
-		customs = append(customs, cus)
-	}
-	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
-
-	verifyCode, version_code := ReadCardGetCode("FY002" + "|" + order.OrgSetlNumber + "|" + miConfig.Code)
-
-	var pagesize int = 50
-	var start int = 1
-	var stop int
-	var pagecount int
-	var curpage int
-	var isSuccess bool = true
-	var ress []*ResultFive
-
-	//总页数,向上取整,注意除之前要先转换类型为float64
-	pagecount = int(math.Ceil(float64(len(customs)) / float64(pagesize)))
-
-	for curpage = 1; curpage <= pagecount; curpage++ {
-		if curpage == 1 {
-			start = 1
-		} else {
-			start = (curpage-1)*pagesize + 1
-		}
-		stop = curpage * pagesize
-		if stop > len(customs) {
-			stop = len(customs)
-		}
-
-		result := service.SzybFY002(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop], verifyCode, order.OrgSetlNumber, his.Number, version_code)
-		fmt.Println(result)
-
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-		userJSONBytes, _ := json.Marshal(dat)
-		var res ResultFive
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		if res.Transreturncode == "00000000" {
-			ress = append(ress, &res)
-		} else {
-			isSuccess = false
-			//预结算报错
-			errlog := &models.HisOrderError{
-				UserOrgId:  adminUser.CurrentOrgId,
-				Ctime:      time.Now().Unix(),
-				Mtime:      time.Now().Unix(),
-				ErrMsg:     res.Transreturnmessage,
-				Status:     1,
-				PatientId:  patient_id,
-				RecordTime: recordDateTime,
-				Stage:      11,
-			}
-			service.CreateErrMsgLog(errlog)
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"faild_code": -10,
-				"msg":        res.Transreturnmessage,
-			})
-			return
-		}
-	}
-	if isSuccess == true {
-		service.UpdataOrderInfoStatus(order.ID, order.Number, adminUser.CurrentOrgId)
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "撤销成功",
-		})
-	}
-}
+//func (c *SZHisApiController) CancelOrderDetail() {
+//	order_id, _ := c.GetInt64("order_id")
+//	record_time := c.GetString("record_time")
+//	patient_id, _ := c.GetInt64("patient_id")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	adminUser := c.GetAdminUserInfo()
+//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+//	fmt.Println(err)
+//	if err != nil {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//		return
+//	}
+//	recordDateTime := theTime.Unix()
+//	var order models.HisOrder
+//	order, _ = service.GetHisOrderByID(order_id)
+//
+//	if order.ID == 0 {
+//		order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
+//
+//	}
+//
+//	order_infos, _ := service.GetHisOrderInfoByNumber(order.Number)
+//
+//	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+//	//结算流程
+//	var doctor_name string
+//	var doctor_code string
+//	if roles.ID == 0 {
+//		doctor_name = "管理员"
+//		doctor_code = "1001"
+//	} else {
+//		doctor_name = roles.UserName
+//		doctor_code = strconv.FormatInt(admin_user_id, 10)
+//
+//	}
+//	var customs []*models.CustomDetail
+//
+//	for _, item := range order_infos {
+//		cus := &models.CustomDetail{
+//			PrescriptionNumber: item.OrderNumber,
+//			ChargeSerialNumber: item.FeedetlSn,
+//		}
+//		customs = append(customs, cus)
+//	}
+//	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+//
+//	verifyCode, version_code := ReadCardGetCode("FY002" + "|" + order.OrgSetlNumber + "|" + miConfig.Code)
+//
+//	var pagesize int = 50
+//	var start int = 1
+//	var stop int
+//	var pagecount int
+//	var curpage int
+//	var isSuccess bool = true
+//	var ress []*ResultFive
+//
+//	//总页数,向上取整,注意除之前要先转换类型为float64
+//	pagecount = int(math.Ceil(float64(len(customs)) / float64(pagesize)))
+//
+//	for curpage = 1; curpage <= pagecount; curpage++ {
+//		if curpage == 1 {
+//			start = 1
+//		} else {
+//			start = (curpage-1)*pagesize + 1
+//		}
+//		stop = curpage * pagesize
+//		if stop > len(customs) {
+//			stop = len(customs)
+//		}
+//
+//		result := service.SzybFY002(doctor_name, doctor_code, miConfig.Code, customs[start-1:stop], verifyCode, order.OrgSetlNumber, his.Number, version_code)
+//		fmt.Println(result)
+//
+//		var dat map[string]interface{}
+//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//			fmt.Println(dat)
+//		} else {
+//			fmt.Println(err)
+//		}
+//		userJSONBytes, _ := json.Marshal(dat)
+//		var res ResultFive
+//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//		if res.Transreturncode == "00000000" {
+//			ress = append(ress, &res)
+//		} else {
+//			isSuccess = false
+//			//预结算报错
+//			errlog := &models.HisOrderError{
+//				UserOrgId:  adminUser.CurrentOrgId,
+//				Ctime:      time.Now().Unix(),
+//				Mtime:      time.Now().Unix(),
+//				ErrMsg:     res.Transreturnmessage,
+//				Status:     1,
+//				PatientId:  patient_id,
+//				RecordTime: recordDateTime,
+//				Stage:      11,
+//			}
+//			service.CreateErrMsgLog(errlog)
+//
+//			c.ServeSuccessJSON(map[string]interface{}{
+//				"faild_code": -10,
+//				"msg":        res.Transreturnmessage,
+//			})
+//			return
+//		}
+//	}
+//	if isSuccess == true {
+//		service.UpdataOrderInfoStatus(order.ID, order.Number, adminUser.CurrentOrgId)
+//		c.ServeSuccessJSON(map[string]interface{}{
+//			"msg": "撤销成功",
+//		})
+//	}
+//}
 
 //获取verifyCode
 //func ReadCardGetCode(request string) (string, string) {
@@ -3325,15 +3325,15 @@ func (c *SZHisApiController) GetDrugList() {
 		detail := &models.DrugDetail{
 
 			MedicalInsuranceNumber: item.MedicalInsuranceNumber,
-			Code:             item.Code,
-			DrugName:         item.DrugName,
-			DrugSpec:         item.DrugSpec,
-			DrugDosageName:   item.DrugDosageName,
-			ManufacturerName: item.ManufacturerName,
-			MinUnit:          item.MinUnit,
-			RetailPrice:      item.RetailPrice,
-			LastPrice:        item.LastPrice,
-			LimitRemark:      item.LimitRemark,
+			Code:                   item.Code,
+			DrugName:               item.DrugName,
+			DrugSpec:               item.DrugSpec,
+			DrugDosageName:         item.DrugDosageName,
+			ManufacturerName:       item.ManufacturerName,
+			MinUnit:                item.MinUnit,
+			RetailPrice:            item.RetailPrice,
+			LastPrice:              item.LastPrice,
+			LimitRemark:            item.LimitRemark,
 		}
 
 		result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, detail)
@@ -3497,14 +3497,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)
 				}
@@ -3582,15 +3582,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,
 				}
 
 				result := service.SzybML008(doctor_name, doctor_code, miConfig.Code, detail)
@@ -3958,39 +3958,39 @@ func (c *SZHisApiController) GetDoctorList() {
 	for _, item := range list {
 		fmt.Println("医护类别", item.StudyMajorName)
 		detail := &models.DocDetail{
-			UserName:                     item.UserName,                               //医护姓名
-			RoleId:                       item.Name,                                   //医护人员类别
-			Sex:                          strconv.FormatInt(item.Sex, 10),             //性别
-			CardType:                     strconv.FormatInt(item.CardType, 10),        //证件类型
-			IdCard:                       item.IdCard,                                 //证件号码
-			Phone:                        item.Mobile,                                 //联系电话
-			WorkMajorName:                item.WorkMajorName,                          // 现从事专业名称
-			Nation:                       item.Nation,                                 //民族
-			BirthDay:                     20201022,                                    // 出生日期
-			WorkTime:                     20201022,                                    //参加工作日期
-			Education:                    strconv.FormatInt(item.Education, 10),       //学历
-			StudyMajorName:               item.StudyMajorName,                         //所学的专业名称
-			CertificateCode:              item.MedicalCode,                            //医（药）师执业证书编码
-			MedicalCode:                  item.DoctorCode,                             //医（药）师资格证编码
-			MedicalRangeCode:             strconv.FormatInt(item.DoctorRangeCode, 10), //医师执业范围代码
-			MedicalLevel:                 strconv.FormatInt(item.DoctorLevel, 10),     //医生执业资格证中的医师级别
-			TypeJob:                      strconv.FormatInt(item.DoctorTypeJob, 10),   //医生执业资格证中的执业类别
-			DoctorNumber:                 item.DoctorNumber,                           //医保医师编号
-			Licensing:                    strconv.FormatInt(item.Licensing, 10),       //多点执业标志
-			DoctorServiceStatus:          "",                                          //医师医保服务资格状态
-			MonitoringLevel:              "",                                          //监控等级
-			DrugPsychotropicSubstances:   "",                                          //毒麻精神药品资格
-			HealthCareCode:               "",                                          // 母婴保健技术考核合格证书编号
-			PlanningTechnicalServiceCode: "",                                          //计划生育技术服务人员合格证编号
-			PharmacistType:               "",                                          //药师类别
-			PharmacistPracticeCategory:   "",                                          //药师执业类别
-			PharmacistsLicensing:         "",                                          //药师执业范围
-			PharmacistRegistrationNumber: "",                                          //执业药师注册证编号
-			OfficeCode:                   "",                                          //科室编码
-			JobNumber:                    item.JobNumber,                              //工号
-			PostName:                     "",                                          //职位名称
-			TechnicalJobLevelCode:        "",                                          //专业技术职务级别编码
-			IsActive:                     strconv.FormatInt(item.IsActive, 10),        //在职与否
+			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,                                      //门诊大病类别
@@ -4072,39 +4072,39 @@ func (c *SZHisApiController) GetMedicalList() {
 			fmt.Println("医护类别", item.Mobile)
 
 			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,                                      //门诊大病类别
@@ -4172,39 +4172,39 @@ func (c *SZHisApiController) GetMedicalList() {
 		for _, item := range list {
 			fmt.Println("医护类别", item.Name)
 			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,                                      //门诊大病类别
@@ -4297,44 +4297,44 @@ func (c *SZHisApiController) GetUpdateMedicalList() {
 		for _, item := range list {
 			fmt.Println("医护类别", item.Name)
 			detail := &models.DocDetail{
-				StaffCode:                    "",            //医护人员编码
-				UserName:                     item.UserName, //医护人员姓名
-				RoleId:                       item.Name,     //医护人员类别
-				Sex:                          "",            //性别
-				CardType:                     "",            //证件类型
-				IdCard:                       "",            //证件号码
-				Phone:                        "",            //联系电话
-				WorkMajorName:                "",            //现从事专业名称
-				Nation:                       "",            //民族
-				BirthDay:                     20201022,      //出生日期
-				WorkTime:                     12,            //参加工作日期
-				Education:                    "",            //学历
-				StudyMajorName:               "",            //所学的专业名称
-				CertificateCode:              "",            //证书编码
-				MedicalCode:                  "",            //医师资格编码
-				MedicalRangeCode:             "",            //医师执业范围代码
-				MedicalLevel:                 "",            //医生级别
-				TypeJob:                      "",            //职业类别
-				DoctorNumber:                 "",            //医师编号
-				Licensing:                    "",            //职业标志
-				DoctorServiceStatus:          "",            //医师医保服务资格状态
-				MonitoringLevel:              "",            //监控等级
-				DrugPsychotropicSubstances:   "",            //毒麻精神药品资格
-				HealthCareCode:               "",            // 母婴保健技术考核合格证书编号
-				PlanningTechnicalServiceCode: "",            //计划生育技术服务人员合格证编号
-				PharmacistType:               "",            //药师类别
-				PharmacistPracticeCategory:   "",            //药师执业类别
-				PharmacistsLicensing:         "",            //药师执业范围
-				PharmacistRegistrationNumber: "",            //执业药师注册证编号
-				OfficeCode:                   "",            //科室编码
-				JobNumber:                    "",            //工号
-				PostName:                     "",            //职位名称
-				TechnicalJobLevelCode:        "",            //专业技术职务级别编码
-				IsActive:                     "",            //在职与否
-				PrescriptionQualificationIdentification: "",   //处方资格标识
-				IdentificationOutpatients:               "",   //门诊大病医师标识
-				OutpatientIllnessCategory:               "",   //门诊大病类别
-				StartTime:                               1233, //开始日期
+				StaffCode:                               "",            //医护人员编码
+				UserName:                                item.UserName, //医护人员姓名
+				RoleId:                                  item.Name,     //医护人员类别
+				Sex:                                     "",            //性别
+				CardType:                                "",            //证件类型
+				IdCard:                                  "",            //证件号码
+				Phone:                                   "",            //联系电话
+				WorkMajorName:                           "",            //现从事专业名称
+				Nation:                                  "",            //民族
+				BirthDay:                                20201022,      //出生日期
+				WorkTime:                                12,            //参加工作日期
+				Education:                               "",            //学历
+				StudyMajorName:                          "",            //所学的专业名称
+				CertificateCode:                         "",            //证书编码
+				MedicalCode:                             "",            //医师资格编码
+				MedicalRangeCode:                        "",            //医师执业范围代码
+				MedicalLevel:                            "",            //医生级别
+				TypeJob:                                 "",            //职业类别
+				DoctorNumber:                            "",            //医师编号
+				Licensing:                               "",            //职业标志
+				DoctorServiceStatus:                     "",            //医师医保服务资格状态
+				MonitoringLevel:                         "",            //监控等级
+				DrugPsychotropicSubstances:              "",            //毒麻精神药品资格
+				HealthCareCode:                          "",            // 母婴保健技术考核合格证书编号
+				PlanningTechnicalServiceCode:            "",            //计划生育技术服务人员合格证编号
+				PharmacistType:                          "",            //药师类别
+				PharmacistPracticeCategory:              "",            //药师执业类别
+				PharmacistsLicensing:                    "",            //药师执业范围
+				PharmacistRegistrationNumber:            "",            //执业药师注册证编号
+				OfficeCode:                              "",            //科室编码
+				JobNumber:                               "",            //工号
+				PostName:                                "",            //职位名称
+				TechnicalJobLevelCode:                   "",            //专业技术职务级别编码
+				IsActive:                                "",            //在职与否
+				PrescriptionQualificationIdentification: "",            //处方资格标识
+				IdentificationOutpatients:               "",            //门诊大病医师标识
+				OutpatientIllnessCategory:               "",            //门诊大病类别
+				StartTime:                               1233,          //开始日期
 				EndTime:                                 123333,
 			}
 			customs = append(customs, detail)
@@ -4456,11 +4456,11 @@ const (
 	GB18030 = Charset("GB18030")
 )
 
-func ConvertToString(src string, srcCode string, tagCode string) string {
-	srcCoder := mahonia.NewDecoder(srcCode)
-	srcResult := srcCoder.ConvertString(src)
-	tagCoder := mahonia.NewDecoder(tagCode)
-	_, cdata, _ := tagCoder.Translate([]byte(srcResult), true)
-	result := string(cdata)
-	return result
-}
+//func ConvertToString(src string, srcCode string, tagCode string) string {
+//	srcCoder := mahonia.NewDecoder(srcCode)
+//	srcResult := srcCoder.ConvertString(src)
+//	tagCoder := mahonia.NewDecoder(tagCode)
+//	_, cdata, _ := tagCoder.Translate([]byte(srcResult), true)
+//	result := string(cdata)
+//	return result
+//}