1111

controllers/sg/his_api_controller.go

@@ -978,7 +978,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			if count <= 0 {
 				api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
-					res.Output.Iinfo[3].Insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
+					res.Output.Iinfo[0].Insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
 					"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
 				resp, requestErr := http.Get(api)

models/his_models.go

@@ -659,6 +659,7 @@ type HisOrder struct {
 	SzChargeInfo            string `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
 	SzProjectInfo           string `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
 	SzMedicineInsuranceInfo string `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
+	YiliaoNumber            string `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 
 	MzNumber      string `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	OrgSetlNumber string `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`

service/sz_his_service.go

@@ -12,13 +12,13 @@ import (
 	_ "unsafe"
 )
 
-func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_code string, account string, verify_code string, serial_number string, other_number string) string {
+func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_code string, account string, verify_code string, serial_number string, mz_number string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "MZ002" // 交易编码
 
-	inputData["akc190"] = "202104080950121452"
+	inputData["akc190"] = mz_number
 	inputData["aaz500"] = account
 	inputData["bzz269"] = "000000"
 	inputData["aka130"] = "11"
@@ -73,14 +73,14 @@ func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_co
 	str := string(respBytes)
 	return str
 }
-func SzybFY001(doctor string, doctor_code string, fixmedins_code string, datas []*models.CustomDetail, verify_code string, serial_number string) string {
+func SzybFY001(doctor string, doctor_code string, fixmedins_code string, datas []*models.CustomDetail, verify_code string, serial_number string, mz_number string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "FY001" // 交易编码
 	inputMessage["transChannel"] = "10" // 交易编码
 
-	inputData["akc190"] = "G554020210305"
+	inputData["akc190"] = mz_number
 	inputData["bke384"] = serial_number
 	inputData["listsize"] = len(datas)
 
@@ -144,13 +144,13 @@ func SzybFY001(doctor string, doctor_code string, fixmedins_code string, datas [
 	str := string(respBytes)
 	return str
 }
-func SzybFY002(doctor string, doctor_code string, fixmedins_code string, datas []*models.CustomDetail, verify_code string, serial_number string) string {
+func SzybFY002(doctor string, doctor_code string, fixmedins_code string, datas []*models.CustomDetail, verify_code string, serial_number string, mz_number string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "FY002" // 交易编码
 
-	inputData["akc190"] = "G554020210305"
+	inputData["akc190"] = mz_number
 	inputData["bke384"] = serial_number
 	inputData["listsize"] = len(datas)
 
@@ -198,13 +198,13 @@ func SzybFY002(doctor string, doctor_code string, fixmedins_code string, datas [
 	str := string(respBytes)
 	return str
 }
-func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total float64, verify_code string, serial_number string) string {
+func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total float64, verify_code string, serial_number string, mz_number string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "FY004" // 交易编码
 
-	inputData["akc190"] = "G554020210305"
+	inputData["akc190"] = mz_number
 	inputData["aka130"] = "11"
 	inputData["bkc320"] = doctor_code
 	inputData["ckc350"] = doctor
@@ -246,7 +246,7 @@ func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total f
 	str := string(respBytes)
 	return str
 }
-func SzybFY005(doctor string, doctor_code string, fixmedins_code string, dept_code string, total float64, account string, verify_code string, serial_number string) string {
+func SzybFY005(doctor string, doctor_code string, fixmedins_code string, dept_code string, total float64, account string, verify_code string, serial_number string, mz_number string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
@@ -254,7 +254,7 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, dept_co
 
 	inputData["aaz500"] = account
 	inputData["bzz269"] = "000000"
-	inputData["akc190"] = "G554020210305"
+	inputData["akc190"] = mz_number
 	inputData["aka130"] = "11"
 	inputData["bkc320"] = doctor_code
 	inputData["ckc350"] = doctor
@@ -341,10 +341,9 @@ func SzybJY001(doctor string, doctor_code string, fixmedins_code string, setl_nu
 	str := string(respBytes)
 	return str
 }
-
-func SzybJY002(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string) string {
+func SzybJY002(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string, new_setl_number string) string {
 	// 生成输入报文
-	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, setl_number)
+	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, new_setl_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "JY002" // 交易编码