1111

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 3877
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -55,38 +55,38 @@ func HisManagerApiRegistRouters() {
 
 }
 
-func (c *HisApiController) TestPay() {
-	DllDef2 := syscall.MustLoadDLL("SSSE32.dll")
-	readCards := DllDef2.MustFindProc("BankTrans")
-	inputData := make(map[string]interface{})
-	inputData["transId"] = "05"
-	inputData["amount"] = "0.01"
-	inputData["traceNo"] = "20210227093601325405377"
-	inputData["cardNo"] = "F36084348"
-	inputData["id"] = "44022919620927046X"
-	//jsonStr := `
-	//    {
-	//            "transId": "05",
-	//            "amount":"1.00",
-	//            "traceNo":"20210227093601325405377",
-	//            "cardNo":"F36084348",
-	//            "id":"44022919620927046X"
-	//
-	//    }
-	//`
-
-	bytes_arr, _ := json.Marshal(inputData)
-	str3 := make([]byte, 256)
-	ret4, _, err4 := readCards.Call(StrPtr(string(bytes_arr)), (uintptr)(unsafe.Pointer(&str3[0])))
-	fmt.Println(":", string(str3))
-
-	if err4 != nil {
-		fmt.Println("SSCard的运算结果为:", ret4)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-		return
-	}
-
-}
+//func (c *HisApiController) TestPay() {
+//	DllDef2 := syscall.MustLoadDLL("SSSE32.dll")
+//	readCards := DllDef2.MustFindProc("BankTrans")
+//	inputData := make(map[string]interface{})
+//	inputData["transId"] = "05"
+//	inputData["amount"] = "0.01"
+//	inputData["traceNo"] = "20210227093601325405377"
+//	inputData["cardNo"] = "F36084348"
+//	inputData["id"] = "44022919620927046X"
+//	//jsonStr := `
+//	//    {
+//	//            "transId": "05",
+//	//            "amount":"1.00",
+//	//            "traceNo":"20210227093601325405377",
+//	//            "cardNo":"F36084348",
+//	//            "id":"44022919620927046X"
+//	//
+//	//    }
+//	//`
+//
+//	bytes_arr, _ := json.Marshal(inputData)
+//	str3 := make([]byte, 256)
+//	ret4, _, err4 := readCards.Call(StrPtr(string(bytes_arr)), (uintptr)(unsafe.Pointer(&str3[0])))
+//	fmt.Println(":", string(str3))
+//
+//	if err4 != nil {
+//		fmt.Println("SSCard的运算结果为:", ret4)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+//		return
+//	}
+//
+//}
 
 func (c *HisApiController) TestGetBasBaseInfo() {
 

controllers/sz/sz_his_api_controller.go

@@ -371,12 +371,13 @@ func (c *SZHisApiController) GetRegisterInfo() {
 
 		//流水号
 		//
-		number := miConfig.Code + year + month + day +
-			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
+		//number := miConfig.Code + year + month + day +
+		//	fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
 		mz_number := year + month + day + strconv.FormatInt(patient_id, 10)
-		//number := miConfig.Code + year + month + day + "2233445"
-		verifyCode, version_code := ReadCardGetCode("MZ002" + "|" + number + "|" + miConfig.Code)
-
+		number := miConfig.Code + year + month + day + "2233445"
+		//verifyCode, version_code := ReadCardGetCode("MZ002" + "|" + number + "|" + miConfig.Code)
+		verifyCode := "000000|4d221ed0d796a493ada20244272962d4"
+		version_code := "0.03"
 		//1.判断读卡类型
 		//2.读卡 获取交易验证码，医疗证号，发卡地区行政区划代码
 		//yiliao_number, id_card_number,verifyCode, err, ret4 := ReadBasCardGetNumber(number)
@@ -653,7 +654,6 @@ func (c *SZHisApiController) GetUploadInfo() {
 	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(1, 10)
 	adminUser := c.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-
 	month := time.Unix(1557042972, 0).Format("1")
 	year := time.Now().Format("2006")
 	month = time.Now().Format("01")
@@ -725,12 +725,15 @@ func (c *SZHisApiController) GetUploadInfo() {
 		doctor_code = strconv.FormatInt(admin_user_id, 10)
 	}
 
-	verifyCode, version_code := ReadCardGetCode("FY001" + "|" + number + "|" + miConfig.Code)
+	//verifyCode, version_code := ReadCardGetCode("FY001" + "|" + number + "|" + miConfig.Code)
+	verifyCode := ""
+	version_code := ""
 	var customs []*models.CustomDetail
 	for _, item := range prescriptions {
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
+					_, dose_code := service.GetDoseCode(subItem.BaseDrugLib.DrugDosageForm, adminUser.CurrentOrgId)
 					detItemFeeSumamt, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber), 64)
 					price, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price), 64)
 					cus := &models.CustomDetail{
@@ -745,7 +748,7 @@ func (c *SZHisApiController) GetUploadInfo() {
 						ChargeOrderDate:    year + month + day,
 						DoctorCode:         doctor_code,
 						Total:              detItemFeeSumamt,
-						DoseCode:           "",
+						DoseCode:           dose_code,
 						Spec:               strconv.FormatFloat(subItem.DrugSpec, 'E', -1, 64) + subItem.DrugSpecUnit,
 					}
 					customs = append(customs, cus)
@@ -976,7 +979,9 @@ func (c *SZHisApiController) GetUploadInfo() {
 				total = total + (subItem.Price * float64(subItem.Count))
 			}
 		}
