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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 10191
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,21 +53,21 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
-gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+# gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 # gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
 # gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
 # gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
 #韶关
-gdyb_paasid = "sg03_prd"
+# gdyb_paasid = "sg03_prd"
 #江门
 #gdyb_paasid = "jm_sc_yjyy"
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳
-# gdyb_paasid = "sz_prd_yjyy"
+gdyb_paasid = "sz_prd_yjyy"
 #肇庆
 # gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"

controllers/sg/his_api_controller.go

@@ -1381,6 +1381,71 @@ func (c *HisApiController) ReadCard() {
 
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "350500" {
+			cardnum, cardCode, id_card_no, name, errmsg := c.GetFjBasBaseInfo()
+			fmt.Println(cardnum)
+			fmt.Println(cardCode)
+			fmt.Println(id_card_no)
+			fmt.Println(name)
+			fmt.Println(errmsg)
+			basStr := cardnum + "|" + cardCode + "|" + id_card_no + "|" + name
+			result, _ := service.FJyb1101(cardnum, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, cardCode, certificates, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+
+			userJSONBytes, _ := json.Marshal(dat)
+			var res ResultTwo
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			if res.Infcode == 0 {
+				patient, err := service.GetPatientByNumber(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
+				if err == gorm.ErrRecordNotFound {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+					return
+				} else if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+					return
+
+				} else {
+					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,
+						CardInfo:     basStr,
+						VerifyNumber: "",
+					}
+					service.CreateHisPsn(psn)
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"patient": patient,
+						"number":  cardnum,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
 		} else {
 			if initFlag == 0 {
 				c.TestGetBasBaseInit()
@@ -1875,6 +1940,37 @@ func (c *HisApiController) GetBasBaseInfo() string {
 	return string(str)
 }
 
+func (c *HisApiController) GetFjBasBaseInfo() (string, string, string, string, string) {
+	DllDef := syscall.MustLoadDLL("chs_fjs_standard.dll")
+	readCard := DllDef.MustFindProc("read_cardinfo")
+	if readCard == nil {
+		fmt.Println("readcard is nil")
+		readCard = DllDef.MustFindProc("read_cardinfo")
+	}
+	str := make([]byte, 1024)  //卡号
+	str1 := make([]byte, 1024) //卡识别码
+	str2 := make([]byte, 1024) //身份证号
+	str3 := make([]byte, 1024) //姓名
+	str4 := make([]byte, 1024) //错误信息
+
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), (uintptr)(unsafe.Pointer(&str2[0])), (uintptr)(unsafe.Pointer(&str3[0])), (uintptr)(unsafe.Pointer(&str4[0])))
+	fmt.Println(string(str1))
+	fmt.Println(string(str))
+	fmt.Println(string(str2))
+	fmt.Println(string(str3))
+	fmt.Println(string(str4))
+	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(string(str2), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(string(str3), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(string(str4), "gbk", "utf-8"))
+
+	if ret2 != 0 {
+		return "", "", "", "", ""
+	}
+	return string(str), string(str1), string(str2), string(str3), string(str4)
+}
+
 type CustomFundPay struct {
 	FundPayType string  `json:"fund_pay_type"`
 	FundPayamt  float64 `json:"fund_payamt"`
@@ -4972,6 +5068,21 @@ func (c *HisApiController) GetRegisterInfo() {
 			infocode = 0
 			verify_number = psn_info.VerifyNumber
 
+		} else if miConfig.MdtrtareaAdmvs == "350500" {
+			psn_info, _ := service.GetPsnByPatientId(id)
+			PsnNo = psn_info.PsnNo
+			PsnCertType = psn_info.PsnCertType
+			Certno = psn_info.Certno
+			PsnName = psn_info.PsnName
+			Gend = psn_info.Gend
+			Naty = psn_info.Naty
+			Brdy = psn_info.Brdy
+			Age = psn_info.Age
+			infoStr = psn_info.Insuinfo
+			idetinfoStr = psn_info.Idetinfo
+			infocode = 0
+			verify_number = psn_info.VerifyNumber
+
 		} else {
 			var result string
 			var requestLog string
@@ -5242,6 +5353,27 @@ func (c *HisApiController) GetRegisterInfo() {
 
 				resThree.InfRefmsgid = resThree10265.InfRefmsgid
 
+				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
+			} else if miConfig.MdtrtareaAdmvs == "350500" {
+				result, requestLog := service.FJyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, doctor_info.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, roles.UserName, doctor_info.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				saveLog(result, requestLog, "2201", "挂号")
+				if miConfig.Code == "H15049901371" {
+
+					if err := json.Unmarshal([]byte(result), &resThree10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					resThree.ErrMsg = resThree10265.ErrMsg
+					resThree.Output = resThree10265.Output
+					resThree.InfRefmsgid = resThree10265.InfRefmsgid
+				} else {
+					if err := json.Unmarshal([]byte(result), &resThree); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+				}
 				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else {
 				result, requestLog := service.Gdyb2201A(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time)

models/his_models.go

@@ -863,6 +863,9 @@ type MedicalInsuranceOrgConfig struct {
 	Url            string `gorm:"column:url" json:"url" form:"url"`
 	AccessKey      string `gorm:"column:access_key" json:"access_key" form:"access_key"`
 	Cainfo         string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	AppSecret      string `gorm:"column:app_secret" json:"app_secret" form:"app_secret"`
+	SignKey        string `gorm:"column:sign_key" json:"sign_key" form:"sign_key"`
+	EncKey         string `gorm:"column:enc_key" json:"enc_key" form:"enc_key"`
 }
 
 func (MedicalInsuranceOrgConfig) TableName() string {

routers/router.go

@@ -1,10 +1,7 @@
 package routers
 
 import (
-	"gdyb/controllers/nm"
 	"gdyb/controllers/sg"
-	"gdyb/controllers/zh"
-
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
@@ -26,9 +23,9 @@ func init() {
 	sg.GdybRegistRouters()
 	//hb.HbybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
-	zh.ZHHisManagerApiRegistRouters()
+	//zh.ZHHisManagerApiRegistRouters()
 	//js.JSybRegistRouters()
-	nm.NmybRegistRouters()
+	//nm.NmybRegistRouters()
 	//coordinate.CoordinateRegistRouters()
 
 }

service/gdyb_service.go

@@ -4606,7 +4606,7 @@ func Gdyb1101D(certNo string, org_name string, doctor string, fixmedins_code str
 
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	inputData["begntime"] = ""          // 开始时间
-	inputData["psn_name"] = psn_name    // 人员姓名
+	inputData["psn_name"] = ""          // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入