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

controllers/sg/his_api_controller.go

 	fed.AdmDeptName = department.Name
 	fed.DscgDeptCodg = strconv.FormatInt(department.ID, 10)
 	fed.DscgDeptName = department.Name
-	fed.MedMdtrtType = ""
+	fed.MedMdtrtType = "1"
 	if his.Insutype == "390" {
 		fed.MedType = "1402"
 	} else {

service/jsyb_service.go

 	fisEncounterDtosData["mdtrt_id"] = fed.MdtrtID
 	fisEncounterDtosData["medins_id"] = fed.MedinsID
 	fisEncounterDtosData["medins_name"] = fed.MedinsName
+	fisEncounterDtosData["medins_name"] = fed.MedinsName
 	fisEncounterDtosData["medins_admdvs"] = fed.MedinsAdmdvs
 	fisEncounterDtosData["medins_type"] = fed.MedinsType
 	fisEncounterDtosData["medins_lv"] = fed.MedinsLv