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

controllers/sg/his_api_controller.go

@@ -3668,7 +3668,7 @@ func (c *HisApiController) GetCheckCode() {
 	}
 
 	if config.IsOpen == 1 {
-		result := service.Gdyb3301(baseParams, name, codg, list_type_code)
+		result := service.Gdyb3301(baseParams, name, codg, list_type_code, "", "")
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)

service/gdyb_service.go

@@ -1327,7 +1327,7 @@ func Gdyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
-func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type_code string) string {
+func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_type string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1337,24 +1337,12 @@ func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type
 	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"] = "3301" // 交易编码
-	inputData["fixmedins_hilist_id"] = baseParams.FixmedinsCode
-	inputData["fixmedins_hilist_name"] = baseParams.OrgName
-	inputData["list_type"] = list_type_code
-	inputData["med_list_codg"] = codg
-	inputData["begndate"] = "2021-01-01"
-	inputData["enddate"] = "2099-01-07"
-
-	inputData["aprvno"] = ""
-	inputData["dosform"] = ""
-	inputData["exct_cont"] = ""
-	inputData["item_cont"] = ""
-	inputData["prcunt"] = ""
-	inputData["spec"] = ""
-	inputData["pacspec"] = ""
-	inputData["memo"] = ""
-
-	input["catalogcompin"] = inputData
+	inputMessage["infno"] = "2001" // 交易编码
+	inputData["psn_no"] = psn_no
+	inputData["insutype"] = insutype
+	inputData["med_type"] = med_type
+	inputData["begntime"] = "2021-01-01 00:00:00"
+	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
@@ -1391,7 +1379,8 @@ func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type
 	fmt.Println(str)
 	return str
 }
