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

controllers/js/jsyb_controller.go

@@ -185,7 +185,7 @@ func (c *JSybController) PostFour() {
 	url := respJSON["url"].(string)
 	ak := respJSON["ak"].(string)
 	begin_time := respJSON["begin_time"].(string)
-	result, request_log := service.Jsyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, url, ak, begin_time)
+	result, request_log, timeStamp := service.Jsyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, url, ak, begin_time)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
 
@@ -202,6 +202,7 @@ func (c *JSybController) PostFour() {
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre":         dat,
 		"request_log": dat2,
+		"time_stamp":  timeStamp,
 	})
 }
 
@@ -241,9 +242,9 @@ func (c *JSybController) PostFive() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-
+	fmt.Println("2203A的time_stamp=" + respJSON["time_stamp"].(string))
 	result, request_log := service.Jsyb2204(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["diag_code"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_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["diag_code"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string), respJSON["time_stamp"].(int64))
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/sg/his_api_controller.go

@@ -5264,7 +5264,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 	var res2 ResultSix
 	var resSix10265 ResultSix10265
-
+	var time_stamp int64
 	if miConfig.InsuplcAdmdvs == "421300" {
 		data := make(map[string]interface{})
 		client := &http.Client{}
@@ -5355,6 +5355,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 			return
 		}
 
+		time_stamp = respJSON["data"].(map[string]interface{})["time_stamp"].(int64)
+
 		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 		userJSONBytes, _ := json.Marshal(respJSON)
 		fmt.Println("log")
@@ -5514,6 +5516,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["ak"] = miConfig.ChannelNumber
 		data["new_doctor_name"] = patientPrescription.Doctor
 		data["diag_code"] = sickConfig.CountryCode
+		data["time_stamp"] = time_stamp
 
 		var ids []int64
 

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	//"gdyb/service"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -15,11 +15,11 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
+	service.ConnectDB()
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
 
 }
 func main() {

service/jsyb_service.go

@@ -186,7 +186,7 @@ func Jsyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Jsyb2203(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, request_url string, access_key string, begin_time string) (string, string) {
+func Jsyb2203(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, request_url string, access_key string, begin_time string) (string, string, int64) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -235,10 +235,10 @@ func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error(), ""
+		return err.Error(), "", 0
 	}
 	request_url = request_url + "2203A"
-	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog, timestamp
 }
 
 // 门诊就诊信息上传
@@ -303,7 +303,7 @@ func Jsyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 }
 
 //  门诊费用明细信息上传
-func Jsyb2204(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, diag_code string, request_url string, access_key string, new_doctor_name string) (string, string) {
+func Jsyb2204(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, diag_code string, request_url string, access_key string, new_doctor_name string, time_stamp_2203 int64) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -482,7 +482,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		return "", ""
 	}
 	request_url = request_url + "2204"
-	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
+	return HttpRequest(request_url, access_key, secret_key, time_stamp_2203, string(bytesData)), requestLog
 }
 
 //  门诊费用明细信息撤销