-		verifyCode, version_code := ReadCardGetCode("FY004" + "|" + number + "|" + miConfig.Code)
+		//verifyCode, version_code := ReadCardGetCode("FY004" + "|" + number + "|" + miConfig.Code)
+		verifyCode := ""
+		version_code := ""
 		result_two := service.SzybFY004(doctor_name, doctor_code, miConfig.Code, total, verifyCode, number, mz_number, version_code)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result_two), &dat); err == nil {
@@ -1103,7 +1108,10 @@ func (c *SZHisApiController) GetSettleInfo() {
 			}
 			number := his.MzNumber
 			mz_number := his.Number
-			verifyCode, version_code := ReadCardGetCode("FY005" + "|" + number + "|" + miConfig.Code)
+			//verifyCode, version_code := ReadCardGetCode("FY005" + "|" + number + "|" + miConfig.Code)
+
+			verifyCode := ""
+			version_code := ""
 			//verifyCode := "000000|eb7acc3ec61eb5e3fd12a3586ad3a9c5"
 			//version_code := "0.03"
 			//yiliao_number, id_card_number,verifyCode,versionCode, err, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code)
@@ -1397,56 +1405,56 @@ func (c *SZHisApiController) GetSettleAccounts() {
 }
 
 //获取verifyCode
-func ReadCardGetCode(request string) (string, string) {
-	DllDef2 := syscall.MustLoadDLL("SSSE32.dll")
-	readCards := DllDef2.MustFindProc("iVerifyCode")
-	str := request
-	str3 := make([]byte, 256)
-	ret4, _, _ := readCards.Call(StrPtr(str), (uintptr)(unsafe.Pointer(&str3[0])))
-	fmt.Println(":", string(str3))
-
-	if ret4 == 0 {
-		result := string(str3)
-		fmt.Println(result)
-		result_arr := strings.Split(result, "|")
-		verifyCode := result_arr[0] + "|" + result_arr[1]
-		versionCode := result_arr[2]
-
-		return verifyCode, versionCode
-
-	}
-	return "", ""
-}
+//func ReadCardGetCode(request string) (string, string) {
+//	DllDef2 := syscall.MustLoadDLL("SSSE32.dll")
+//	readCards := DllDef2.MustFindProc("iVerifyCode")
+//	str := request
+//	str3 := make([]byte, 256)
+//	ret4, _, _ := readCards.Call(StrPtr(str), (uintptr)(unsafe.Pointer(&str3[0])))
+//	fmt.Println(":", string(str3))
+//
+//	if ret4 == 0 {
+//		result := string(str3)
+//		fmt.Println(result)
+//		result_arr := strings.Split(result, "|")
+//		verifyCode := result_arr[0] + "|" + result_arr[1]
+//		versionCode := result_arr[2]
+//
+//		return verifyCode, versionCode
+//
+//	}
+//	return "", ""
+//}
 
 //
 ////读卡
-func ReadBasCardGetNumber(request string) (string, string, string, string, error, int64) {
-	DllDef2 := syscall.MustLoadDLL("SSSE32.dll")
-	readCards := DllDef2.MustFindProc("iReadCardBas")
-	str := request
-
-	str3 := make([]byte, 256)
-	ret4, _, err := readCards.Call(IntPtr(3), StrPtr(str), (uintptr)(unsafe.Pointer(&str3[0])))
-	fmt.Println(":", string(str3))
-
-	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]
-		return yiliao_number, id_card_number, verifyCode, versionCode, err, 1
-
-	}
-	return "", "", "", "", err, 0
-}
+//func ReadBasCardGetNumber(request string) (string, string, string, string, error, int64) {
+//	DllDef2 := syscall.MustLoadDLL("SSSE32.dll")
+//	readCards := DllDef2.MustFindProc("iReadCardBas")
+//	str := request
+//
+//	str3 := make([]byte, 256)
+//	ret4, _, err := readCards.Call(IntPtr(3), StrPtr(str), (uintptr)(unsafe.Pointer(&str3[0])))
+//	fmt.Println(":", string(str3))
+//
+//	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]
+//		return yiliao_number, id_card_number, verifyCode, versionCode, err, 1
+//
+//	}
+//	return "", "", "", "", err, 0
+//}
 
 //
 ////iReadCardBas_HSM_Step1 ---- 1903 iCardInnerAuthentication ---  	iReadCardBas_HSM_Step2

