777

controllers/sg/his_api_controller.go

@@ -5867,6 +5867,11 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 		struct3505.PharName = "廖志平"
 		struct3505.PharPracCertNo = "0136425"
 	}
+
+	if org_id == 10387 {
+		struct3505.PharName = "易圣"
+		struct3505.PharPracCertNo = "D430726002209"
+	}
 	order := service.GetHisOrderByNumber(pre.BatchNumber)
 	struct3505.SetlId = order.SetlId
 	struct3505.MdtrtSn = order.MdtrtId
@@ -6005,6 +6010,9 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 		result, _ := json.Marshal(respJSON)
 		return string(result), ""
 
+	} else if miConfig.MdtrtareaAdmvs == "430800" {
+		result1, result2 := service.Hnyb3505(struct3505)
+		return result1, result2
 	} else {
 		data := make(map[string]interface{})
 		data["struct_3505s"] = struct3505
@@ -32346,7 +32354,7 @@ func (c *HisApiController) GetUploadInfo() {
 				}
 			}
 
-			if res.Infcode == -1 {
+			if res.Infcode != 0 {
 				errlog := &models.HisOrderError{
 					UserOrgId:  adminUser.CurrentOrgId,
 					Ctime:      time.Now().Unix(),

service/hn_service.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	"gdyb/utils/csbhttp"
+	"strings"
 
 	//"net/http"
 	"strconv"
@@ -65,7 +66,7 @@ func Hnyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "1101"), inputLog
 }
 
-//人员基本信息版本2
+// 人员基本信息版本2
 func Hnybyb1101A(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, request_url string, access_key string, pBusiCardInfo string, id_card_no string, cainfo string) (string, string) {
 	timestamp := time.Now().Unix()
 	//生成输入报文
@@ -195,10 +196,10 @@ func Hnyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	inputMessage := SetHnInputMessage(timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "2201"        // 交易编码
-	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["insutype"] = insutype      // 险种类型（来自1101接口返回）
-	inputData["begntime"] = begin // 开始时间
+	inputMessage["infno"] = "2201"   // 交易编码
+	inputData["psn_no"] = psnNo      // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype // 险种类型（来自1101接口返回）
+	inputData["begntime"] = begin    // 开始时间
 
 	if id_card_type == 1 {
 		inputData["mdtrt_cert_type"] = "03"        // 就诊凭证类型
@@ -342,7 +343,7 @@ func Hnyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 }
 
 // 门诊就诊信息上传
-func Hnyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, request_url string, access_key string, cainfo string,begin_time string) (string, string) {
+func Hnyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, request_url string, access_key string, cainfo string, begin_time string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -358,10 +359,10 @@ func Hnyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 		med_type = "11"
 	}
 
-	inputMessage["infno"] = "2203"        // 交易编码
-	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
-	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
+	inputMessage["infno"] = "2203"     // 交易编码
+	inputData["mdtrt_id"] = mdtrtId    // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo        // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type   // 医疗类别 16门诊特殊病
 	inputData["begntime"] = begin_time // 开始时间
 
 	inputData["main_cond_dscr"] = ""    // 主要病情描述
@@ -405,7 +406,7 @@ func Hnyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2203"), requestLog
 }
 
-//  门诊费用明细信息上传
+// 门诊费用明细信息上传
 func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, diag_code string, request_url string, access_key string, new_doctor_name string, time_stamp_2203 string, cainfo string) (string, string) {
 	// 生成签名
 	//timestamp := time.Now().Unix()
@@ -413,7 +414,6 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 	timestamp2 := time.Now().Unix()
 
-
 	var customs []*Custom
 	for _, item := range hisPrescription {
 		//tm := time.Unix(item.PreTime, 0)
@@ -537,7 +537,7 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
 		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
-		feedetailInfo["medins_list_codg"] =  item.MedListCodg          // 医药机构目录编码
+		feedetailInfo["medins_list_codg"] = item.MedListCodg         // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
 		feedetailInfo["cnt"] = item.Cut                              // 数量
 		feedetailInfo["pric"] = item.Price                           // 单价
@@ -602,7 +602,7 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	return HNHttpRequest(request_url, access_key, secret_key, timestamp5, string(bytesData), "2204"), requestLog
 }
 
-//  门诊费用明细信息撤销
+// 门诊费用明细信息撤销
 func Hnyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, request_url string, access_key string, cainfo string) (string, string) {
 
 	timestamp := time.Now().Unix()
@@ -637,7 +637,7 @@ func Hnyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2205"), requestLog
 }
 
-//  门诊预结算
+// 门诊预结算
 func Hnyb2206(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, request_url string, access_key string, verify_number string, cainfo string, acct_used_flag string) (string, string) {
 
 	// 生成签名
@@ -707,7 +707,7 @@ func Hnyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 }
 
-//  门诊预结算
+// 门诊预结算
 func Hnyb2206Two(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, request_url string, access_key string, verify_number string, cainfo string, card_sn string, acct_used_flag string) (string, string) {
 
 	// 生成签名
@@ -778,7 +778,7 @@ func Hnyb2206Two(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 
 }
 
-//  门诊结算
+// 门诊结算
 func Hnyb2207(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, acct_used_flag string, request_url string, access_key string, verify_number string, cainfo string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
@@ -845,7 +845,7 @@ func Hnyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 }
 
-//  门诊结算
+// 门诊结算
 func Hnyb2207Two(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, acct_used_flag string, request_url string, access_key string, verify_number string, cainfo string, card_sn string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
@@ -978,7 +978,7 @@ func Hnyb2207A(psnNo string, mdtrtId string, chrgBchno string, certNo string, in
 
 }
 
-//  门诊结算撤销
+// 门诊结算撤销
 func Hnyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, cainfo string) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -1033,7 +1033,7 @@ func Hnyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	return HNHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp2, string(bytesData), "5203"), string(bytesData)
 }
 
