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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true
@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 9504
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sz/sz_his_api_controller.go

@@ -807,6 +807,8 @@ func (c *SZHisApiController) GetRegisterInfo() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIDCartNo)
 		return
 	}
+	doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
+	doctorDepartment, _ := service.GetDepartMentDetail(department)
 
 	adminRole, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
 	his, _ := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient_id, theTime.Unix())
@@ -848,16 +850,16 @@ func (c *SZHisApiController) GetRegisterInfo() {
 
 	if his.ID == 0 {
 
-		var doctor_name string
-		var doctor_code string
+		var opera_name string
+		var opera_code string
 		if adminRole.ID == 0 {
 
-			doctor_name = "管理员"
-			doctor_code = "01"
+			opera_name = "管理员"
+			opera_code = "01"
 
 		} else {
-			doctor_name = adminRole.UserName
-			doctor_code = strconv.FormatInt(admin_user_id, 10)
+			opera_name = adminRole.UserName
+			opera_code = strconv.FormatInt(admin_user_id, 10)
 
 		}
 		month := time.Unix(1557042972, 0).Format("1")