models/data_models.go

@@ -17,6 +17,7 @@ type Dataconfig struct {
 	Title          string `gorm:"column:title" json:"title" form:"title"`
 	Content        string `gorm:"column:content" json:"content" form:"content"`
 	Order          int64  `gorm:"column:orders" json:"orders" form:"orders"`
+	Code           string `gorm:"column:code" json:"code" form:"code"`
 }
 
 func (Dataconfig) TableName() string {
@@ -141,3 +142,27 @@ type XtHisAddtionConfig struct {
 func (XtHisAddtionConfig) TableName() string {
 	return "xt_his_addtion_config"
 }
+
+type DictDataconfig struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	ParentId       int64  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	Module         string `gorm:"column:module" json:"module" form:"module"`
+	OrgId          int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Name           string `gorm:"column:name" json:"name" form:"name"`
+	FieldName      string `gorm:"column:field_name" json:"field_name" form:"field_name"`
+	Value          int    `gorm:"column:value" json:"value" form:"value"`
+	CreatedTime    string `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdatedTime    string `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	CreateUserId   int64  `gorm:"column:create_user_id" json:"create_user_id" form:"create_user_id"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	Remark         string `gorm:"column:remark" json:"remark" form:"remark"`
+	DeleteIdSystem int64  `gorm:"column:delete_id_system" json:"delete_id_system" form:"delete_id_system"`
+	Title          string `gorm:"column:title" json:"title" form:"title"`
+	Content        string `gorm:"column:content" json:"content" form:"content"`
+	Order          int64  `gorm:"column:orders" json:"orders" form:"orders"`
+	Code           string `gorm:"column:code" json:"code" form:"code"`
+}
+
+func (DictDataconfig) TableName() string {
+	return "xt_drug_data_config"
+}

models/sz_his_models.go

@@ -73,8 +73,3 @@ type DocDetail struct {
 	StaffCode                               string //医护人员编码
 	EndTime                                 int64  // 结束日期
 }
-
-type RegisterDetail struct {
-	PrescriptionNumber string
-	PrescriptionNumber string
-}

routers/router.go

@@ -1,7 +1,7 @@
 package routers
 
 import (
-	"gdyb/controllers/sg"
+	"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
 	"github.com/astaxie/beego"
@@ -19,8 +19,8 @@ func init() {
 		AllowCredentials: true,
 	}))
 
-	sg.HisManagerApiRegistRouters()
-	sg.GdybRegistRouters()
-	//sz.SZHisManagerApiRegistRouters()
+	//sg.HisManagerApiRegistRouters()
+	//sg.GdybRegistRouters()
+	sz.SZHisManagerApiRegistRouters()
 
 }

service/sz_his_service.go

@@ -991,3 +991,9 @@ func SzybYS003(doctor string, doctor_code string, fixmedins_code string, datas [
 	str := string(respBytes)
 	return str
 }
+
+func GetDoseCode(dose_id int64, user_org_id int64) (error, string) {
+	var data models.DictDataconfig
+	err := readDb.Model(&models.DictDataconfig{}).Where(" (user_org_id = ? Or user_org_id = 0) AND parent_id = 4 AND module = 'system' AND status = 1 AND value = ?", user_org_id, dose_id).First(&data).Error
+	return err, data.Code
+}