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

controllers/nm/nm_controller.go

@@ -220,10 +220,8 @@ func (c *NmController) Post2301() {
 	chrg_bchno := respJSON["chrg_bchno"].(string)
 	dept := respJSON["dept"].(string)
 	dept_code := respJSON["dept_code"].(string)
-	doctor_code := respJSON["doctor_code"].(float64)
-	fmt.Println("@@@@@@")
+	doctor_code := respJSON["doctor_code"].(string)
 
-	fmt.Println(doctor_code)
 	doctor_name := respJSON["doctor_name"].(string)
 	opertor := respJSON["opertor"].(string)
 
@@ -232,11 +230,11 @@ func (c *NmController) Post2301() {
 	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	secret_key := respJSON["secret_key"].(string)
-	//med_type := respJSON["med_type"].(float64)
-	med_type := strconv.FormatInt(int64(respJSON["med_type"].(float64)), 10)
+	med_type := respJSON["med_type"].(string)
+	//med_type := strconv.FormatInt(int64(respJSON["med_type"].(float64)), 10)
 	psn_no := respJSON["psn_no"].(string)
 
-	result, requestLog := service.ZHGdyb2301A(psn_no, number, customs, chrg_bchno, org_name, doctor_name, dept, fixmedins_code, dept_code, int64(doctor_code), insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, opertor)
+	result, requestLog := service.ZHGdyb2301A(psn_no, number, customs, chrg_bchno, org_name, doctor_name, dept, fixmedins_code, dept_code, doctor_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, opertor)
 	saveJsLog(result, requestLog, "2301", "上传明细", org_name)
 
 	var dat2 map[string]interface{}

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,12 +15,12 @@ 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)
 
 	//UploadSettleList(org_id)
 }

service/zh_his_service.go

@@ -673,7 +673,7 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 
 }
 
-func ZHGdyb2301A(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id int64, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, opertor string) (string, string) {
+func ZHGdyb2301A(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, 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, med_type string, opertor string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()