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

controllers/js/jsyb_controller.go

@@ -252,7 +252,7 @@ func (c *JSybController) PostFive() {
 	}
 	//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["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["diag_code"].(string), respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string), "")
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

main.go

@@ -7,7 +7,7 @@ import (
 	_ "gdyb/routers"
 	"gdyb/service"
 
-	//"gdyb/service"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -17,11 +17,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

@@ -305,13 +305,14 @@ 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, time_stamp_2203 string) (string, string) {
 	// 生成签名
+	//timestamp := time.Now().Unix()
 	timestamp := time.Now().Unix()
-	tempTime := time.Unix(timestamp, 0)
-	//timeFormat := tempTime.Format("20060102150405")
+
+	timestamp2 := time.Now().Unix()
+
+	tempTime := time.Unix(timestamp2, 0)
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
-	//chrgBchno := rand.Intn(100000) + 10000
 	var customs []*Custom
-
 	for _, item := range hisPrescription {
 
 		if item.Type == 1 { //药品
@@ -405,7 +406,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	}
 
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetJSInputMessage(timestamp2, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	feedetail := make([]map[string]interface{}, 0)
 	inputMessage["infno"] = "2204" // 交易编码
@@ -469,21 +470,18 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["expContent"] = subfeedetailInfo
 		feedetail = append(feedetail, feedetailInfo)
 	}
+
 	input["feedetail"] = feedetail
 	inputMessage["input"] = input //交易输入
 	var requestLog string
 	bytesData, err := json.Marshal(inputMessage)
-	fmt.Println("----------")
-	fmt.Println(string(bytesData))
-	fmt.Println("----------")
-	requestLog = string(bytesData)
+
 	if err != nil {
 		fmt.Println(err.Error())
 		return "", ""
 	}
 
 	request_url = request_url + "2204"
-	//time_stamp, _ := strconv.ParseInt(time_stamp_2203, 10, 64)
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
 }