-func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type_code string) string {
+
+func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type_code string, start_time string, ent_time string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1401,13 +1390,22 @@ func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type
 	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"] = "3302" // 交易编码
-	inputData["fixmedins_hilist_id"] = baseParams.FixmedinsCode
-	inputData["fixmedins_hilist_name"] = baseParams.OrgName
+	inputMessage["infno"] = "3301" // 交易编码
+	inputData["fixmedins_hilist_id"] = codg
+	inputData["fixmedins_hilist_name"] = name
 	inputData["list_type"] = list_type_code
 	inputData["med_list_codg"] = codg
-	inputData["begndate"] = "2021-01-01"
-	inputData["enddate"] = "2099-01-07"
+	inputData["begndate"] = start_time
+	inputData["enddate"] = ent_time
+
+	inputData["aprvno"] = ""
+	inputData["dosform"] = ""
+	inputData["exct_cont"] = ""
+	inputData["item_cont"] = ""
+	inputData["prcunt"] = ""
+	inputData["spec"] = ""
+	inputData["pacspec"] = ""
+	inputData["memo"] = ""
 
 	input["catalogcompin"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -1446,7 +1444,7 @@ func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type
 	fmt.Println(str)
 	return str
 }
-func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_type string) string {
+func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1456,12 +1454,15 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 	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"] = "2001" // 交易编码
-	inputData["psn_no"] = psn_no
-	inputData["insutype"] = insutype
-	inputData["med_type"] = med_type
-	inputData["begntime"] = "2021-01-01 00:00:00"
-	input["data"] = inputData
+	inputMessage["infno"] = "3302" // 交易编码
+	inputData["fixmedins_hilist_id"] = codg
+	inputData["fixmedins_hilist_name"] = name
+	inputData["list_type"] = list_type_code
+	inputData["med_list_codg"] = codg
+	inputData["begndate"] = "2021-01-01"
+	inputData["enddate"] = "2099-01-07"
+
+	input["catalogcompin"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
@@ -1470,7 +1471,7 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3302"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
 	request, err := http.NewRequest("POST", url, reader)
@@ -1498,7 +1499,6 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 	fmt.Println(str)
 	return str
 }
-
 func Gdyb2505(psnNo string, doctor string, org_name string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, start_time string, end_time string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1509,54 +1509,42 @@ func Gdyb2505(psnNo string, doctor string, org_name string, fixmedins_code strin
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-
 	inputMessage["infno"] = "2505"
 	inputData["psn_no"] = psnNo
-	inputData["tel"] = ""
-	inputData["addr"] = ""
 	inputData["biz_appy_type"] = "03"
 	inputData["begndate"] = start_time
 	inputData["enddate"] = end_time
+	inputData["fixmedins_code"] = fixmedins_code
+	inputData["fixmedins_name"] = org_name
+	inputData["tel"] = ""
+	inputData["addr"] = ""
 	inputData["agnter_name"] = ""
 	inputData["agnter_cert_type"] = ""
 	inputData["agnter_certno"] = ""
-
 	inputData["agnter_tel"] = ""
 	inputData["agnter_addr"] = ""
 	inputData["agnter_rlts"] = ""
 	inputData["fix_srt_no"] = ""
-
-	inputData["fixmedins_code"] = fixmedins_code
-	inputData["fixmedins_name"] = org_name
 	inputData["memo"] = ""
-
 	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/2505"
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
 	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", "sg03_prd")
 	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 {
@@ -1577,12 +1565,10 @@ func Gdyb2506(psnNo string, doctor string, org_name string, fixmedins_code strin
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
-
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-
 	inputMessage["infno"] = "2506"
 	inputData["psn_no"] = psnNo
 	inputData["trt_dcla_detl_sn"] = trt_dcla_detl_sn
@@ -1628,86 +1614,6 @@ func Gdyb2506(psnNo string, doctor string, org_name string, fixmedins_code strin
 	fmt.Println(str)
 	return str
 }
-
-//func Gdyb2503(psnNo string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string) string {
-//	// 生成签名
-//	nonce := GetRandomString(32)
-//	timestamp := time.Now().Unix()
-//	signature := setSignature(timestamp, nonce, secret_key)
-//	tempTime := time.Unix(timestamp, 0)
-//	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
-//
-//	// 生成输入报文
-//	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-//	input := make(map[string]interface{})
-//	inputData := make(map[string]interface{})
-//	diseinfo := make([]map[string]interface{}, 0)
-//
-//	inputMessage["infno"] = "2203"        // 交易编码
-//	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
-//	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-//	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
-//	inputData["begntime"] = timeFormatOne // 开始时间
-//	inputData["main_cond_dscr"] = ""      // 主要病情描述
-//	inputData["dise_codg"] = sick_code    // 病种编码
-//	inputData["dise_name"] = sick_name    // 病种名称
-//	inputData["birctrl_type"] = ""        // 计划生育手术类别
-//	inputData["birctrl_matn_date"] = ""   // 计划生育手术或生育日期
-//
-//	diseinfo_sun := make(map[string]interface{})
-//	diseinfo_sun["diag_type"] = "1"           // 诊断类别
-//	diseinfo_sun["diag_srt_no"] = "1"         // 诊断排序号
-//	diseinfo_sun["diag_code"] = diag_code     // 诊断代码
-//	diseinfo_sun["diag_name"] = diag          // 诊断名称
-//	diseinfo_sun["diag_dept"] = department    // 诊断科室
-//	diseinfo_sun["dise_dor_no"] = doctor_id   // 诊断医生编码
-//	diseinfo_sun["dise_dor_name"] = doctor    // 诊断医生姓名
-//	diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
-//	diseinfo_sun["vali_flag"] = "1"           // 有效标志
-//
-//	diseinfo = append(diseinfo, diseinfo_sun)
-//	input["diseinfo"] = diseinfo
-//	input["mdtrtinfo"] = 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/2203"
-//
-//	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
-//	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", "sg03_prd")
-//	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 Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1775,7 +1681,6 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	fmt.Println(str)
 	return str
 }
-
 func Gdyb2504(psnNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, trt_dcla_detl_sn string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1826,6 +1731,86 @@ func Gdyb2504(psnNo string, org_name string, doctor string, fixmedins_code strin
 	return str
 }
 
+//func Gdyb2503(psnNo string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string) string {
+//	// 生成签名
+//	nonce := GetRandomString(32)
+//	timestamp := time.Now().Unix()
+//	signature := setSignature(timestamp, nonce, secret_key)
+//	tempTime := time.Unix(timestamp, 0)
+//	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+//
+//	// 生成输入报文
+//	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+//	input := make(map[string]interface{})
+//	inputData := make(map[string]interface{})
+//	diseinfo := make([]map[string]interface{}, 0)
+//
+//	inputMessage["infno"] = "2203"        // 交易编码
+//	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
+//	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
+//	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
+//	inputData["begntime"] = timeFormatOne // 开始时间
+//	inputData["main_cond_dscr"] = ""      // 主要病情描述
+//	inputData["dise_codg"] = sick_code    // 病种编码
+//	inputData["dise_name"] = sick_name    // 病种名称
+//	inputData["birctrl_type"] = ""        // 计划生育手术类别
+//	inputData["birctrl_matn_date"] = ""   // 计划生育手术或生育日期
+//
+//	diseinfo_sun := make(map[string]interface{})
+//	diseinfo_sun["diag_type"] = "1"           // 诊断类别
+//	diseinfo_sun["diag_srt_no"] = "1"         // 诊断排序号
+//	diseinfo_sun["diag_code"] = diag_code     // 诊断代码
+//	diseinfo_sun["diag_name"] = diag          // 诊断名称
+//	diseinfo_sun["diag_dept"] = department    // 诊断科室
+//	diseinfo_sun["dise_dor_no"] = doctor_id   // 诊断医生编码
+//	diseinfo_sun["dise_dor_name"] = doctor    // 诊断医生姓名
+//	diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
+//	diseinfo_sun["vali_flag"] = "1"           // 有效标志
+//
+//	diseinfo = append(diseinfo, diseinfo_sun)
+//	input["diseinfo"] = diseinfo
+//	input["mdtrtinfo"] = 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/2203"
+//
+//	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
+//	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", "sg03_prd")
+//	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 Gdyb5301(psnNo string, insutype string, org_name string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)