1

controllers/sg/his_api_controller.go

@@ -198,7 +198,7 @@ func (c *HisApiController) ReadCard() {
 		}
 		fmt.Println(basStr)
 		bas := strings.Split(basStr, "|")
-		basNumber := bas[2]
+		basNumber := bas[1]
 		fmt.Println(basNumber)
 		card_sn := bas[3]
 		fmt.Println(card_sn)
@@ -462,7 +462,7 @@ func (c *HisApiController) GetSettleList() {
 	}
 
 	sickConfigTwo, _ := service.FindSickById(his.SickType)
-	tempOpspdiseinfo2.DiagCode = sickConfigTwo.CountryCode
+	tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
 	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
 	tempOpspdiseinfo2.MaindiagFlag = "2"
 	tempOpspdiseinfo2.OprnOprtCode = ""
@@ -1699,7 +1699,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	if config.IsOpen == 1 {
 		//service.Gdyb1201("", miConfig.OrgName, "1122", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1, "")
 
-		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&certificates=" + strconv.FormatInt(certificates, 10)
+		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName +  "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&doctor=" + roles.UserName + "&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)
@@ -1781,7 +1781,8 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			IdCardNo := ""
 			if id_card_type == 1 {
-				IdCardNo = medical_insurance_card
+				// IdCardNo = medical_insurance_card
+				IdCardNo = patient.IdCardNo
 			} else {
 				IdCardNo = patient.IdCardNo
 			}
@@ -2042,9 +2043,9 @@ func (c *HisApiController) GetUploadInfo() {
 	if tempOrder.ID == 0 {
 		var result string
 		if miConfig.InsuplcAdmdvs == "440781" { //
-			result = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+			result = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 		} else {
-			result = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+			result = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 
 		}
 
@@ -2351,7 +2352,8 @@ func (c *HisApiController) GetUploadInfo() {
 
 						//insutype = "390"
 						if his.IdCardType == 1 {
-							cert_no = his.MedicalInsuranceNumber
+							// cert_no = his.MedicalInsuranceNumber
+							cert_no = his.Certno
 
 						} else {
 
@@ -2544,7 +2546,8 @@ func (c *HisApiController) GetUploadInfo() {
 
 			//insutype = "390"
 			if his.IdCardType == 1 {
-				cert_no = his.MedicalInsuranceNumber
+				// cert_no = his.MedicalInsuranceNumber
+				cert_no = his.Certno
 
 			} else {
 
@@ -3244,7 +3247,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 	var result string
 	if miConfig.InsuplcAdmdvs == "440781" { //
-		result = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+		result = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 	} else {
 		result = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
 
@@ -5048,7 +5051,7 @@ func (c *HisApiController) GetUploadDiag() {
 	api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
 		"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
 		"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
-		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName
+		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.ContentCode + "&sick_name=" + sickConfig.ClassName
 	resp2, requestErr2 := http.Get(api2)
 	if requestErr2 != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -5553,7 +5556,7 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 	sick, _ := service.FindSickById(sick_id)
 	doctor, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
 	if config.IsOpen == 1 {
-		result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.CountryCode)
+		result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.ContentCode)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)

service/gdyb_service.go

@@ -162,13 +162,13 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["card_sn"] = card_sn      // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "1"    // 人员证件类型
+			inputData["psn_cert_type"] = "01"    // 人员证件类型
 
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "1"    // 人员证件类型
+			inputData["psn_cert_type"] = "01"    // 人员证件类型
 		}
 	}
 
@@ -307,13 +307,13 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	inputData["insutype"] = insutype      // 险种类型（来自1101接口返回）
 	inputData["begntime"] = timeFormatOne // 开始时间
 
-	//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 // 就诊凭证编号
-	//}
+	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["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
 	inputData["atddr_no"] = doctor_id    // 医师编码
@@ -2504,9 +2504,9 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	inputMessage["dev_safe_info"] = ""                                                          // 设备安全信息
 	inputMessage["cainfo"] = ""                                                                 // 数字签名信息
 	inputMessage["signtype"] = ""                                                               // 签名类型
-	inputMessage["infver"] = "V2.0"                                                             // 接收方系统代码
+	inputMessage["infver"] = "V1.0"                                                             // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
-	inputMessage["opter"] = doctor                                                              // 经办人
+	inputMessage["opter"] = doctor                                                             // 经办人
 	inputMessage["opter_name"] = doctor                                                         // 经办人姓名
 	inputMessage["inf_time"] = timeFormatOne                                                    // 交易时间
 	inputMessage["fixmedins_code"] = fixmedins_code                                             // 定点医药机构编号
@@ -2800,9 +2800,9 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	} else {
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-			inputData["card_sn"] = card_sn      // 卡识别码
+			inputData["card_sn"] = ""      // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "90"   // 人员证件类型
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
 
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
@@ -2830,7 +2830,9 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
 	url := gdyb_url + "1101"
-
+	fmt.Println(url)
+	fmt.Println(gdyb_paasid)
+	fmt.Println(secret_key)
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {