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

controllers/js/jsyb_controller.go

@@ -33,9 +33,46 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/2207", &JSybController{}, "get:PostEight")
 	beego.Router("/jsyb/2208", &JSybController{}, "get:PostNine")
 	beego.Router("/jsyb/5203", &JSybController{}, "get:PostTen")
+	beego.Router("/jsyb/5301", &JSybController{}, "get:Get5301")
+
+	//beego.Router("/jsyb/2503", &JSybController{}, "get:Get2503")
+
 	beego.Router("/jsyb/readcard", &JSybController{}, "get:ReadCard")
 
 }
+func (c *JSybController) Get5301() {
+	psn_no := c.GetString("psn_no")
+	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")
+	url := c.GetString("url")
+	ak := c.GetString("ak")
+
+	result, inputLog := service.Jsyb5301(psn_no, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak)
+	fmt.Println(result)
+	fmt.Println(inputLog)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(inputLog), &dat2); err == nil {
+
+	} else {
+
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+		"log": dat2,
+	})
+}
 
 func (c *JSybController) PostOne() {
 	certNo := c.GetString("cert_no")
@@ -478,6 +515,27 @@ func (c *JSybController) PostTen() {
 	})
 }
 
+func (c *JSybController) Get2503() {
+	psnNo := c.GetString("psn_no")
+	insutype := c.GetString("insutype")
+	sick_code := c.GetString("sick_code")
+	sick_name := c.GetString("sick_name")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	access_key := c.GetString("access_key")
+	fixmedins_code := c.GetString("fixmedins_code")
+	org_name := c.GetString("org_name")
+	check_time := c.GetString("check_time")
+	doctor_id := c.GetString("doctor_id")
+	doctor := c.GetString("doctor")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	url := c.GetString("url")
+	service.Jsyb2503(psnNo, insutype, org_name, doctor, fixmedins_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_name, sick_code, start_time, end_time, check_time, url, access_key)
+
+}
+
 func (c *JSybController) ReadCard() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")

controllers/sg/his_api_controller.go

@@ -77,6 +77,8 @@ func HisManagerApiRegistRouters() {
 }
 func (c *HisApiController) GetPsnNcdsInfo() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	patient_id, _ := c.GetInt64("patient_id")
+
 	id, _ := c.GetInt64("id")
 	adminUser := c.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
