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

controllers/sg/his_api_controller.go

@@ -1237,7 +1237,7 @@ func (c *HisApiController) GetUploadInfo() {
 	data["doctor_id"] = strconv.FormatInt(roles.AdminUserId, 10)
 	data["dept"] = strconv.FormatInt(patientPrescription.Departments, 10)
 	data["fixmedins_code"] = miConfig.Code
-	if department.ID == 0 && adminUser.CurrentOrgId == 9919 {
+	if (department.ID == 0 && adminUser.CurrentOrgId == 9919) || (department.ID == 0 && adminUser.CurrentOrgId == 10106) {
 		data["dept_code"] = "15"
 	} else {
 		data["dept_code"] = department.Number