更新

controllers/js/jsyb_controller.go

@@ -1088,14 +1088,14 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	//miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	str := make([]byte, 2048)
 	inputData := make(map[string]interface{})
-	inputData["IP"] = "10.72.3.87"
+	inputData["IP"] = "10.58.65.240"
 	inputData["PORT"] = "8086"
 	inputData["TIMEOUT"] = "180"
 	inputData["LOG_PATH"] = "C:\\log\\"
 
 	//inputData["EC_URL"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
 
-	inputData["EC_URL"] = "http://10.72.3.127:10086/localcfc/api/hsecfc/localQrCodeQuery"
+	inputData["EC_URL"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
 	inputData["CARD_PASSTYPE"] = "1"
 	inputData["API_NAME"] = "hssServives"
 	inputData["API_VERSION"] = "1.0.0"

controllers/nm/nm_controller.go

@@ -53,6 +53,9 @@ func NmybRegistRouters() {
 	beego.Router("/api/token", &NmController{}, "get:GetToken")
 	beego.Router("/api/eleinfo", &NmController{}, "get:GetNewELeInfo")
 
+	beego.Router("/nmyb/4102", &NmController{}, "get:Post4102")
+	beego.Router("/nmyb/4103", &NmController{}, "get:Post4103")
+
 }
 func (c *NmController) GetNewELeInfo() {
 	token := c.GetString("token")
@@ -347,6 +350,79 @@ func (c *NmController) Post5203() {
 		"pre": dat,
 	})
 }
