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

controllers/js/jsyb_controller.go

@@ -467,16 +467,35 @@ func (c *JSybController) PostTen() {
 	})
 }
 
-//var initFlag int64 = 0
-
 func (c *JSybController) ReadCard() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")
 	ak := c.GetString("ak")
-
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	url := c.GetString("url")
 	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
-	basStr := c.GetBasBaseInfo()
-	fmt.Println(basStr)
+	pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
+	bas := strings.Split(pCardInfo, "|")
+	basNumber := bas[2]
+	card_sn := bas[3]
+	if len(pCardInfo) > 0 && len(pBusiCardInfo) > 0 {
+		result, _ := service.Jsyb1101A(basNumber, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, "1", url, ak, pBusiCardInfo)
+		fmt.Println(result)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status":         "0",
+			"card_info":      pCardInfo,
+			"busi_card_info": pBusiCardInfo,
+			"result":         result,
+		})
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "-1",
+		})
+
+	}
 
 }
 
@@ -519,24 +538,24 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	//initFlag = 1
 	return
 }
-func (c *JSybController) GetBasBaseInfo() string {
+func (c *JSybController) GetBasBaseInfo() (string, string) {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
 	readCard := DllDef.MustFindProc("ReadCardBas")
 	fmt.Println(readCard)
 	fmt.Println("!!!!!")
-	str := make([]byte, 2048)
-	str1 := make([]byte, 8192)
-	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), (uintptr)(unsafe.Pointer(&str1[0])))
-	fmt.Println(ret2)
-	//str = strings.Replace(str, " ", "", -1)
-	fmt.Println(string(strings.Replace(string(str1), " ", "", -1)))
-	fmt.Println(string(strings.Replace(string(str), " ", "", -1)))
-	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
-	fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
+	pCardInfo := make([]byte, 2048)
+	pBusiCardInfo := make([]byte, 8192)
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	//fmt.Println(ret2)
+	////str = strings.Replace(str, " ", "", -1)
+	//fmt.Println(string(strings.Replace(string(pCardInfo), " ", "", -1)))
+	//fmt.Println(string(strings.Replace(string(str), " ", "", -1)))
+	//fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
+	//fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
 	if ret2 != 0 {
-		return ""
+		return "", ""
 	}
-	return string(str)
+	return strings.Replace(string(pCardInfo), " ", "", -1), strings.Replace(string(pBusiCardInfo), " ", "", -1)
 }
 
 func IntPtr(n int) uintptr {

controllers/sg/his_api_controller.go

@@ -268,6 +268,7 @@ func (c *HisApiController) ReadCard() {
 			api := "http://192.168.124.4:9532/" + "hbyb/1101?cert_no=" + "" +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10)
+
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -340,11 +341,9 @@ func (c *HisApiController) ReadCard() {
 			}
 
 		} else if miConfig.MdtrtareaAdmvs == "320921" {
-			DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
-			Iinit := DllDef.MustFindProc("Init")
-			fmt.Println(Iinit)
-			var res ResultTwo
-			api := "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.ChannelNumber
+
+			api := "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.ChannelNumber + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url
 
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
@@ -364,57 +363,87 @@ func (c *HisApiController) ReadCard() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-
-			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			var status string
+			respJSON = respJSON["data"].(map[string]interface{})["status"].(map[string]interface{})
 			result, _ := json.Marshal(respJSON)
-			fmt.Println("log")
-			fmt.Println(string(result))
-
-			if err := json.Unmarshal([]byte(result), &res); err != nil {
+			if err := json.Unmarshal([]byte(result), &status); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
+			if status == "0" { //读卡成功
+				var card_info string //卡信息
+				var busi_card_info string
+				var res ResultTwo //1101结果
 
-			if res.Infcode == 0 {
-				patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
-				if err == gorm.ErrRecordNotFound {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+				respJSON = respJSON["data"].(map[string]interface{})["card_info"].(map[string]interface{})
+				card_info_result, _ := json.Marshal(respJSON)
+
+				respJSON = respJSON["data"].(map[string]interface{})["busi_card_info"].(map[string]interface{})
+				busi_card_info_result, _ := json.Marshal(respJSON)
+
+				respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
+				result, _ := json.Marshal(respJSON)
+
+				if err := json.Unmarshal([]byte(result), &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
-				} else if err != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				}
+				if err := json.Unmarshal([]byte(card_info_result), &card_info); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
+				}
+				if err := json.Unmarshal([]byte(busi_card_info_result), &busi_card_info); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 
-				} else {
+				if res.Infcode == 0 {
+					patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
+					if err == gorm.ErrRecordNotFound {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+						return
+					} else if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+						return
 
-					Iinfos, _ := json.Marshal(res.Output.Iinfo)
-					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-					infoStr := string(Iinfos)
-					idetinfoStr := string(Idetinfos)
-					psn := &models.HisPsn{
-						PsnNo:       res.Output.Baseinfo.PsnNo,
-						Age:         res.Output.Baseinfo.Age,
-						PatientId:   patient.ID,
-						Certno:      res.Output.Baseinfo.Certno,
-						Brdy:        res.Output.Baseinfo.Brdy,
-						Gend:        res.Output.Baseinfo.Gend,
-						Naty:        res.Output.Baseinfo.Naty,
-						PsnCertType: res.Output.Baseinfo.PsnCertType,
-						PsnName:     res.Output.Baseinfo.PsnName,
-						Idetinfo:    idetinfoStr,
-						Insuinfo:    infoStr,
-						UserOrgId:   c.GetAdminUserInfo().CurrentOrgId,
-					}
-					service.CreateHisPsn(psn)
+					} else {
 
-					c.ServeSuccessJSON(map[string]interface{}{
-						"patient": patient,
-						"number":  res.Output.Baseinfo.Certno,
-					})
+						Iinfos, _ := json.Marshal(res.Output.Iinfo)
+						Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+						infoStr := string(Iinfos)
+						idetinfoStr := string(Idetinfos)
+						psn := &models.HisPsn{
+							PsnNo:       res.Output.Baseinfo.PsnNo,
+							Age:         res.Output.Baseinfo.Age,
+							PatientId:   patient.ID,
+							Certno:      res.Output.Baseinfo.Certno,
+							Brdy:        res.Output.Baseinfo.Brdy,
+							Gend:        res.Output.Baseinfo.Gend,
+							Naty:        res.Output.Baseinfo.Naty,
+							PsnCertType: res.Output.Baseinfo.PsnCertType,
+							PsnName:     res.Output.Baseinfo.PsnName,
+							Idetinfo:    idetinfoStr,
+							Insuinfo:    infoStr,
+							UserOrgId:   c.GetAdminUserInfo().CurrentOrgId,
+						}
+						service.CreateHisPsn(psn)
+						c.ServeSuccessJSON(map[string]interface{}{
+							"patient": patient,
+							"number":  res.Output.Baseinfo.Certno,
+						})
+					}
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+					return
 				}
-			} else {
+			} else { //读卡失败
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 				return
+
 			}
 
 		} else {

main.go

@@ -15,11 +15,11 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
+	service.ConnectDB()
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
 
 }
 func main() {

service/jsyb_service.go

@@ -57,6 +57,54 @@ func Jsyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
 }
 
+//人员基本信息版本2
+func Jsyb1101A(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, request_url string, access_key string, pBusiCardInfo string) (string, string) {
+	timestamp := time.Now().Unix()
+	//生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1101" // 交易编码
+
+	if certificates == "3" {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
+
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = card_sn      // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+		}
+	}
+
+	inputData["mdtrt_cert_no"] = certNo + "|" + pBusiCardInfo // 就诊凭证编号
+	inputData["begntime"] = ""                                // 开始时间
+	inputData["psn_name"] = ""                                // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var inputLog string
+	bytesData, _ := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "1101"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
+}
+
 // 门诊挂号
 func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, opera string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, doctor_name string, request_url string, access_key string) (string, string) {
 	fmt.Println(opera)