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 = 9919
+org_id = 9504
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sz/sz_his_api_controller.go

@@ -9,6 +9,7 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
+	"github.com/axgle/mahonia"
 	"math/rand"
 
 	//"github.com/axgle/mahonia"
@@ -272,6 +273,7 @@ func SZHisManagerApiRegistRouters() {
 	beego.Router("/sz/api/register/get", &SZHisApiController{}, "get:GetRegisterInfo")
 	//上传明细，预结算
 	//beego.Router("/sz/api/upload/get", &SZHisApiController{}, "get:GetUploadInfo")
+
 	//结算
 	beego.Router("/sz/api/settle/get", &SZHisApiController{}, "get:GetSettleInfo")
 
@@ -283,9 +285,10 @@ func SZHisManagerApiRegistRouters() {
 	beego.Router("sz/api/refundnumber/get", &SZHisApiController{}, "get:RefundNumber")
 
 	beego.Router("/sz/api/monthrefund/get", &SZHisApiController{}, "get:MonthRefund")
+
 	//查询交易
 	beego.Router("/sz/api/settle/query", &SZHisApiController{}, "get:GetSettleAccounts")
-	//撤销明细
+	beego.Router("/sz/api/detail/upload", &SZHisApiController{}, "get:GetUploadDetail")
 	beego.Router("/sz/api/detail/cancel", &SZHisApiController{}, "get:CancelOrderDetail")
 	//
 	////机构药品目录备案
@@ -347,12 +350,12 @@ func (c *SZHisApiController) ReadCard() {
 	if ret4 == 0 {
 		patient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
 		if patient.ID == 0 {
-			patient.HealthCareNo = health_card_no
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
 			return
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"patient": patient,
+				"patient":        patient,
+				"health_card_no": health_card_no,
 			})
 		}
 	} else {
@@ -806,10 +809,10 @@ func (c *SZHisApiController) GetRegisterInfo() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIDCartNo)
 		return
 	}
-
+	//doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
+	doctorDepartment, _ := service.GetDepartMentDetail(department)
 	adminRole, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
 	his, _ := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient_id, theTime.Unix())
-
 	var custom_code string
 	var custom_project_name string
 	var allPrice float64
@@ -844,42 +847,36 @@ func (c *SZHisApiController) GetRegisterInfo() {
 
 		break
 	}
-
 	if his.ID == 0 {
-
-		var doctor_name string
-		var doctor_code string
+		var opera_name string
+		var opera_code string
 		if adminRole.ID == 0 {
-
-			doctor_name = "管理员"
-			doctor_code = "01"
-
+			opera_name = "管理员"
+			opera_code = "01"
 		} else {
-			doctor_name = adminRole.UserName
-			doctor_code = strconv.FormatInt(admin_user_id, 10)
-
+			opera_name = adminRole.UserName
+			opera_code = strconv.FormatInt(admin_user_id, 10)
 		}
 		month := time.Unix(1557042972, 0).Format("1")
 		year := time.Now().Format("2006")
 		month = time.Now().Format("01")
 		day := time.Now().Format("02")
-
 		//流水号
-		//
 		number := miConfig.Code + year + month + day +
 			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
 		mz_number := miConfig.Code + year + month + day +
 			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000))
 		//1.判断读卡类型
 		//2.读卡 获取交易验证码，医疗证号，发卡地区行政区划代码
-		yiliao_number, id_card_number, verifyCode, version_code, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
+		yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
 		fmt.Println(yiliao_number)
 		fmt.Println(id_card_number)
 		fmt.Println(verifyCode)
 		fmt.Println(version_code)
 		fmt.Println(ret4)
 
-		dept_code := "0306"
+		dept_code := doctorDepartment.Number
+
 		is_yidi = 1
 		tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
 		//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