-//CBS总线
+// CBS总线
 func HNHttpRequest(url string, ak string, sk string, timestamp int64, json string, infno string) string {
 	fmt.Println(url)
 	//step 1. 设置请求参数
@@ -1638,7 +1638,7 @@ func Hnyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
 	inputData["ipt_med_type"] = struct4101.IptMedType         // 住院医疗类型  必填
 	inputData["adm_way"] = ""                                 // 入院途径  必填
-	inputData["trt_type"] = "10"                                // 治疗类别  必填
+	inputData["trt_type"] = "10"                              // 治疗类别  必填
 	inputData["adm_time"] = struct4101.AdmTime                // 入院时间  必填
 	inputData["adm_caty"] = struct4101.AdmCaty                // 入院科别  必填
 	inputData["refldept_dept"] = ""                           // 转科科别  必填
@@ -1916,14 +1916,14 @@ func Hnyb3504(struct3504 models.Struct3504) (string, string) {
 func Hnyb3505(struct3505 models.Struct3505) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetHnInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsCode, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
+	inputMessage := SetHnInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.Code, 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.FixmedinsCode // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3505.OrgName     // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3505.FixmedinsCode     // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "3505"                                      // 交易编码
+	inputData["med_list_codg"] = struct3505.MedListCodg                 // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3505.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3505.FixmedinsCode             // 人员编号 （来自1101接口返回）
 
 	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）
 	inputData["prsc_dr_certno"] = struct3505.PrscDrCertno      // 人员编号 （来自1101接口返回）
@@ -1951,17 +1951,30 @@ func Hnyb3505(struct3505 models.Struct3505) (string, string) {
 	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["rtal_docno"] = struct3505.RtalDocno          // 人员编号 （来自1101接口返回）
+	inputData["stoout_no"] = struct3505.StooutNo            // 人员编号 （来自1101接口返回）
+	inputData["MDTRT_SETL_TYPE"] = struct3505.MdtrtSetlType // 人员编号 （来自1101接口返回）
 
 	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
-	inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
+	inputData["drug_trac_codg"] = "--"                             // 人员编号 （来自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接口返回）
+	feedetail := make([]map[string]interface{}, 0)
+
+	codes := strings.Split(struct3505.DrugTracCodg, ",")
+	for _, item := range codes {
+		if len(item) > 0 {
+
+			druginputData := make(map[string]interface{})
+			druginputData["drug_trac_codg"] = removeNonDigits(item)
+			feedetail = append(feedetail, druginputData)
+		}
+	}
+	inputData["drugtracinfo"] = feedetail
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -1975,6 +1988,7 @@ func Hnyb3505(struct3505 models.Struct3505) (string, string) {
 	return HNHttpRequest(struct3505.RequestUrl, struct3505.AccessKey, struct3505.SecretKey, timestamp, string(bytesData), "3505"), string(bytesData)
 
 }
+
 func Hnyb3506(struct3506 models.Struct3506) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -2042,9 +2056,7 @@ func Hnyb3507(struct3507 models.Struct3507) (string, string) {
 
 }
 
-
-
-func Hnyb3301(org_name string,opera string,fixmedins_code string,insuplc_admdvs string,mdtrtarea_admvs string,cainfo string, name string, codg string, list_type string,start_time string, ent_time string, request_url string,access_key string,secret_key string) (string,string) {
+func Hnyb3301(org_name string, opera string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, cainfo string, name string, codg string, list_type string, start_time string, ent_time string, request_url string, access_key string, secret_key string) (string, string) {
 	// 生成签名
 	//nonce := GetRandomString(32)
 	// 生成签名
@@ -2082,7 +2094,7 @@ func Hnyb3301(org_name string,opera string,fixmedins_code string,insuplc_admdvs
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error(),""
+		return err.Error(), ""
 	}
 
 	request_url = request_url + "3301"
@@ -2090,7 +2102,7 @@ func Hnyb3301(org_name string,opera string,fixmedins_code string,insuplc_admdvs
 	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "3301"), string(bytesData)
 
 }
-func Hnyb3302(org_name string,opera string,fixmedins_code string,insuplc_admdvs string,mdtrtarea_admvs string,cainfo string, name string, codg string, list_type string,start_time string, ent_time string, request_url string,access_key string,secret_key string) (string,string) {
+func Hnyb3302(org_name string, opera string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, cainfo string, name string, codg string, list_type string, start_time string, ent_time string, request_url string, access_key string, secret_key string) (string, string) {
 	// 生成签名
 	//nonce := GetRandomString(32)
 	// 生成签名
@@ -2116,7 +2128,7 @@ func Hnyb3302(org_name string,opera string,fixmedins_code string,insuplc_admdvs
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error(),""
+		return err.Error(), ""
 	}
 
 	request_url = request_url + "3302"