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

controllers/sg/his_api_controller.go

@@ -1,5 +1,6 @@
 package sg
 
+import "C"
 import (
 	"archive/zip"
 	"bytes"
@@ -876,10 +877,8 @@ func (c *HisApiController) GetRegisterInfo() {
 	}
 
 	//adminRole, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, adminInfo.AdminUser.Id)
-
 	diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
 	sickConfig, _ := service.FindSickById(sick_type)
-
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
 	if patient.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
@@ -4070,7 +4069,7 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 				UserOrgId:     adminUser.CurrentOrgId,
 				PatientId:     patient.ID,
 				PsnNo:         psn_no,
-				DoctorId:      doctor.ID,
+				DoctorId:      doctor.AdminUserId,
 				DepartmentId:  department_id,
 				SickType:      sick_id,
 				Insutype:      insutype,
@@ -4084,6 +4083,7 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"failed_code": 0,
 				"msg":         "备案成功",
+				"result":      psnResult,
 			})
 
 		} else {