@@ -891,7 +888,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 				if is_yidi == 1 {
 					//本地就医流程
 					//挂号
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, dept_code, yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
+					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, dept_code, yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
@@ -934,6 +931,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							YiliaoNumber:           yiliao_number,
 							MzNumber:               number,
 							Number:                 mz_number,
+							PsnNo:                  health_card_no,
 						}
 						service.CreateHisPatientTwo(&his)
 						c.ServeSuccessJSON(map[string]interface{}{
@@ -955,7 +953,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 
 					//tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
 					//if tempPatient.ID == patient_id {
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
+					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
@@ -1000,6 +998,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							YiliaoNumber:           yiliao_number,
 							MzNumber:               number,
 							Number:                 mz_number,
+							PsnNo:                  health_card_no,
 						}
 						service.CreateHisPatientTwo(&his)
 						c.ServeSuccessJSON(map[string]interface{}{
@@ -1020,7 +1019,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 				//fmt.Println(readCardBasResult)
 				//是否异地就医，是的话走鉴权流程，不是的话走门诊挂号
 				if is_yidi == 1 { //1本地就医
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
+					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
@@ -1065,6 +1064,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							YiliaoNumber:           yiliao_number,
 							MzNumber:               number,
 							Number:                 mz_number,
+							PsnNo:                  health_card_no,
 						}
 						service.CreateHisPatientTwo(&his)
 						c.ServeSuccessJSON(map[string]interface{}{
@@ -1081,7 +1081,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 				} else { //异地就医需要走鉴权流程
 					//authResult := CardAuth(number)
 					//fmt.Println(authResult)
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
+					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
@@ -1126,6 +1126,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							YiliaoNumber:           yiliao_number,
 							MzNumber:               number,
 							Number:                 mz_number,
+							PsnNo:                  health_card_no,
 						}
 						service.CreateHisPatientTwo(&his)
 						c.ServeSuccessJSON(map[string]interface{}{
@@ -1152,7 +1153,6 @@ func (c *SZHisApiController) GetRegisterInfo() {
 }
 
 func (c *SZHisApiController) RefundNumber() {
-	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")
@@ -1167,12 +1167,7 @@ func (c *SZHisApiController) RefundNumber() {
 	}
 	recordDateTime := theTime.Unix()
 	fmt.Println(recordDateTime)
-	var order models.HisOrder
-	order, _ = service.GetHisOrderByID(order_id)
-	if order.ID == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
-		return
-	}
+
 	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, theTime.Unix())
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
@@ -1201,7 +1196,7 @@ func (c *SZHisApiController) RefundNumber() {
 	verifyCode, version_code := ReadCardGetCode("JY002" + "|" + number + "|" + miConfig.Code)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
-		result := service.SzybJY002(doctor_name, doctor_code, miConfig.Code, his.MzNumber, order.Number, verifyCode, number, version_code)
+		result := service.SzybJY002(doctor_name, doctor_code, miConfig.Code, his.MzNumber, his.Number, verifyCode, number, version_code)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -1702,6 +1697,13 @@ func (c *SZHisApiController) GetSettleInfo() {
 
 	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 
+	sick, _ := service.FindSickById(patientPrescription.SickType)
+
+	if sick.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamSickTypeWrong)
+		return
+	}
+
 	adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
 	adminRole, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
@@ -1764,7 +1766,9 @@ func (c *SZHisApiController) GetSettleInfo() {
 				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)
+					//count, _ := strconv.ParseFloat(fmt.Sprintf("%f", subItem.Count), 64)
+
+					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]
 
@@ -1974,13 +1978,13 @@ func (c *SZHisApiController) GetSettleInfo() {
 			}
 		}
 
-		yiliao_number, id_card_number, verifyCode, version_code, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code + "|")
+		yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code + "|")
+
 		if ret4 == 0 {
 			//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 			tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 			if tempPatient.ID == patient_id {
-
-				result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, his.MedicalTreatmentType)
+				result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, his.MedicalTreatmentType, sick.CountryCode)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 					fmt.Println(dat)
@@ -2000,6 +2004,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 					order.PayWay = pay_way
 					order.PayPrice = pay_price
 					order.PayCardNo = pay_card_no
+					order.PsnNo = health_card_no
 					order.DiscountPrice = discount_price
 					order.PreferentialPrice = preferential_price
 					order.RealityPrice = reality_price