+func (c *NmController) Post4102() {
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	psn_no := c.GetString("psn_no")
+	mdtrt_id := c.GetString("mdtrt_id")
+	setl_id := c.GetString("setl_id")
+	stas_type := c.GetString("stas_type")
+
+	bp := models.BaseParams{
+		SecretKey:      secret_key,
+		FixmedinsCode:  fixmedins_code,
+		InsuplcAdmdvs:  insuplc_admdvs,
+		MdtrtareaAdmvs: mdtrtarea_admvs,
+		OrgName:        org_name,
+		Doctor:         doctor,
+	}
+	bps := models.BusinessParams{
+		PsnNo:    psn_no,
+		MdtrtId:  mdtrt_id,
+		SetlId:   setl_id,
+		StasType: stas_type,
+	}
+	result := service.ZHyb4102(bp, bps)
+	saveJsLog(result, "", "4102", "确认结算清单", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}
+func (c *NmController) Post4103() {
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	psn_no := c.GetString("psn_no")
+	mdtrt_id := c.GetString("mdtrt_id")
+	setl_id := c.GetString("setl_id")
+	bp := models.BaseParams{
+		SecretKey:      secret_key,
+		FixmedinsCode:  fixmedins_code,
+		InsuplcAdmdvs:  insuplc_admdvs,
+		MdtrtareaAdmvs: mdtrtarea_admvs,
+		OrgName:        org_name,
+		Doctor:         doctor,
+	}
+	bps := models.BusinessParams{
+		PsnNo:   psn_no,
+		MdtrtId: mdtrt_id,
+		SetlId:  setl_id,
+	}
+	result := service.ZHyb4103(bp, bps)
+	saveJsLog(result, "", "4103", "查询结算清单", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}
 
 func (c *NmController) Post1101() {
 	certNo := c.GetString("cert_no")

controllers/sg/his_api_controller.go

@@ -617,66 +617,6 @@ func (c *HisApiController) ReadEleToken() {
 			})
 		}
 
-	} else if miConfig.MdtrtareaAdmvs == "440305" || miConfig.MdtrtareaAdmvs == "440305" || miConfig.MdtrtareaAdmvs == "441202" {
-		if initFlag == 0 {
-			c.TestGetBasBaseInit()
-		}
-		token := c.GetEleBaseInfo()
-		token = Remove0000(token)
-		if len(token) > 0 {
-			result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, token, "", "")
-			saveLog(result2, requestLog2, "1101", "获取人员信息")
-			var res ResultTwo
-			if err := json.Unmarshal([]byte(result2), &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			if res.Infcode == 0 {
-				patient, err := service.GetPatientByNumber(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
-				} 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:     "",
-						VerifyNumber: token,
-					}
-					service.CreateHisPsn(psn)
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg": "读取成功",
-					})
-				}
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-				return
-			}
-		} else {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"failed_code": -10,
-				"msg":         "读取失败",
-			})
-		}
-
 	} else if miConfig.MdtrtareaAdmvs == "350500" {
 		_, outPutInfo, errMsg := service.ReadEleCardForSettle(miConfig.Code, roles.UserName, roles.AdminUserId)
 		if len(errMsg) == 0 {
@@ -893,6 +833,66 @@ func (c *HisApiController) ReadEleToken() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 			return
 		}
+	} else {
+		if initFlag == 0 {
+			c.TestGetBasBaseInit()
+		}
+		token := c.GetEleBaseInfo()
+		token = Remove0000(token)
+		if len(token) > 0 {
+			result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, token, "", "")
+			saveLog(result2, requestLog2, "1101", "获取人员信息")
+			var res ResultTwo
+			if err := json.Unmarshal([]byte(result2), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode == 0 {
+				patient, err := service.GetPatientByNumber(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
+				} 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:     "",
+						VerifyNumber: token,
+					}
+					service.CreateHisPsn(psn)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "读取成功",
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         "读取失败",
+			})
+		}
+
 	}
 }
 func (c *HisApiController) Get9001() {
@@ -2579,8 +2579,10 @@ func (c *HisApiController) ReadCard() {
 			name = Remove0000(name)
 			errmsg = Remove0000(errmsg)
 
+			patient, _ := service.GetPatientByIDCard(id_card_no, miConfig.UserOrgId)
+
 			basStr := cardnum + "|" + cardCode + "|" + id_card_no + "|" + name
-			result, requestLog, errMsgLog := service.FJyb1101(cardnum, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, cardCode, certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			result, requestLog, errMsgLog := service.FJyb1101(cardnum, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, cardCode, certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, patient.Name)
 			saveLog(result, requestLog, "1101", "获取人员信息")
 			fmt.Println(errMsgLog)
 
@@ -3518,67 +3520,6 @@ func (c *HisApiController) ReadCard() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 				return
 			}
-		} else if miConfig.MdtrtareaAdmvs == "440300" || miConfig.MdtrtareaAdmvs == "440305" {
-
-			if initFlag == 0 {
-				c.TestGetBasBaseInit()
-			}
-			token := c.GetEleBaseInfo()
-
-			token = Remove0000(token)
-
-			result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, token, "", "")
-			saveLog(result2, requestLog2, "1101", "获取人员信息")
-			//
-			var res ResultTwo
-			if err := json.Unmarshal([]byte(result2), &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			if res.Infcode == 0 {
-				patient, err := service.GetPatientByNumber(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
-
-				} 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:     "",
-						VerifyNumber: token,
-					}
-					service.CreateHisPsn(psn)
-
-					c.ServeSuccessJSON(map[string]interface{}{
-						"patient": patient,
-						"number":  token,
-					})
-				}
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-				return
-			}
-
 		} else if miConfig.MdtrtareaAdmvs == "430800" {
 
 			if initFlag == 0 {
@@ -4026,6 +3967,67 @@ func (c *HisApiController) ReadCard() {
 				}
 
 			}
+		} else {
+
+			if initFlag == 0 {
+				c.TestGetBasBaseInit()
+			}
+			token := c.GetEleBaseInfo()
+
+			token = Remove0000(token)
+
+			result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, token, "", "")
+			saveLog(result2, requestLog2, "1101", "获取人员信息")
+			//
+			var res ResultTwo
+			if err := json.Unmarshal([]byte(result2), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			if res.Infcode == 0 {
+				patient, err := service.GetPatientByNumber(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
+
+				} 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:     "",
+						VerifyNumber: token,
+					}
+					service.CreateHisPsn(psn)
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"patient": patient,
+						"number":  token,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
+
 		}
 		break
 	}
@@ -7641,7 +7643,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				verify_number = psn_info.VerifyNumber
 			} else if id_card_type == 2 {
 
-				result, requestLog, errMsgLog := service.FJyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, patient.IdCardNo, certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				result, requestLog, errMsgLog := service.FJyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, id_card_type, patient.IdCardNo, certificates, miConfig.Url, miConfig.Cainfo, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, "")
 				fmt.Println(errMsgLog)
 				saveLog(result, requestLog, "1101", "人员基本信息获取")
 
@@ -7813,12 +7815,24 @@ func (c *HisApiController) GetRegisterInfo() {
 			var requestLog string
 			if miConfig.UserOrgId == 10138 {
 				if id_card_type != 4 {
+					var insa string
+					if len(patient.InsuplcAdmdvs) > 0 {
+						insa = patient.InsuplcAdmdvs
+					} else {
+						insa = miConfig.InsuplcAdmdvs
+					}
 					//psn_info, _ := service.GetPsnByPatientId(id)
 					//result, requestLog = service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_info.VerifyNumber)
-					result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name, record_time)
+					result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, insa, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name, record_time)
 				}
 			} else {
-				result, requestLog = service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
+				var insa string
+				if len(patient.InsuplcAdmdvs) > 0 {
+					insa = patient.InsuplcAdmdvs
+				} else {
+					insa = miConfig.InsuplcAdmdvs
+				}
+				result, requestLog = service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, insa, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
 			}
 
 			if id_card_type == 4 {
@@ -9598,7 +9612,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 	} else if tempOrder.ID > 0 {
 		if tempOrder.IsPre == 1 {
-			allTotal := fmt.Sprintf("%.4f", tempOrder.MedfeeSumamt)
+			allTotal := fmt.Sprintf("%.2f", tempOrder.MedfeeSumamt)
 			var rf []*ResultFive
 			json.Unmarshal([]byte(his.Iinfo), &rf)
 			chrg_bchno := tempOrder.Number
@@ -11159,7 +11173,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					res.Infcode = infocode
 
 				} else {
-					result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string), patientPrescription.DoctorId, sickConfig.CountryCode)
+					result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string), patientPrescription.DoctorId, sickConfig.CountryCode)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result), &dat); err == nil {
 						fmt.Println(dat)
@@ -11295,7 +11309,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					}
 				}
 
