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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10318
+org_id = 10088
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -58,8 +58,8 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 # gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
-# gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
-gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
+gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
+# gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
 #韶关
 # gdyb_paasid = "sg03_prd"
 #江门
@@ -72,7 +72,7 @@ gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
 # gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"
 #广州
-gdyb_paasid = "gdyb_inf"
+# gdyb_paasid = "gdyb_inf"
 
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com

controllers/hb/hbyb_controller.go

@@ -107,9 +107,11 @@ func (c *HBybController) PostTwo() {
 	ipt_otp_no := c.GetString("ipt_otp_no")
 	dept := c.GetString("dept")
 	fixmedins_code := c.GetString("fixmedins_code")
+	opter := c.GetString("opter")
 
 	dept_code := c.GetString("dept_code")
 	doctor_id := c.GetString("doctor_id")
+	doctor_name := c.GetString("doctor_name")
 
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
@@ -118,7 +120,7 @@ func (c *HBybController) PostTwo() {
 
 	id_card_type, _ := c.GetInt64("id_card_type")
 
-	result, _ := service.Hbyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type)
+	result, _ := service.Hbyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, opter, doctor_name)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -171,12 +173,14 @@ func (c *HBybController) PostFour() {
 
 	psnNo := respJSON["psn_no"].(string)
 	mdtrtId := respJSON["mdtrt_id"].(string)
-	doctor := respJSON["doctor"].(string)
 	department := respJSON["department"].(string)
 
 	org_name := respJSON["org_name"].(string)
 	med_type := respJSON["med_type"].(string)
 	doctor_id := respJSON["doctor_id"].(string)
+	doctor_name := respJSON["doctor_name"].(string)
+	opter := respJSON["opter"].(string)
+
 	fixmedins_code := respJSON["fixmedins_code"].(string)
 	sick_code := respJSON["sick_code"].(string)
 	sick_name := respJSON["sick_name"].(string)
@@ -187,7 +191,7 @@ func (c *HBybController) PostFour() {
 	secret_key := respJSON["secret_key"].(string)
 	begin_time := respJSON["begin_time"].(string)
 
-	result, request_log := service.Hbyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, begin_time)
+	result, request_log := service.Hbyb2203(psnNo, mdtrtId, dept, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, begin_time, doctor_name, opter)
 
 	fmt.Println(request_log)
 
@@ -255,7 +259,7 @@ func (c *HBybController) PostFive() {
 	fmt.Println(respJSON["secret_key"].(string))
 
 	result, requestLog := service.Hbyb2204(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), respJSON["balance_accounts_type"].(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), respJSON["balance_accounts_type"].(string), respJSON["opter"].(string))
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/zh/zh_his_api_controller.go

@@ -1568,7 +1568,7 @@ func (c *ZHHisApiController) GetSettleInfo() {
 			mdtrt_cert_no = record.Certno
 		}
 		var acct_used_flag string
-		if pay_way == 5 {
+		if pay_way == 4 {
 			acct_used_flag = "1"
 		} else {
 			acct_used_flag = "0"

main.go

@@ -1,11 +1,15 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
 	"gdyb/service"
 	"github.com/astaxie/beego"
+	"github.com/qiniu/api.v7/auth/qbox"
+	"github.com/qiniu/api.v7/storage"
+
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 	"os"
@@ -15,10 +19,10 @@ import (
 
 func init() {
 	service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }
@@ -815,42 +819,42 @@ func CreateLog(miConfig models.MedicalInsuranceOrgConfig) {
 
 }
 
-//func UploadLog(miConfig models.MedicalInsuranceOrgConfig) {
-//	//获取七牛云上的文件信息，不存在则表示没上传到七牛云，上传昨天日志信息
-//	nTime := time.Now()
-//	yesTime := nTime.AddDate(0, 0, -1)
-//	file_key := strconv.FormatInt(miConfig.UserOrgId, 10) + "_" + yesTime.Format("20060102") + "_log.txt"
-//	mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
-//	cfg := storage.Config{
-//		// 是否使用https域名进行资源管理
-//		UseHTTPS: true,
-//	}
-//	// 指定空间所在的区域，如果不指定将自动探测
-//	// 如果没有特殊需求，默认不需要指定
-//	//cfg.Zone=&storage.ZoneHuabei
-//	bucketManager := storage.NewBucketManager(mac, &cfg)
-//	bucket := beego.AppConfig.String("qiniu_bucket")
-//	key := file_key
-//	file, sErr := bucketManager.Stat(bucket, key)
-//	fmt.Println(file)
-//	fmt.Println(sErr)
-//	fmt.Println(miConfig.OrgName + "日志" + "/" + file_key)
-//
-//	if sErr != nil {
-//		fmt.Println("七牛云上文件不存在，上传到七牛云")
-//		//判断本地文件是否存在，存在则执行上传操作
-//		exist, _ := PathExists(miConfig.OrgName + "日志" + "/" + file_key)
-//		if exist {
-//			upload_qiniu(miConfig.OrgName+"日志"+"/"+file_key, file_key)
-//		} else {
-//			fmt.Println("本地文件不存在")
-//
-//		}
-//	} else {
-//		fmt.Println("七牛云文件存在")
-//	}
-//
-//}
+func UploadLog(miConfig models.MedicalInsuranceOrgConfig) {
+	//获取七牛云上的文件信息，不存在则表示没上传到七牛云，上传昨天日志信息
+	nTime := time.Now()
+	yesTime := nTime.AddDate(0, 0, -1)
+	file_key := strconv.FormatInt(miConfig.UserOrgId, 10) + "_" + yesTime.Format("20060102") + "_log.txt"
+	mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
+	cfg := storage.Config{
+		// 是否使用https域名进行资源管理
+		UseHTTPS: true,
+	}
+	// 指定空间所在的区域，如果不指定将自动探测
+	// 如果没有特殊需求，默认不需要指定
+	//cfg.Zone=&storage.ZoneHuabei
+	bucketManager := storage.NewBucketManager(mac, &cfg)
+	bucket := beego.AppConfig.String("qiniu_bucket")
+	key := file_key
+	file, sErr := bucketManager.Stat(bucket, key)
+	fmt.Println(file)
+	fmt.Println(sErr)
+	fmt.Println(miConfig.OrgName + "日志" + "/" + file_key)
+
+	if sErr != nil {
+		fmt.Println("七牛云上文件不存在，上传到七牛云")
+		//判断本地文件是否存在，存在则执行上传操作
+		exist, _ := PathExists(miConfig.OrgName + "日志" + "/" + file_key)
+		if exist {
+			upload_qiniu(miConfig.OrgName+"日志"+"/"+file_key, file_key)
+		} else {
+			fmt.Println("本地文件不存在")
+
+		}
+	} else {
+		fmt.Println("七牛云文件存在")
+	}
+
+}
 func Mkdir(dir string) {
 	// 创建文件夹
 	exist, err := PathExists(dir)
@@ -881,38 +885,38 @@ func PathExists(path string) (bool, error) {
 	return false, err
 }
 func upload_qiniu(filePath string, keys string) {
-	//key := keys
-	////上传凭证,关于凭证这块大家可以去看看官方文档
-	//putPolicy := storage.PutPolicy{
-	//	Scope: beego.AppConfig.String("qiniu_bucket"),
-	//}
-	//mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
-	//upToken := putPolicy.UploadToken(mac)
-	//cfg := storage.Config{}
-	////空间对应机房
-	////其中关于Zone对象和机房的关系如下：
-	////    机房    Zone对象
-	////    华东    storage.ZoneHuadong
-	////    华北    storage.ZoneHuabei
-	////    华南    storage.ZoneHuanan
-	////    北美    storage.ZoneBeimei
-	////七牛云存储空间设置首页有存储区域
-	//cfg.Zone = &storage.ZoneHuadong
-	////不启用HTTPS域名
-	//cfg.UseHTTPS = false
-	////不使用CND加速
-	//cfg.UseCdnDomains = false
-	////构建上传表单对象
-	//formUploader := storage.NewFormUploader(&cfg)
-	//ret := storage.PutRet{}
-	//// 可选
-	//putExtra := storage.PutExtra{
-	//	Params: map[string]string{},
-	//}
-	//err := formUploader.PutFile(context.Background(), &ret, upToken, key, filePath, &putExtra)
-	//if err != nil {
-	//	fmt.Println(err)
-	//	return
-	//}
-	//fmt.Println(ret.Key, ret.Hash)
+	key := keys
+	//上传凭证,关于凭证这块大家可以去看看官方文档
+	putPolicy := storage.PutPolicy{
+		Scope: beego.AppConfig.String("qiniu_bucket"),
+	}
+	mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
+	upToken := putPolicy.UploadToken(mac)
+	cfg := storage.Config{}
+	//空间对应机房
+	//其中关于Zone对象和机房的关系如下：
+	//    机房    Zone对象
+	//    华东    storage.ZoneHuadong
+	//    华北    storage.ZoneHuabei
+	//    华南    storage.ZoneHuanan
+	//    北美    storage.ZoneBeimei
+	//七牛云存储空间设置首页有存储区域
+	cfg.Zone = &storage.ZoneHuadong
+	//不启用HTTPS域名
+	cfg.UseHTTPS = false
+	//不使用CND加速
+	cfg.UseCdnDomains = false
+	//构建上传表单对象
+	formUploader := storage.NewFormUploader(&cfg)
+	ret := storage.PutRet{}
+	// 可选
+	putExtra := storage.PutExtra{
+		Params: map[string]string{},
+	}
+	err := formUploader.PutFile(context.Background(), &ret, upToken, key, filePath, &putExtra)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	fmt.Println(ret.Key, ret.Hash)
 }

routers/router.go

@@ -1,6 +1,7 @@
 package routers
 
 import (
+	"gdyb/controllers/hb"
 	"gdyb/controllers/sg"
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
@@ -19,9 +20,9 @@ func init() {
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		AllowCredentials: true,
 	}))
-	sg.NewHisManagerApiRegistRouters()
+	sg.HisManagerApiRegistRouters()
 	sg.GdybRegistRouters()
-	//hb.HbybRegistRouters()
+	hb.HbybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
 	//zh.ZHHisManagerApiRegistRouters()
 	//js.JSybRegistRouters()

service/hbyb_service.go

@@ -96,7 +96,7 @@ func Hbyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 // 门诊挂号
-func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64) (string, string) {
+func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, opter string, doctor_name string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -105,7 +105,7 @@ func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, opter, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2201"        // 交易编码
@@ -126,7 +126,7 @@ func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 
 	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
 	inputData["atddr_no"] = doctor_id    // 医师编码
-	inputData["dr_name"] = doctor        // 医师姓名
+	inputData["dr_name"] = doctor_name   // 医师姓名
 	inputData["dept_code"] = dept_code   // 科室编码
 	inputData["dept_name"] = dept        // 科室名称
 	inputData["caty"] = "A03.06"         // 科别
@@ -196,7 +196,7 @@ func Hbyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, begin_time string) (string, string) {
+func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, begin_time string, doctor_name string, opter string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -204,7 +204,7 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, opter, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
@@ -239,7 +239,7 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		diseinfo_sun["diag_name"] = item.ClassName   // 诊断名称
 		diseinfo_sun["diag_dept"] = department       // 诊断科室
 		diseinfo_sun["dise_dor_no"] = doctor_id      // 诊断医生编码
-		diseinfo_sun["dise_dor_name"] = doctor       // 诊断医生姓名
+		diseinfo_sun["dise_dor_name"] = doctor_name  // 诊断医生姓名
 		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
 		diseinfo_sun["vali_flag"] = "1"              // 有效标志
 		diseinfo = append(diseinfo, diseinfo_sun)
@@ -270,7 +270,7 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 }
 
 //  门诊费用明细信息上传
-func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string) (string, string) {
+func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, opter string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -362,7 +362,7 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	}
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, opter, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	feedetail := make([]map[string]interface{}, 0)
 	inputMessage["infno"] = "2204" // 交易编码