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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10191
+org_id = 10217
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -5759,6 +5759,9 @@ func (c *HisApiController) GetUploadInfo() {
 			infocode, _ := strconv.ParseInt(ressix10265.Infcode, 10, 64)
 			res2.Infcode = infocode
 
+		} else if miConfig.MdtrtareaAdmvs == "350500" {
+			result, requestLog = service.FJyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time, doctor_info.UserName, roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+
 		} else {
 			if miConfig.MdtrtareaAdmvs == "440781" { //
 				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
@@ -5995,6 +5998,10 @@ func (c *HisApiController) GetUploadInfo() {
 					infocode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
 					res.Infcode = infocode
 
+				} else if miConfig.MdtrtareaAdmvs == "350500" {
+
+					result, request_log := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), patientPrescription.DoctorId, sickConfig.CountryCode)
+
 				} else {
 
 					if miConfig.Code == "H15049901371" {

service/fj_service.go

@@ -175,16 +175,12 @@ func FJyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2202", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
-
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
-
+	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	fmt.Println("输出信息:")
+	fmt.Println(output)
+	fmt.Println("错误信息：")
+	fmt.Println(err_msg)
+	return ConvertToString(output, "gbk", "utf-8"), requestLog
 }
 
 // 门诊就诊信息上传
@@ -251,16 +247,12 @@ func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
-
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
-
+	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	fmt.Println("输出信息:")
+	fmt.Println(output)
+	fmt.Println("错误信息：")
+	fmt.Println(err_msg)
+	return ConvertToString(output, "gbk", "utf-8"), requestLog
 }
 
 //  门诊费用明细信息上传
@@ -472,16 +464,12 @@ func FJyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2205", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
-
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
-
+	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	fmt.Println("输出信息:")
+	fmt.Println(output)
+	fmt.Println("错误信息：")
+	fmt.Println(err_msg)
+	return ConvertToString(output, "gbk", "utf-8"), requestLog
 }
 
 //  门诊预结算
@@ -549,16 +537,12 @@ func FJyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2206", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
-
-	return ConvertToString(string(out), "gbk", "utf-8"), requestLog
-
+	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	fmt.Println("输出信息:")
+	fmt.Println(output)
+	fmt.Println("错误信息：")
+	fmt.Println(err_msg)
+	return ConvertToString(output, "gbk", "utf-8"), requestLog
 }
 
 //  门诊结算
@@ -622,17 +606,12 @@ func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2207", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	mjson, _ := json.Marshal(inputMessage)
-	str2 := string(mjson)
-	fmt.Println(string(out))
-
-	return ConvertToString(string(out), "gbk", "utf-8"), str2
+	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	fmt.Println("输出信息:")
+	fmt.Println(output)
+	fmt.Println("错误信息：")
+	fmt.Println(err_msg)
+	return ConvertToString(output, "gbk", "utf-8"), string(bytesData)
 
 }
 
@@ -664,17 +643,12 @@ func FJyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 		return err.Error(), ""
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2208", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	mjson, _ := json.Marshal(inputMessage)
-	str2 := string(mjson)
-	fmt.Println(string(out))
-
-	return ConvertToString(string(out), "gbk", "utf-8"), str2
+	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	fmt.Println("输出信息:")
+	fmt.Println(output)
+	fmt.Println("错误信息：")
+	fmt.Println(err_msg)
+	return ConvertToString(output, "gbk", "utf-8"), string(bytesData)
 
 }
 
@@ -704,17 +678,12 @@ func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2208", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	//mjson, _ := json.Marshal(inputMessage)
-	//str2 := string(mjson)
-	fmt.Println(string(out))
-
-	return ConvertToString(string(out), "gbk", "utf-8")
+	output, err_msg := GetFjBusinessHandleInfo(bytesData)
+	fmt.Println("输出信息:")
+	fmt.Println(output)
+	fmt.Println("错误信息：")
+	fmt.Println(err_msg)
+	return ConvertToString(output, "gbk", "utf-8")
 }
 
 //确认订单

service/jsyb_service.go

@@ -245,7 +245,7 @@ func Jsyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 
 	inputData["mdtrt_cert_no"] = Token // 就诊凭证编号
 	inputData["begntime"] = ""         // 开始时间
-	inputData["psn_name"] = "晁海燕"      // 人员姓名
+	inputData["psn_name"] = name       // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入