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

controllers/nm/nm_controller.go

@@ -184,7 +184,7 @@ func (c *NmController) Post2402() {
 	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	secret_key := respJSON["secret_key"].(string)
-	result, request_log := service.ZHGdyb2402(struct2402, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	result, request_log := service.ZHGdyb2402(struct2402, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
 	saveJsLog(result, request_log, "2402", "出院", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {