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

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 10026
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,8 +53,8 @@ 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_paasid = "sg03_prd"
-#gdyb_paasid = "jm_sc_yjyy"
+#gdyb_paasid = "sg03_prd"
+gdyb_paasid = "jm_sc_yjyy"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/sg/gdyb_controller.go

@@ -76,7 +76,9 @@ func (c *GdybController) PostOne() {
 	secret_key := c.GetString("secret_key")
 	id_card_type, _ := c.GetInt64("id_card_type")
 	card_sn := c.GetString("card_sn")
-	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn)
+	certificates := c.GetString("certificates")
+
+	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 
@@ -324,7 +326,7 @@ func (c *GdybController) PostEight() {
 	preselfpay_amt, _ := c.GetFloat("preselfpay_amt")
 	inscp_scp_amt, _ := c.GetFloat("inscp_scp_amt")
 
-	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt)
+	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, 1)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -79,7 +79,7 @@ func HisManagerApiRegistRouters() {
 func (c *HisApiController) TestGetBasBaseInfo() {
 	DllDef := syscall.MustLoadDLL("SSCard.dll")
 	defer syscall.FreeLibrary(DllDef)
-	Iinit:= DllDef.MustFindProc("Init")
+	Iinit := DllDef.MustFindProc("Init")
 	readCard := DllDef.MustFindProc("ReadCardBas")
 	ret, _, err := Iinit.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
 	if ret != 0 {
@@ -101,13 +101,12 @@ func (c *HisApiController) TestGetBasBaseInfo() {
 		return
 	}
 
-
 	str := make([]byte, 1024)
 	str1 := make([]byte, 1024)
-	cdat:=len(str)
-	cdat1:=len(str1)
-	p:= *((*int32)(unsafe.Pointer(&str[0])))
-	p1:= *((*int32)(unsafe.Pointer(&str1[0])))
+	cdat := len(str)
+	cdat1 := len(str1)
+	p := *((*int32)(unsafe.Pointer(&str[0])))
+	p1 := *((*int32)(unsafe.Pointer(&str1[0])))
 	ret2, _, err2 := readCard.Call(uintptr(p), uintptr(cdat), uintptr(p1), uintptr(cdat1))
 	fmt.Println(" Add(4,5)的结果为:", ret2)
 	str11 := prttostr(uintptr(p))
@@ -126,17 +125,16 @@ func (c *HisApiController) TestGetBasBaseInfo() {
 
 func prttostr(vcode uintptr) string {
 	var vbyte []byte
-	for i:=0;i<10;i++{
-	   sbyte:=*((*byte)(unsafe.Pointer(vcode)))
-	   if sbyte==0{
-		  break
-	   }
-	   vbyte=append(vbyte,sbyte)
-	   vcode += 1
+	for i := 0; i < 10; i++ {
+		sbyte := *((*byte)(unsafe.Pointer(vcode)))
+		if sbyte == 0 {
+			break
+		}
+		vbyte = append(vbyte, sbyte)
+		vcode += 1
 	}
 	return string(vbyte)
- }
-
+}
 
 //func (c *HisApiController) TestPay() {
 //	DllDef2 := syscall.MustLoadDLL("SSSE32.dll")
@@ -1010,7 +1008,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	config, _ := service.GetMedicalInsuranceConfig(adminInfo.CurrentOrgId)
 
 	if config.IsOpen == 1 {
-		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&certificates=" + strconv.FormatInt(certificates, 10)
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1086,7 +1084,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			timeFormat := tempTime.Format("20060102150405")
 			chrgBchno := rand.Intn(100000) + 10000
 			ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
-			//count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
+			count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
 			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 			doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
 
@@ -1126,6 +1124,10 @@ func (c *HisApiController) GetRegisterInfo() {
 			if is310 == 1 {
 				insutype = "310"
 			}
+			if count == 1 {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
+				return
+			}
 			api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
 				insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
@@ -1610,7 +1612,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 				}
 
-				result, src_resquest := service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(patientPrescription.RegisterType, 10), his.IdCardType, 0, 0, 0, 0)
+				result, src_resquest := service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(patientPrescription.RegisterType, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result), &dat); err == nil {
 					fmt.Println(dat)

service/gdyb_service.go

@@ -87,7 +87,7 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 // 人员基本信息
-func Gdyb1101(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) string {
+func Gdyb1101(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) string {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -98,15 +98,22 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101" // 交易编码
 
-	if id_card_type == 1 {
-		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-		inputData["card_sn"] = card_sn      // 卡识别码
+	if certificates == "6" {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
 		inputData["certno"] = certNo        // 证件号码
+
 	} else {
-		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-		inputData["card_sn"] = ""           // 卡识别码
-		inputData["certno"] = certNo        // 证件号码
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = card_sn      // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+		}
 	}
+
 	inputData["psn_cert_type"] = "1"    // 人员证件类型
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	inputData["begntime"] = ""          // 开始时间
@@ -919,7 +926,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64) (string, string) {
+func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -930,15 +937,18 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2207" // 交易编码
-
-	inputData["psn_no"] = psnNo // 人员编号 （来自1101接口返回）
-
-	if id_card_type == 1 {
-		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 6 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	} else {
-		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
 	}
 
 	inputData["med_type"] = med_type    // 医疗类别 11 普通门诊  12 门诊挂号