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

controllers/sg/his_api_controller.go

@@ -64,7 +64,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/psn/unputonrecord", &HisApiController{}, "get:PsnUnPutOnRecord")
 	beego.Router("/api/psn/ncds/putonrecord", &HisApiController{}, "get:PsnPutNCDSOnRecord")
 	beego.Router("/api/psn/ncds/unputonrecord", &HisApiController{}, "get:PsnPutUnNCDSOnRecord")
-	
+
 	beego.Router("/api/reversal", &HisApiController{}, "get:ReversalData")
 	beego.Router("/api/reversal/other", &HisApiController{}, "get:ReversalOtherData")
 
@@ -94,7 +94,7 @@ func (c *HisApiController) TestGetBasBaseInit() {
 	result := int(ret)
 	fmt.Println("SSCard的运算结果为1:", result)
 	initFlag = 1
-	return 
+	return
 }
 
 func (c *HisApiController) TestGetBasBaseInfo() {
@@ -111,11 +111,10 @@ func (c *HisApiController) TestGetBasBaseInfo() {
 	str := make([]byte, 1024)
 	str1 := make([]byte, 1024)
 
-	ret2, _, err2 := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024),(uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
+	ret2, _, err2 := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
 	fmt.Println(" Add(4,5)的结果为:", ret2)
 	fmt.Println(" Add(4,5)的结果为:", err2)
 
-
 	fmt.Println(" str:", *(*string)(unsafe.Pointer(&str)))
 	fmt.Println(" str1:", *(*string)(unsafe.Pointer(&str1)))
 	// runtime.GC()
@@ -652,10 +651,6 @@ func (c *HisApiController) GetSettleList() {
 	}
 }
 
-
-
-
-
 //func (c *HisApiController) TestPay() {
 //	DllDef2 := syscall.MustLoadDLL("SSSE32.dll")
 //	readCards := DllDef2.MustFindProc("BankTrans")
@@ -3293,11 +3288,12 @@ func (c *HisApiController) RefundNumber() {
 		}
 
 		if res2.Infcode == 0 {
-			service.UpdataRegStatusTwo(his_patient_id, recordDateTime, adminUser.CurrentOrgId)
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "退号成功",
 				})
+				service.UpdataRegStatusTwo(his_patient_id, recordDateTime, adminUser.CurrentOrgId)
+
 			} else {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return

controllers/sz/sz_his_api_controller.go

@@ -2280,6 +2280,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
 				if len(subItem.HisProject.MedicalCode) > 0 {
+
 					detItemFeeSumamt, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)), 64)
 
 					//count, _ := strconv.ParseFloat(fmt.Sprintf("%f", subItem.Count), 64)
@@ -2287,23 +2288,45 @@ func (c *SZHisApiController) GetSettleInfo() {
 					count, _ := strconv.ParseFloat(strconv.FormatInt(subItem.Count, 10), 64)
 					temp := strings.Split(subItem.FeedetlSn, "-")
 					newFl := fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) + "-" + temp[1] + "-" + temp[2]
+					if subItem.Type == 2 {
+
+						cus := &models.CustomDetail{
+							PrescriptionNumber: chrg_bchno,
+							OrderType:          "1",
+							ChargeSerialNumber: newFl,
+							Code:               subItem.HisProject.MedicalCode,
+							CodeName:           subItem.HisProject.ProjectName,
+							Flag:               "1",
+							Price:              subItem.Price,
+							Count:              count,
+							ChargeOrderDate:    year + month + day,
+							DoctorCode:         doctor_code,
+							Total:              detItemFeeSumamt,
+							DoseCode:           "",
+							Spec:               "次",
+						}
+						customs = append(customs, cus)
+
+					} else if subItem.Type == 3 {
+						cus := &models.CustomDetail{
+							PrescriptionNumber: chrg_bchno,
+							OrderType:          "1",
+							ChargeSerialNumber: newFl,
+							Code:               subItem.GoodInfo.MedicalInsuranceNumber,
+							CodeName:           subItem.GoodInfo.GoodName,
+							Flag:               "1",
+							Price:              subItem.Price,
+							Count:              count,
+							ChargeOrderDate:    year + month + day,
+							DoctorCode:         doctor_code,
+							Total:              detItemFeeSumamt,
+							DoseCode:           "",
+							Spec:               "次",
+						}
+						customs = append(customs, cus)
 
-					cus := &models.CustomDetail{
-						PrescriptionNumber: chrg_bchno,
-						OrderType:          "1",
-						ChargeSerialNumber: newFl,
-						Code:               subItem.HisProject.MedicalCode,
-						CodeName:           subItem.HisProject.ProjectName,
-						Flag:               "1",
-						Price:              subItem.Price,
-						Count:              count,
-						ChargeOrderDate:    year + month + day,
-						DoctorCode:         doctor_code,
-						Total:              detItemFeeSumamt,
-						DoseCode:           "",
-						Spec:               "次",
 					}
-					customs = append(customs, cus)
+
 				}
 			}
 		}
@@ -3831,17 +3854,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 {
@@ -3923,11 +3946,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,
@@ -4027,14 +4050,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)
 				}
@@ -4108,15 +4131,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 {
@@ -4523,39 +4546,39 @@ func (c *SZHisApiController) GetDoctorList() {
 		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:                   depart.Number,                               //科室编码
-			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,                                      //门诊大病类别
@@ -4644,39 +4667,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,                                      //门诊大病类别
@@ -4751,39 +4774,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,                                      //门诊大病类别
@@ -4884,44 +4907,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)