Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/gdyb_controller.go

@@ -200,6 +200,21 @@ func (c *GdybController) PostFive() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
+	fmt.Println(respJSON["psn_no"].(string))
+	fmt.Println(respJSON["mdtrt_id"].(string))
+
+	fmt.Println(respJSON["chrg_bchno"].(string))
+	fmt.Println(respJSON["org_name"].(string))
+	fmt.Println(respJSON["doctor"].(string))
+	fmt.Println(respJSON["dept"].(string))
+
+	fmt.Println(respJSON["fixmedins_code"].(string))
+	fmt.Println(respJSON["dept_code"].(string))
+	fmt.Println(respJSON["doctor_id"].(string))
+
+	fmt.Println(respJSON["insuplc_admdvs"].(string))
+	fmt.Println(respJSON["mdtrtarea_admvs"].(string))
+	fmt.Println(respJSON["secret_key"].(string))
 
 	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
 		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string))

controllers/his_api_controller.go

@@ -1621,7 +1621,9 @@ func (c *HisApiController) GetUploadInfo() {
 	data["chrg_bchno"] = chrg_bchno
 	data["org_name"] = miConfig.OrgName
 	data["doctor"] = patientPrescription.Doctor
-	data["dept"] = patientPrescription.Departments
+	data["doctor_id"] = patientPrescription.DoctorId
+
+	data["dept"] = strconv.FormatInt(patientPrescription.Departments, 10)
 
 	data["fixmedins_code"] = miConfig.Code
 	data["dept_code"] = department.Number
@@ -1629,6 +1631,21 @@ func (c *HisApiController) GetUploadInfo() {
 	data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 	data["secret_key"] = miConfig.SecretKey
 
+	fmt.Println(his.PsnNo)
+	fmt.Println(his.Number)
+
+	fmt.Println(miConfig.OrgName)
+
+	fmt.Println(chrg_bchno)
+	fmt.Println(patientPrescription.Doctor)
+	fmt.Println(miConfig.Code)
+	fmt.Println(department.Number)
+	fmt.Println(strconv.FormatInt(patientPrescription.Departments, 10))
+
+	fmt.Println(miConfig.InsuplcAdmdvs)
+	fmt.Println(miConfig.MdtrtareaAdmvs)
+	fmt.Println(miConfig.SecretKey)
+
 	var ids []int64
 	//var idsTwo []int64
 	//