-				allTotal := fmt.Sprintf("%.4f", total)
+				allTotal := fmt.Sprintf("%.2f", total)
 				if res.Infcode == 0 {
 					var rf []*ResultFive
 					json.Unmarshal([]byte(his.Iinfo), &rf)
@@ -12809,6 +12823,7 @@ func (c *HisApiController) GetCheckAccount() {
 		acct_pay = acct_pay + item.AcctPay
 		fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
 	}
+
 	var user_name string
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	if role.ID == 0 {
@@ -12879,7 +12894,7 @@ func (c *HisApiController) GetCheckAccount() {
 			}
 			api := "http://172.16.13.254:9532/" + "nmyb/3201?" +
 				"insutype=" + insutype +
-				"&clr_type=" + clr_type +
+				"&clr_type=" + "51" +
 				"&setl_optins=" + clr_org +
 				"&stmt_begndate=" + start_time +
 				"&stm_enddate=" + end_time +

controllers/zh/zh_his_api_controller.go

@@ -503,6 +503,9 @@ func ZHHisManagerApiRegistRouters() {
 	beego.Router("/api/token/get", &ZHHisApiController{}, "post:GetToken")
 	beego.Router("/api/ele/info", &ZHHisApiController{}, "post:GetEleInfo")
 
+	beego.Router("/api/4102", &ZHHisApiController{}, "get:Get4102")
+	beego.Router("/api/4103", &ZHHisApiController{}, "get:Get4103")
+
 }
 
 func (c *ZHHisApiController) GetEleInfo() {
@@ -1171,14 +1174,11 @@ func (c *ZHHisApiController) ClearSettle() {
 func (c *ZHHisApiController) GetZHPatientInfo() {
 	id_card_no := c.GetString("id_card_no")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-
 	patient, _ := service.GetPatientByIDCard(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
-
 	if patient.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
 		return
 	}
-
 	role, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(c.GetAdminUserInfo().CurrentOrgId)
@@ -1189,10 +1189,21 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 		var result_log string
 
 		if miConfig.MdtrtareaAdmvs == "150499" {
+			var insuplc_admdvs string
+
+			if len(patient.InsuplcAdmdvs) > 0 {
+
+				insuplc_admdvs = patient.InsuplcAdmdvs
+
+			} else {
+				insuplc_admdvs = miConfig.InsuplcAdmdvs
+
+			}
+
 			//请求内网数据
 			api := "http://172.16.13.254:9532/" + "nmyb/1101?cert_no=" + patient.IdCardNo +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(2, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(1, 10) + "&name=" + patient.Name
+				"&insuplc_admdvs=" + insuplc_admdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(2, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(1, 10) + "&name=" + patient.Name
 
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
@@ -1988,6 +1999,175 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 	}
 
 }
+func (c *ZHHisApiController) Get4102() {
+	order_id, _ := c.GetInt64("order_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	stas_type := c.GetString("stas_type")
+	adminUser := c.GetAdminUserInfo()
+	order, _ := service.GetHisOrderByID(order_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	var user_name string
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	if role.ID == 0 {
+		user_name = "管理员"
+	} else {
+		user_name = role.UserName
+	}
+	baseParams := models.BaseParams{
+		SecretKey:      miConfig.SecretKey,
+		FixmedinsCode:  miConfig.Code,
+		InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
+		MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
+		OrgName:        miConfig.OrgName,
+		Doctor:         user_name,
+		RequestUrl:     miConfig.Url,
+		AccessKey:      miConfig.AccessKey,
+	}
+
+	businessParams := models.BusinessParams{
+		PsnNo:    order.PsnNo,
+		MdtrtId:  order.MdtrtId,
+		SetlId:   order.SetlId,
+		StasType: stas_type,
+	}
+
+	api := "http://172.16.13.254:9532/" + "nmyb/4102?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
+		"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
+		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&stas_type=" + stas_type
+	resp, requestErr := http.Get(api)
+	if requestErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	if ioErr != nil {
+		utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	result, _ := json.Marshal(respJSON)
+	fmt.Println("log")
+	fmt.Println(string(result))
+
+	var res2 ResultSix
+	var resEmpty10265 ResultEmpty10265
+
+	if err := json.Unmarshal(result, &resEmpty10265); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+	res2.Infcode = Infcode
+	res2.RespondTime = resEmpty10265.RespondTime
+	res2.ErrMsg = resEmpty10265.ErrMsg
+	res2.Output = resEmpty10265.Output
+	res2.WarnMsg = resEmpty10265.WarnMsg
+
+	if res2.Infcode == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "确认成功",
+		})
+
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res2.ErrMsg,
+		})
+
+	}
+
+}
+func (c *ZHHisApiController) Get4103() {
+	order_id, _ := c.GetInt64("order_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	stas_type := c.GetString("stas_type")
+	adminUser := c.GetAdminUserInfo()
+	order, _ := service.GetHisOrderByID(order_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	var user_name string
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	if role.ID == 0 {
+		user_name = "管理员"
+	} else {
+		user_name = role.UserName
+	}
+	baseParams := models.BaseParams{
+		SecretKey:      miConfig.SecretKey,
+		FixmedinsCode:  miConfig.Code,
+		InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
+		MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
+		OrgName:        miConfig.OrgName,
+		Doctor:         user_name,
+		RequestUrl:     miConfig.Url,
+		AccessKey:      miConfig.AccessKey,
+	}
+
+	businessParams := models.BusinessParams{
+		PsnNo:    order.PsnNo,
+		MdtrtId:  order.MdtrtId,
+		SetlId:   order.SetlId,
+		StasType: stas_type,
+	}
+
+	api := "http://172.16.13.254:9532/" + "nmyb/4103?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
+		"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
+		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&stas_type=" + stas_type
+	resp, requestErr := http.Get(api)
+	if requestErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	if ioErr != nil {
+		utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	result, _ := json.Marshal(respJSON)
+	fmt.Println("log")
+	fmt.Println(string(result))
+	var res2 ResultSix
+	var resEmpty10265 ResultEmpty10265
+
+	if err := json.Unmarshal(result, &resEmpty10265); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+	res2.Infcode = Infcode
+	res2.RespondTime = resEmpty10265.RespondTime
+	res2.ErrMsg = resEmpty10265.ErrMsg
+	res2.Output = resEmpty10265.Output
+	res2.WarnMsg = resEmpty10265.WarnMsg
+	if res2.Infcode == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": string(result),
+		})
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res2.ErrMsg,
+		})
+	}
+}
+
 func (c *ZHHisApiController) GetSettleInfo() {
 	order_id, _ := c.GetInt64("order_id")
 	patient_id, _ := c.GetInt64("patient_id")

main.go

@@ -27,8 +27,8 @@ func init() {
 	service.ConnectDB()
 	org_id, _ := beego.AppConfig.Int64("org_id")
 	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
+	////CreateLog(miConfig)
+	////UploadLog(miConfig)
 	if org_id == 10191 {
 		service.GetFjAuthorizationInfo(miConfig.Code)
 	}
@@ -36,6 +36,8 @@ func init() {
 }
 func main() {
 	//service.AutoCreateStock()
+	//service.AutoGdybCreateStock()
+
 	//service.AutoUploadData
 	//GetBatchSettleList()
 	beego.Run()

models/his_models.go

@@ -1036,6 +1036,7 @@ type BusinessParams struct {
 	PsnNo            string
 	MdtrtId          string
 	SetlId           string
+	StasType         string
 }
 
 type BusinessParamsTwo struct {

models/models_3501.go

@@ -100,6 +100,7 @@ type Struct3504 struct {
 	PurcInvoCodg        string
 	PurcInvoNo          string
 	RxFlag              string
+	PurcRetnStoin       string
 	PurcRetnStoinTime   string
 	PurcRetnOpterName   string
 	Memo                string
@@ -254,3 +255,46 @@ type XtDrugInventory struct {
 func (XtDrugInventory) TableName() string {
 	return "xt_drug_inventory"
 }
+
+type XtStockInventoryTwo struct {
+	ID                int64           `gorm:"column:id" json:"id" form:"id"`
+	GoodName          string          `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	SpecificationName string          `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit   string          `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count             int64           `gorm:"column:count" json:"count" form:"count"`
+	BuyPrice          float64         `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	PackingPrice      float64         `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	NewPrice          float64         `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer      string          `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer            string          `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark            string          `gorm:"column:remark" json:"remark" form:"remark"`
+	GoodId            int64           `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	UserOrgId         int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64           `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder  string          `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber     string          `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime         int64           `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater           int64           `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker           int64           `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus     int64           `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime       int64           `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	Total             int64           `gorm:"column:total" json:"total" form:"total"`
+	Number            string          `gorm:"column:number" json:"number" form:"number"`
+	WarehousingInfoId int64           `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	ExpireDate        int64           `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate       int64           `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	GoodOriginPlace   string          `gorm:"column:good_origin_place" json:"good_origin_place" form:"good_origin_place"`
+	Type              int64           `gorm:"column:type" json:"type" form:"type"`
+	InventoryType     int64           `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	LastStockCount    int64           `gorm:"column:last_stock_count" json:"last_stock_count" form:"last_stock_count"`
+	StockCount        int64           `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	StorehouseId      int64           `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	GoodInfo          GoodInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	WarehousingInfo   WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingInfoId" json:"xt_warehouse_info"`
+}
+
+func (XtStockInventoryTwo) TableName() string {
+	return "xt_stock_inventory"
+}

service/fj_service.go

@@ -30,7 +30,7 @@ import (
 
 //
 // 人员基本信息
-func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
+func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, name string) (string, string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -69,8 +69,8 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	}
 	inputData["certno"] = certNo // 证件号码
 
-	inputData["begntime"] = "" // 开始时间
-	inputData["psn_name"] = "" // 人员姓名
+	inputData["begntime"] = ""   // 开始时间
+	inputData["psn_name"] = name // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 

service/gdyb_service.go

@@ -4591,6 +4591,7 @@ func GetMac() string {
 // 人员基本信息
 func Gdyb1101D(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, psn_name string, record_date string) (string, string) {
 	//生成签名
+	fmt.Println("DDDDD")
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
@@ -4619,7 +4620,7 @@ func Gdyb1101D(certNo string, org_name string, doctor string, fixmedins_code str
 				inputData["psn_cert_type"] = "01"   // 人员证件类型
 
 			} else {
-				inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+				inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 				inputData["card_sn"] = ""           // 卡识别码
 				inputData["certno"] = certNo        // 证件号码
 				inputData["psn_cert_type"] = "01"   // 人员证件类型
@@ -4806,3 +4807,511 @@ func GetSignInInfo(code string) string {
 	err = readDb.Model(&models.HisSignIn{}).Where("fixmedins_code = ? AND status = 1", code).Last(&sign).Error
 	return sign.SignNo
 }
+
+func Gdyb3501(struct3501 models.Struct3501, secret_key string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3501"                                  // 交易编码
+	inputData["med_list_codg"] = struct3501.MedListCodg             // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3501.OrgName         // 定点医药机构目录名称
+	inputData["rx_flag"] = struct3501.RxFlag                        //
+	inputData["invdate"] = struct3501.Invdate                       // 人员编号 （来自1101接口返回）
+	inputData["inv_cnt"] = struct3501.InvCnt                        // 人员编号 （来自1101接口返回）
+	inputData["manu_lotnum"] = struct3501.ManuLotnum                // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
+	inputData["memo"] = ""                                          // 人员编号 （来自1101接口返回）
+	input["invinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3501"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func Gdyb3502(struct3502 models.Struct3502, secret_key string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3502.OrgName, struct3502.Opter, struct3502.FixmedinsCode, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs, struct3502.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3502"                      // 交易编码
+	inputData["med_list_codg"] = struct3502.MedListCodg // 定点医药机构目录编号
+	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
+
+	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3502.OrgName     // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
+	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
+	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
+	inputData["rx_flag"] = struct3502.RxFlag                    //
+
+	inputData["inv_chg_time"] = struct3502.InvChgTime // 人员编号 （来自1101接口返回）
+	inputData["inv_chg_opter_name"] = ""              // 人员编号 （来自1101接口返回）
+	inputData["memo"] = struct3502.Memo               // 人员编号 （来自1101接口返回）
+	inputData["trdn_flag"] = ""                       // 人员编号 （来自1101接口返回）
+
+	input["invinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3502"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func Gdyb3503(struct3503 models.Struct3503, secret_key string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3503.OrgName, struct3503.Opter, struct3503.FixmedinsHilistId, struct3503.InsuplcAdmdvs, struct3503.MdtrtareaAdmvs, struct3503.Cainfo)
+
+	input := make(map[string]interface{})
+
+	inputMessage["infno"] = "3503"
+
+	item := struct3503
+	feedetailInfo := make(map[string]interface{})
+	feedetailInfo["med_list_codg"] = item.MedListCodg
+	feedetailInfo["fixmedins_hilist_id"] = item.FixmedinsHilistId
+	feedetailInfo["fixmedins_hilist_name"] = item.FixmedinsHilistName
+	feedetailInfo["dynt_no"] = ""
+	feedetailInfo["fixmedins_bchno"] = item.FixmedinsBchno         // 人员编号 （来自1101接口返回）
+	feedetailInfo["spler_name"] = item.SplerName                   // 人员编号 （来自1101接口返回）
+	feedetailInfo["spler_pmtno"] = ""                              // 人员编号 （来自1101接口返回）
+	feedetailInfo["manu_lotnum"] = item.ManuLotnum                 // 人员编号 （来自1101接口返回）
+	feedetailInfo["prodentp_name"] = item.ProdentpName             // 人员编号 （来自1101接口返回）
+	feedetailInfo["aprvno"] = item.Aprvno                          // 人员编号 （来自1101接口返回）
+	feedetailInfo["manu_date"] = item.ManuDate                     // 人员编号 （来自1101接口返回）
+	feedetailInfo["expy_end"] = item.ExpyEnd                       // 人员编号 （来自1101接口返回）
+	feedetailInfo["finl_trns_pric"] = item.FinlTrnsPric            // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_retn_cnt"] = item.PurcRetnCnt              // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_invo_codg"] = item.PurcInvoCodg            // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_invo_no"] = item.PurcInvoNo                // 人员编号 （来自1101接口返回）
+	feedetailInfo["rx_flag"] = item.RxFlag                         // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_retn_stoin_time"] = item.PurcRetnStoinTime // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_retn_opter_name"] = item.PurcRetnOpterName // 人员编号 （来自1101接口返回）
+	feedetailInfo["prod_geay_flag"] = ""                           // 人员编号 （来自1101接口返回）
+	feedetailInfo["memo"] = ""                                     // 人员编号 （来自1101接口返回）
+	input["purcinfo"] = feedetailInfo
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3503"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func Gdyb3504(struct3504 models.Struct3504, secret_key string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3504.OrgName, struct3504.Opter, struct3504.FixmedinsCode, struct3504.InsuplcAdmdvs, struct3504.MdtrtareaAdmvs, struct3504.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3504"                                      // 交易编码
+	inputData["med_list_codg"] = struct3504.MedListCodg                 // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3504.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3504.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3504.FixmedinsBchno            // 人员编号 （来自1101接口返回）
+	inputData["spler_name"] = struct3504.SplerName                      // 人员编号 （来自1101接口返回）
+	inputData["spler_pmtno"] = ""                                       // 人员编号 （来自1101接口返回）
+
+	inputData["manu_date"] = struct3504.ManuDate          // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3504.ExpyEnd            // 人员编号 （来自1101接口返回）
+	inputData["finl_trns_pric"] = struct3504.FinlTrnsPric // 人员编号 （来自1101接口返回）
+	inputData["purc_retn_cnt"] = struct3504.PurcRetnCnt   // 人员编号 （来自1101接口返回）
+	inputData["purc_invo_codg"] = struct3504.PurcInvoCodg // 人员编号 （来自1101接口返回）
+	inputData["purc_invo_no"] = struct3504.PurcInvoNo     // 人员编号 （来自1101接口返回）
+	inputData["rx_flag"] = struct3504.RxFlag
+	inputData["purc_retn_stoin_time"] = struct3504.PurcRetnStoin
+	inputData["purc_retn_opter_name"] = struct3504.PurcRetnStoin
+	inputData["memo"] = ""                // 人员编号 （来自1101接口返回）
+	inputData["medins_prod_purc_no"] = "" // 人员编号 （来自1101接口返回）
+	input["purcinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3504"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func Gdyb3505(struct3505 models.Struct3505, secret_key string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3505"                                  // 交易编码
+	inputData["med_list_codg"] = struct3505.MedListCodg             // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3505.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+
+	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）
+	inputData["prsc_dr_certno"] = struct3505.PrscDrCertno      // 人员编号 （来自1101接口返回）
+	inputData["prsc_dr_name"] = struct3505.PrscDrName          // 人员编号 （来自1101接口返回）
+	inputData["phar_cert_type"] = struct3505.PharCertType      // 人员编号 （来自1101接口返回）
+	inputData["phar_certno"] = struct3505.PharCertno           // 人员编号 （来自1101接口返回）
+
+	inputData["phar_name"] = struct3505.PharName               // 人员编号 （来自1101接口返回）
+	inputData["phar_prac_cert_no"] = struct3505.PharPracCertNo // 人员编号 （来自1101接口返回）
+	inputData["hi_feesetl_type"] = struct3505.HiFeesetlType    // 人员编号 （来自1101接口返回）
+	inputData["setl_id"] = struct3505.SetlId                   // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_sn"] = struct3505.MdtrtSn                 // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = struct3505.PsnNo                     // 人员编号 （来自1101接口返回）
+	inputData["psn_cert_type"] = struct3505.PsnCertType        // 人员编号 （来自1101接口返回）
+	inputData["certno"] = struct3505.CertNo                    // 人员编号 （来自1101接口返回）
+	inputData["psn_name"] = struct3505.PsnName                 // 人员编号 （来自1101接口返回）
+	inputData["manu_lotnum"] = struct3505.ManuLotnum           // 人员编号 （来自1101接口返回）
+	inputData["manu_date"] = struct3505.ManuDate               // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3505.ExpyEnd                 // 人员编号 （来自1101接口返回）
+
+	inputData["rx_flag"] = struct3505.RxFlag     // 人员编号 （来自1101接口返回）
+	inputData["trdn_flag"] = struct3505.TrdnFlag // 人员编号 （来自1101接口返回）
+
+	inputData["finl_trns_pric"] = struct3505.FinlTrnsPric // 人员编号 （来自1101接口返回）
+	inputData["rxno"] = struct3505.Rxno                   // 人员编号 （来自1101接口返回）
+	inputData["rx_circ_flag"] = struct3505.RxCircFlag     // 人员编号 （来自1101接口返回）
+
+	inputData["rtal_docno"] = struct3505.RtalDocno // 人员编号 （来自1101接口返回）
+	inputData["stoout_no"] = struct3505.StooutNo   // 人员编号 （来自1101接口返回）
+
+	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
+	inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
+	inputData["drug_prod_barc"] = struct3505.DrugProdBarc          // 人员编号 （来自1101接口返回）
+	inputData["shelf_posi"] = struct3505.ShelfPosi                 // 人员编号 （来自1101接口返回）
+	inputData["sel_retn_cnt"] = struct3505.SelRetnCnt              // 人员编号 （来自1101接口返回）
+	inputData["sel_retn_time"] = struct3505.SelRetnTime            // 人员编号 （来自1101接口返回）
+	inputData["sel_retn_opter_name"] = struct3505.SelRetnOpterName // 人员编号 （来自1101接口返回）
+	inputData["memo"] = struct3505.Memo                            // 人员编号 （来自1101接口返回）
+	input["selinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3505"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func Gdyb3506(struct3506 models.Struct3506, secret_key string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3506.OrgName, struct3506.Opter, struct3506.FixmedinsCode, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3506"                                  // 交易编码
+	inputData["med_list_codg"] = struct3506.MedListCodg             // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3506.FixmedinsHilistId // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3506.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3506.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+
+	inputData["setl_id"] = struct3506.SetlId                       // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = struct3506.PsnNo                         // 人员编号 （来自1101接口返回）
+	inputData["psn_cert_type"] = struct3506.PsnCertType            // 人员编号 （来自1101接口返回）
+	inputData["certno"] = struct3506.Certno                        // 人员编号 （来自1101接口返回）
+	inputData["psn_name"] = struct3506.PsnName                     // 人员编号 （来自1101接口返回）
+	inputData["manu_lotnum"] = struct3506.ManuLotnum               // 人员编号 （来自1101接口返回）
+	inputData["manu_date"] = struct3506.ManuDate                   // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3506.ExpyEnd                     // 人员编号 （来自1101接口返回）
+	inputData["rx_flag"] = struct3506.RxFlag                       // 人员编号 （来自1101接口返回）
+	inputData["trdn_flag"] = struct3506.TrdnFlag                   // 人员编号 （来自1101接口返回）
+	inputData["finl_trns_pric"] = struct3506.FinlTrnsPric          // 人员编号 （来自1101接口返回）
+	inputData["sel_retn_cnt"] = struct3506.SelRetnCnt              // 人员编号 （来自1101接口返回）
+	inputData["sel_retn_time"] = struct3506.SelRetnTime            // 人员编号 （来自1101接口返回）
+	inputData["sel_retn_opter_name"] = struct3506.SelRetnOpterName // 人员编号 （来自1101接口返回）
+	inputData["memo"] = ""                                         // 人员编号 （来自1101接口返回）
+	inputData["medins_prod_sel_no"] = ""                           // 人员编号 （来自1101接口返回）
+
+	input["selinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3506"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func Gdyb3507(struct3507 models.Struct3507, secret_key string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3507.OrgName, struct3507.Opter, struct3507.FixmedinsCode, struct3507.InsuplcAdmdvs, struct3507.MdtrtareaAdmvs, struct3507.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3507"                          // 交易编码
+	inputData["fixmedins_bchno"] = struct3507.FixmedinsCode // 人员编号 （来自1101接口返回）
+	inputData["inv_data_type"] = struct3507.InvDataType     // 人员编号 （来自1101接口返回）
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3507"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}

service/his_service.go

@@ -154,6 +154,7 @@ type Patients struct {
 	IsExcelExport                int64   `gorm:"column:is_excel_export" json:"is_excel_export" form:"is_excel_export"`
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	OutReason                    string  `gorm:"column:out_reason" json:"out_reason" form:"out_reason"`
+	InsuplcAdmdvs                string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (Patients) TableName() string {

service/hn_service.go

@@ -1158,17 +1158,17 @@ func Hnyb3201(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float6
 	inputMessage := SetHnInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3201"                       // 交易编码
-	inputData["insutype"] = insutype                     // 险种
-	inputData["clr_type"] = clr_type                     // 就诊 ID（来自2201接口返回）
-	inputData["setl_optins"] = setl_optins               // 结算经办机构
-	inputData["stmt_begndate"] = stmt_begndate           // 对帐开始时间
-	inputData["stmt_enddate"] = stmt_enddate             //对帐结束时间
-	inputData["medfee_sumamt"] = medfee_sumamt           //医疗费总额
-	inputData["fund_pay_sumamt"] = fund_pay_sumamt       //基金支付总额
-	inputData["acct_pay"] = acct_pay                     //个人账户支付金额
-	inputData["fixmedins_setl_cnt"] = fixmedins_setl_cnt //定点医药机构结算笔数
-	inputData["refd_setl_flag"] = 0                      //
+	inputMessage["infno"] = "3201"                                      // 交易编码
+	inputData["insutype"] = insutype                                    // 险种
+	inputData["clr_type"] = clr_type                                    // 就诊 ID（来自2201接口返回）
+	inputData["setl_optins"] = setl_optins                              // 结算经办机构
+	inputData["stmt_begndate"] = stmt_begndate                          // 对帐开始时间
+	inputData["stmt_enddate"] = stmt_enddate                            //对帐结束时间
+	inputData["medfee_sumamt"] = fmt.Sprintf("%.2f", medfee_sumamt)     //医疗费总额
+	inputData["fund_pay_sumamt"] = fmt.Sprintf("%.2f", fund_pay_sumamt) //基金支付总额
+	inputData["acct_pay"] = fmt.Sprintf("%.2f", acct_pay)               //个人账户支付金额
+	inputData["fixmedins_setl_cnt"] = fixmedins_setl_cnt                //定点医药机构结算笔数
+	inputData["refd_setl_flag"] = 0                                     //
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

service/jsyb_service.go

@@ -1790,7 +1790,6 @@ func Jsyb3502(struct3502 models.Struct3502) (string, string) {
 	return HttpRequest(struct3502.RequestUrl, struct3502.AccessKey, struct3502.SecretKey, timestamp, string(bytesData)), string(bytesData)
 
 }
-
 func Jsyb3503(struct3503 models.Struct3503) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -1980,7 +1979,6 @@ func Jsyb3506(struct3506 models.Struct3506) (string, string) {
 	return HttpRequest(struct3506.RequestUrl, struct3506.AccessKey, struct3506.SecretKey, timestamp, string(bytesData)), string(bytesData)
 
 }
-
 func Jsyb3507(struct3507 models.Struct3507) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文

service/zh_his_service.go

@@ -784,7 +784,8 @@ func ZHGdyb2301A(psnNo string, mdtrtId string, hisPrescription []*models.NewCust
 		feedetailInfo["feedetl_sn"] = item.FeedetlSn
 		feedetailInfo["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
 		feedetailInfo["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
-		feedetailInfo["med_type"] = ""
+		feedetailInfo["med_type"] = med_type
+
 		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
@@ -1502,3 +1503,140 @@ func ZHyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	fmt.Println(str)
 	return str
 }
+
+func ZHyb4102(baseParams models.BaseParams, businessParams models.BusinessParams) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, baseParams.SecretKey)
+	fmt.Println("~~~~~~2")
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4102" // 交易编码
+
+	inputDataDetail := make(map[string]interface{})
+	inputDataDetails := make([]map[string]interface{}, 0)
+
+	inputDataDetail["psn_no"] = businessParams.PsnNo
+	inputDataDetail["setl_id"] = businessParams.SetlId
+	inputDataDetail["stas_type"] = businessParams.StasType
+	inputDataDetails = append(inputDataDetails, inputDataDetail)
+	inputData["stastinfo"] = inputDataDetails
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	//url := gdyb_url + "5203"
+	var url string
+	if baseParams.FixmedinsCode == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "4102"
+	}
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+func ZHyb4103(baseParams models.BaseParams, businessParams models.BusinessParams) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, baseParams.SecretKey)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4103" // 交易编码
+	inputData["psn_no"] = businessParams.PsnNo
+	inputData["setl_id"] = businessParams.SetlId
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	//url := gdyb_url + "5203"
+	var url string
+	if baseParams.FixmedinsCode == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "4103"
+	}
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}