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

controllers/nm/nm_controller.go

 	org_name := c.GetString("org_name")
 	fapiao_number := c.GetString("fapiao_number")
 
-	result, src_resquest := service.ZHGdyb230nm4(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates, fapiao_number)
+	result, src_resquest := service.ZHGdyb2304(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates, fapiao_number)
 	saveJsLog(result, src_resquest, "2304", "住院结算", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(src_resquest), &dat2); err == nil {