@@ -102,25 +104,66 @@ func (c *HisApiController) GetPsnNcdsInfo() {
 	var res Result5301
 	var res10265 Result5301For10265
 
-	if miConfig.Code == "H15049901371" {
-		if err := json.Unmarshal(userJSONBytes, &res10265); err != nil {
+	if miConfig.MdtrtareaAdmvs == "32091" {
+		psn_info, _ := service.GetPsnByPatientId(patient_id)
+		api := "http://192.168.3.111:9532/" + "jsyb/5301?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.ChannelNumber + "&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&psn_no=" + psn_info.PsnNo
+
+		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)
+		if err := json.Unmarshal([]byte(result), &res10265); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-		res.InfRefmsgid = res10265.InfRefmsgid
-		res.Output = res10265.Output
 		res.ErrMsg = res10265.ErrMsg
+		res.Output = res10265.Output
+		res.InfRefmsgid = res10265.InfRefmsgid
 		infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
 		res.Infcode = infocode
+
 	} else {
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal(userJSONBytes, &res10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			res.InfRefmsgid = res10265.InfRefmsgid
+			res.Output = res10265.Output
+			res.ErrMsg = res10265.ErrMsg
+			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+			res.Infcode = infocode
+		} else {
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		}
 
 	}
+
 	if res.Infcode == 0 {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"result": res.Output.Result,
@@ -3527,6 +3570,25 @@ func (c *HisApiController) GetUploadInfo() {
 
 		} else if miConfig.MdtrtareaAdmvs == "320921" {
 
+			//江苏地区国家医保医疗类别
+			//职工透析：医疗类别选特殊情况门诊9933
+			//居民血透门慢： 医疗类别选门诊慢病1402
+			var med_type string
+			if his.Insutype == "310" {
+				if reg_type == 14 {
+					med_type = "9933"
+				} else if reg_type == 11 {
+					med_type = "11"
+
+				}
+			} else if his.Insutype == "390" {
+				if reg_type == 14 {
+					med_type = "1402"
+				} else if reg_type == 11 {
+					med_type = "11"
+				}
+			}
+
 			data := make(map[string]interface{})
 			client := &http.Client{}
 			data["psn_no"] = his.PsnNo
@@ -3534,7 +3596,7 @@ func (c *HisApiController) GetUploadInfo() {
 			data["doctor"] = roles.UserName
 			data["department"] = department.Name
 			data["org_name"] = miConfig.OrgName
-			data["med_type"] = strconv.FormatInt(reg_type, 10)
+			data["med_type"] = med_type
 			data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
 			data["fixmedins_code"] = miConfig.Code
 			data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
@@ -4136,6 +4198,24 @@ func (c *HisApiController) GetUploadInfo() {
 								cert_no = bas[1]
 							}
 
+							//江苏地区国家医保医疗类别
+							//职工透析：医疗类别选特殊情况门诊9933
+							//居民血透门慢： 医疗类别选门诊慢病1402
+							var med_type string
+							if his.Insutype == "310" {
+								if reg_type == 14 {
+									med_type = "9933"
+								} else if reg_type == 11 {
+									med_type = "11"
+
+								}
+							} else if his.Insutype == "390" {
+								if reg_type == 14 {
+									med_type = "1402"
+								} else if reg_type == 11 {
+									med_type = "11"
+								}
+							}
 							//psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
 							api := "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
@@ -4144,7 +4224,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + med_type + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -4500,13 +4580,32 @@ func (c *HisApiController) GetUploadInfo() {
 					cert_no = bas[1]
 				}
 
+				//江苏地区国家医保医疗类别
+				//职工透析：医疗类别选特殊情况门诊9933
+				//居民血透门慢： 医疗类别选门诊慢病1402
+				var med_type string
+				if his.Insutype == "310" {
+					if reg_type == 14 {
+						med_type = "9933"
+					} else if reg_type == 11 {
+						med_type = "11"
+
+					}
+				} else if his.Insutype == "390" {
+					if reg_type == 14 {
+						med_type = "1402"
+					} else if reg_type == 11 {
+						med_type = "11"
+					}
+				}
+
 				api := "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 					his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 					"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + med_type + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -5336,6 +5435,25 @@ func (c *HisApiController) GetPreUploadInfo() {
 		}
 
 	} else if miConfig.InsuplcAdmdvs == "320921" {
+		//江苏地区国家医保医疗类别
+		//职工透析：医疗类别选特殊情况门诊9933
+		//居民血透门慢： 医疗类别选门诊慢病1402
+		var med_type string
+		if his.Insutype == "310" {
+			if reg_type == 14 {
+				med_type = "9933"
+			} else if reg_type == 11 {
+				med_type = "11"
+
+			}
+		} else if his.Insutype == "390" {
+			if reg_type == 14 {
+				med_type = "1402"
+			} else if reg_type == 11 {
+				med_type = "11"
+			}
+		}
+
 		data := make(map[string]interface{})
 		client := &http.Client{}
 		data["psn_no"] = his.PsnNo
@@ -5343,7 +5461,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["doctor"] = roles.UserName
 		data["department"] = department.Name
 		data["org_name"] = miConfig.OrgName
-		data["med_type"] = strconv.FormatInt(reg_type, 10)
+		data["med_type"] = med_type
 		data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
 		data["fixmedins_code"] = miConfig.Code
 		data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
@@ -5885,13 +6003,32 @@ func (c *HisApiController) GetPreUploadInfo() {
 						} else {
 							cert_no = bas[1]
 						}
+						//江苏地区国家医保医疗类别
+						//职工透析：医疗类别选特殊情况门诊9933
+						//居民血透门慢： 医疗类别选门诊慢病1402
+						var med_type string
+						if his.Insutype == "310" {
+							if reg_type == 14 {
+								med_type = "9933"
+							} else if reg_type == 11 {
+								med_type = "11"
+
+							}
+						} else if his.Insutype == "390" {
+							if reg_type == 14 {
+								med_type = "1402"
+							} else if reg_type == 11 {
+								med_type = "11"
+							}
+						}
+
 						api := "http://192.168.3.111:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 							his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 							"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 							"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 							"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 							"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-							"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+							"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + med_type + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
 						resp, requestErr := http.Get(api)
 						if requestErr != nil {
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -8687,11 +8824,37 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 	doctor, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
 
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
-	result, _ := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", "0", patient.Name)
 	var res ResultTwo
 	var res10265 ResultTwo10265
+	if miConfig.MdtrtareaAdmvs == "320921" {
+		psn_info, _ := service.GetPsnByPatientId(patient.ID)
+		api := "http://192.168.3.111:9532/" + "hbyb/1101?cert_no=" + "" +
+			"&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(3, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(1, 10) + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
+		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))
 
-	if miConfig.Code == "H15049901371" {
 		if err := json.Unmarshal([]byte(result), &res10265); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -8704,12 +8867,28 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 		res.InfRefmsgid = res10265.InfRefmsgid
 
 	} else {
-		if err := json.Unmarshal([]byte(result), &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		result, _ := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", "0", patient.Name)
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			res.ErrMsg = res10265.ErrMsg
+			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+			res.Infcode = infocode
+			res.Output = res10265.Output
+			res.InfRefmsgid = res10265.InfRefmsgid
+		} else {
+			if err := json.Unmarshal([]byte(result), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		}
+
 	}
+
 	Iinfos, _ := json.Marshal(res.Output.Iinfo)
 	infoStr := string(Iinfos)
 	var rf []*ResultFive
@@ -8770,36 +8949,37 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 		}
 	}
 	fmt.Println(insuplc_admdvs)
-
+	var res2 ResultThirteen
+	var res10265_2 ResultThirteen10265
 	if config.IsOpen == 1 {
-		result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.ContentCode, start_time, end_time, check_time)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
-		userJSONBytes, _ := json.Marshal(dat)
-		var res2 ResultThirteen
-		var res10265 ResultThirteen10265
-
-		if miConfig.Code == "H15049901371" {
-			if err := json.Unmarshal(userJSONBytes, &res10265); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			res2.ErrMsg = res10265.ErrMsg
-			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
-			res2.Infcode = infocode
-			res2.Output = res10265.Output
-			res2.InfRefmsgid = res10265.InfRefmsgid
+		if miConfig.MdtrtareaAdmvs == "320921" {
 
 		} else {
-			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+			result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.ContentCode, start_time, end_time, check_time)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			userJSONBytes, _ := json.Marshal(dat)
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes, &res10265_2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res2.ErrMsg = res10265_2.ErrMsg
+				infocode, _ := strconv.ParseInt(res10265_2.Infcode, 10, 64)
+				res2.Infcode = infocode
+				res2.Output = res10265_2.Output
+				res2.InfRefmsgid = res10265_2.InfRefmsgid
+			} else {
+				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			}
 		}
 

service/jsyb_service.go

@@ -831,3 +831,67 @@ func SetJSInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 	inputMessage["sign_no"] = "" //交易签到流水号
 	return inputMessage
 }
+
+func Jsyb5301(psnNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, request_url string, access_key string) (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")
+
+	//timeFormatTwo := tempTime.Format("2006-01-02")
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "5301" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自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(), ""
+	}
+
+	request_url = request_url + "5301"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+
+}
+
+func Jsyb2503(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, start_time string, end_time string, check_time string, request_url string, access_key string) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2503"                 // 交易编码
+	inputData["psn_no"] = psnNo                    // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype               // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_code"] = sick_code        // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_name"] = sick_name        // 险种类型（来自1101接口返回）
+	inputData["insu_optins"] = insuplc_admdvs      // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_no"] = fixmedins_code // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_name"] = org_name     // 险种类型（来自1101接口返回）
+	inputData["hosp_ide_date"] = check_time        // 险种类型（来自1101接口返回）
+	inputData["diag_dr_codg"] = doctor_id          // 开始时间
+	inputData["diag_dr_name"] = doctor             // 开始时间
+	inputData["begndate"] = start_time             // 医师编码
+	inputData["tel"] = ""                          // 医师编码
+	inputData["addr"] = ""                         // 医师编码
+	inputData["enddate"] = end_time                // 医师编码
+
+	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(), ""
+	}
+	request_url = request_url + "2503"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+}