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

controllers/js/jsyb_controller.go

@@ -29,6 +29,7 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/1101D", &JSybController{}, "get:PostOneD")
 
 	beego.Router("/jsyb/1101c", &JSybController{}, "get:PostOnec")
+	beego.Router("/jsyb/2201c", &JSybController{}, "get:Posttwoc")
 
 	beego.Router("/jsyb/2201", &JSybController{}, "get:PostTwo")
 	beego.Router("/jsyb/2202", &JSybController{}, "get:PostThree")
@@ -56,6 +57,11 @@ func (c *JSybController) PostOnec() {
 	fmt.Println(result)
 	fmt.Println(inputLog)
 
+}
+func (c *JSybController) Posttwoc() {
+	result, request_log := service.Jsyb2201F()
+	saveJsLog(result, request_log, "2201", "挂号", "盐城响水悦达血液透析中心有限公司")
+
 }
 func (c *JSybController) Get5301() {
 	psn_no := c.GetString("psn_no")

controllers/sg/his_api_controller.go

@@ -8645,12 +8645,9 @@ func (c *HisApiController) GetSettleAccounts() {
 	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
 	orderInfos = append(orderInfos, orderInfos_two...)
 	his_hospital, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
-
 	//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
-
 	diagnosis_ids := strings.Split(his.Diagnosis, ",")
 	patient, _ := service.GetPatientByIDTwo(adminUser.CurrentOrgId, order.PatientId)
-
 	//var config []*models.HisXtDiagnoseConfig
 	var name string
 	for _, item := range diagnosis_ids {

service/jsyb_service.go

@@ -13,6 +13,62 @@ import (
 	"time"
 )
 
+func Jsyb2201F() (string, string) {
+
+	// 生成签名
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, "盐城响水悦达血液透析中心有限公司", "王曙光", "H32092103007", "320921", "320921", "04aaa201baecc02c5f5e67d123810f2442dc04444e60a95ce529708bef8143f2fd3c5af38e21cccf9377c0ae3eef0a05528321f6265101a324802581709e2cdc297d94a3b176ed4112c8bc435d4f4362948720ea989bc58399fd251dd49b41d03356a1b99b6fd2c0bef2c6a2c970b03de9e3ce33499cc52b0c98a508d1eca0e104")
+
+	//inputMessage := Se/**/tJSInputMessage(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"] = ""              // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = ""            // 险种类型（来自1101接口返回）
+	inputData["begntime"] = timeFormatOne // 开始时间
+	//
+	//if id_card_type == 1 {
+	//	inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
+	//	inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+	//} else if id_card_type == 3 {
+	//	inputData["mdtrt_cert_type"] = "04"                                     // 就诊凭证类型
+	//	inputData["mdtrt_cert_no"] = "320822197705194836" + "｜" + verify_number // 就诊凭证编号
+	//} else {
+	//	inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
+	//	inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+	//
+	//}
+	inputData["mdtrt_cert_type"] = "04"                                                                                                                                                                        // 就诊凭证类型
+	inputData["mdtrt_cert_no"] = "320822197705194836|Y9gJ7nijh+DzGkn2W8El9YxSR0x1/zb2+tcA4a5fsVC4RLNACwi93U4Q9xEJVKKnN6LCbomuiCuxDOI+Skz/wsjlScPKIzyXxBcKl9ZrZjCrr+cRTRRKRdz6JqhoexGR/Cxnipr62JOW2fmrI1X2XA==" // 就诊凭证编号
+
+	inputData["ipt_otp_no"] = ""   // 住院/门诊号
+	inputData["atddr_no"] = "2484" // 医师编码
+	inputData["dr_name"] = "王曙光"   // 医师姓名
+	inputData["dept_code"] = "01"  // 科室编码
+	inputData["dept_name"] = "血透室" // 科室名称
+	inputData["caty"] = "A03.06"   // 科别
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var requestLog string
+	bytesData, err := json.Marshal(inputMessage)
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url := "http://10.72.3.87:8086/CSB/" + "2201"
+	//request_url = request_url + "2201"
+	return HttpRequest(request_url, "1781ce9fb73a478289326c16ba8bf2c4", "b5DPOGjc08DAAMJ8FP31pwwNHKo=", timestamp, string(bytesData)), requestLog
+
+}
+
 func Jsyb1101F() (string, string) {
 	timestamp := time.Now().Unix()
 	//生成输入报文
@@ -22,14 +78,14 @@ func Jsyb1101F() (string, string) {
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101" // 交易编码
 
-	inputData["mdtrt_cert_type"] = "04" // 就诊凭证类型
-	inputData["card_sn"] = ""           // 卡识别码
-	inputData["certno"] = ""            // 证件号码
-	inputData["psn_cert_type"] = "01"   // 人员证件类型
+	inputData["mdtrt_cert_type"] = "04"                                                                                                                                                                        // 就诊凭证类型
+	inputData["card_sn"] = ""                                                                                                                                                                                  // 卡识别码
+	inputData["certno"] = ""                                                                                                                                                                                   // 证件号码
+	inputData["psn_cert_type"] = "01"                                                                                                                                                                          // 人员证件类型
+	inputData["mdtrt_cert_no"] = "320822197705194836|Y9gJ7nijh+DzGkn2W8El9YxSR0x1/zb2+tcA4a5fsVC4RLNACwi93U4Q9xEJVKKnN6LCbomuiCuxDOI+Skz/wsjlScPKIzyXxBcKl9ZrZjCrr+cRTRRKRdz6JqhoexGR/Cxnipr62JOW2fmrI1X2XA==" // 就诊凭证编号
 
-	inputData["mdtrt_cert_no"] = "320921199403174643|htZFk55/v/xL29N8OePdXiFwxD25jY95CcgKpr0hSo4jsRQaLMZl32ehTt83SzEkKyqo43xv1d900GnnTd/vqsjlScPKIzyXxBcKl9ZrZjBQSpH7ybGOO6nwjnfMQ01O/Cxnipr62JOW2fmrI1X2XA==" // 就诊凭证编号
-	inputData["begntime"] = ""                                                                                                                                                                                 // 开始时间
-	inputData["psn_name"] = ""                                                                                                                                                                                 // 人员姓名
+	inputData["begntime"] = "" // 开始时间
+	inputData["psn_name"] = "" // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -195,8 +251,8 @@ func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 	} else if id_card_type == 3 {
-		inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "04"                                     // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = "320822197705194836" + "｜" + verify_number // 就诊凭证编号
 	} else {
 		inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号