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

controllers/zh/zh_his_api_controller.go

 		struct2401.AdmDeptCodg = strconv.FormatInt(int64(departmentInfo.ID), 10)
 		struct2401.AdmDeptName = departmentInfo.Name
 		struct2401.AdmBed = deviceNumber.Number
+		struct2401.AdmBed = "待定"
+
 		struct2401.DscgMaindiagName = diagnosisConfig[0].ClassName
 		struct2401.DscgMaindiagCode = diagnosisConfig[0].CountryCode
 		struct2401.Begntime = start_time

service/zh_his_service.go

 	inputData["dscg_maindiag_code"] = struct2401.DscgMaindiagCode
 	inputData["dscg_maindiag_name"] = struct2401.DscgMaindiagName
 	inputData["main_cond_dscr"] = ""
-	inputData["dise_codg"] = ""
-	inputData["dise_name"] = ""
+	inputData["dise_codg"] = struct2401.DiseCodg
+	inputData["dise_name"] = struct2401.DiseName
 	inputData["oprn_oprt_code"] = ""
 	inputData["oprn_oprt_name"] = ""
 	inputData["fpsc_no"] = ""