@@ -2743,6 +2748,17 @@ func (c *SZHisApiController) Refund() {
 	//
 	//verifyCode := "000000|9972fca7ba9471c7dbe08324b2e31f70"
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+	order_infos, _ := service.GetHisOrderInfoByNumber(order.Number)
+	var customs []*models.CustomDetail
+
+	for _, item := range order_infos {
+		cus := &models.CustomDetail{
+			PrescriptionNumber: item.OrderNumber,
+			ChargeSerialNumber: item.FeedetlSn,
+		}
+		customs = append(customs, cus)
+	}
+
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 
 		result := service.SzybJY002(doctor_name, doctor_code, miConfig.Code, order.OrgSetlNumber, order.MzNumber, verifyCode, number, version_code)
@@ -2764,6 +2780,7 @@ func (c *SZHisApiController) Refund() {
 		if res.Transreturncode == "00000000" {
 			service.UpdataOrderlog(order_id, adminUser.CurrentOrgId, result)
 			service.UpdataOrderStatusSZ(order_id, order.Number, adminUser.CurrentOrgId, his.MzNumber, his.Number)
+			service.UpdataOrderInfoStatus(order.ID, order.Number, adminUser.CurrentOrgId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "退费成功",
 			})
@@ -2874,9 +2891,50 @@ func (c *SZHisApiController) GetSettleAccounts() {
 
 	patient, _ := service.GetPatientByIDTwo(adminUser.CurrentOrgId, patient_id)
 
-	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, order.SettleAccountsDate)
 	adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
+	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, order.SettleAccountsDate)
+	yiliao_leibie := ""
+
+	switch his.MedicalTreatmentType {
+	case 11:
+		yiliao_leibie = "普通门诊"
+		break
+	case 12:
+		yiliao_leibie = "家庭通道"
+		break
+	case 13:
+		yiliao_leibie = "门诊大病"
+		break
+	case 14:
+		yiliao_leibie = "重疾特药"
+		break
+	case 15:
+		yiliao_leibie = "门诊慢病"
+		break
+	case 16:
+		yiliao_leibie = "门诊特检"
+		break
+	case 17:
+		yiliao_leibie = "健康体检"
+		break
+	case 18:
+		yiliao_leibie = "预防接种"
+		break
+	case 19:
+		yiliao_leibie = "门诊输血"
+		break
+	case 91:
+		yiliao_leibie = "新冠肺炎门诊"
+		break
+
+	}
+
+	//departments, _ := service.Get(patientPrescription.Departments)
+
+	departments, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+
 	if order.ID == 0 {
 		order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
 
@@ -2925,12 +2983,16 @@ func (c *SZHisApiController) GetSettleAccounts() {
 		}
 		if res.Transreturncode == "00000000" {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"result":       res,
-				"org_name":     miConfig.OrgName,
-				"org_code":     miConfig.Code,
-				"patient_name": patient.Name,
-				"doctor_code":  adminRole_two.DoctorCode,
-				"doctor_name":  doctor_name,
+				"result":         res,
+				"org_name":       miConfig.OrgName,
+				"org_code":       miConfig.Code,
+				"patient_name":   patient.Name,
+				"doctor_code":    adminRole_two.DoctorCode,
+				"doctor_name":    doctor_name,
+				"health_card_no": order.PsnNo,
+				"order_number":   order.Number,
+				"department":     departments.Name,
+				"yiliao_leibie":  yiliao_leibie,
 			})
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -3111,6 +3173,33 @@ func (c *SZHisApiController) CancelOrderDetail() {
 //	}
 //	return "", "", "", "", err, -10
 //}
+func ReadBasCardGetNumber(request string) (string, string, string, string, string, error, int64) {
+	DllDef2 := syscall.MustLoadDLL("SSCardDriver_SZ.dll")
+	readCards := DllDef2.MustFindProc("iReadCardBas")
+	str := request
+	str3 := make([]byte, 1024)
+	fmt.Println(":", request)
+	fmt.Println(":", StrPtr(str))
+
+	ret4, _, err := readCards.Call(IntPtr(1), StrPtr(str), (uintptr)(unsafe.Pointer(&str3[0])))
+	fmt.Println(":", string(str3))
+	fmt.Println(":", ConvertToString(string(str3), "gbk", "utf-8"))
+	if ret4 == 0 {
+		result := string(str3)
+		fmt.Println(result)
+		result_arr := strings.Split(result, "|")
+		//医疗证号
+		yiliao_number := result_arr[12]
+		//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
+		id_card_number := result_arr[1]
+		verifyCode := result_arr[11] + "|" + result_arr[13]
+		versionCode := result_arr[14]
+		health_card_no := result_arr[2]
+
+		return yiliao_number, id_card_number, verifyCode, versionCode, health_card_no, err, 0
+	}
+	return "", "", "", "", "", err, -10
+}
 
 //读卡
 func ReadBasCard(request string) (string, string, error, int64) {
@@ -3236,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)
@@ -3408,15 +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)
 				}
@@ -3494,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)
@@ -3870,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,                                      //门诊大病类别
@@ -3984,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,                                      //门诊大病类别
@@ -4084,46 +4172,45 @@ 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,                                      //门诊大病类别
 				StartTime:                               20201010,                                                            //开始日期
 				StaffCode:                               "",                                                                  //医护人员编码
 				EndTime:                                 0,                                                                   // 结束日期
-
 			}
 			result := service.SzybYS002(doctor_name, doctor_code, miConfig.Code, detail)
 			fmt.Println("reuslt9999999999999999", result)
@@ -4210,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)

enums/error_code.go

@@ -245,6 +245,8 @@ const ( // ErrorCode
 	ErrorDoctorLoginFaildParamWrong   = 30004
 
 	ErrorNoReadCardException = 30005
+
+	ErrorCodeParamSickTypeWrong = 30006
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -472,6 +474,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorDoctorLoginFaildParamWrong:    "登记失败",
 
 	ErrorNoReadCardException: "无法读取除社保卡以外的卡",
+
+	ErrorCodeParamSickTypeWrong: "医生所开处方的疾病类型不能为空",
 }
 
 type SGJError struct {

models/drug.go

@@ -1,56 +1,62 @@
 package models
 
 type BaseDrugLib struct {
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	DrugAlias              string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
-	DrugAliasPinyin        string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
-	DrugAliasWubi          string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
-	DrugCategory           int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec               string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType               int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit         string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace        string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm         int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
-	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	LastPrice              float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugControl            int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
-	Number                 string  `gorm:"column:number" json:"number" form:"number"`
-	DrugClassify           string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
-	DrugDose               float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
-	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	PharmacologyCategory   int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
-	StatisticsCategory     int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
-	Code                   string  `gorm:"column:code" json:"code" form:"code"`
-	IsSpecialDiseases      int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
-	IsRecord               int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	Agent                  string  `gorm:"column:agent" json:"agent" form:"agent"`
-	DrugStatus             string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	LimitRemark            string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
-	DeliveryWay            string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency     string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	SingleDose             float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	PrescribingNumber      float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	Label                  int64   `gorm:"column:label" json:"label" form:"label"`
-	Sort                   int64   `gorm:"column:sort" json:"sort" form:"sort"`
-	IsUseDoctorAdvice      int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
-	IsDefault              int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	IsChargePredict        int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
-	IsStatisticsWork       int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
-	IsChargeUse            int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
-	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
-	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                        string  `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	PrescriptionMark            int64   `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 

service/sz_his_service.go

@@ -314,7 +314,7 @@ func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total f
 	str := string(respBytes)
 	return str
 }
-func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total float64, account string, verify_code string, serial_number string, mz_number string, version_code string, drug_doctor string, drug_doctor_name string, medical_care int64) string {
+func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total float64, account string, verify_code string, serial_number string, mz_number string, version_code string, drug_doctor string, drug_doctor_name string, medical_care int64, code string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
@@ -326,7 +326,7 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total f
 		inputData["aka130"] = "11"
 	} else if medical_care == 13 {
 		inputData["aka130"] = "13"
-		inputData["cka303"] = "Z99.2"
+		inputData["cka303"] = code
 	} else {
 		inputData["aka130"] = fmt.Sprintf("%d", medical_care)
 	}
@@ -710,14 +710,14 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
 	inputMessage["extendDeviceId"] = ""
 	inputMessage["extendSerialNumber"] = ""
 	inputMessage["extendUserId"] = ""
-	inputMessage["hospitalCode"] = "G5540"     // 协议机构编码
-	inputMessage["operatorCode"] = doctor_code // 操作员编码
-	inputMessage["operatorName"] = doctor      // 操作员名字
-	inputMessage["operatorPass"] = ""          // 定点协议机构操作人员编码
-	//inputMessage["serialNumber"] = "G5540" + year + month + day +
-	//  fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
-	inputMessage["serialNumber"] = "G554020210406" + fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
-	inputMessage["verifyCode"] = "000000|8ec5b7745a5cc45b631f23b4bf1e417e"
+	inputMessage["hospitalCode"] = fixmedins_code // 协议机构编码
+	inputMessage["operatorCode"] = doctor_code    // 操作员编码
+	inputMessage["operatorName"] = doctor         // 操作员名字
+	inputMessage["operatorPass"] = ""             // 定点协议机构操作人员编码
+	inputMessage["serialNumber"] = fixmedins_code + year + month + day +
+		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
+	//inputMessage["serialNumber"] = "G554020210406" + fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
+	//inputMessage["verifyCode"] = "000000|8ec5b7745a5cc45b631f23b4bf1e417e"
 
 	inputMessage["transReturnCode"] = ""                                           //
 	inputMessage["transReturnMessage"] = ""                                        //