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

controllers/sg/his_api_controller.go

@@ -542,7 +542,7 @@ func (c *HisApiController) GetSettleList() {
 	for _, item := range diagnosis_ids {
 		id, _ := strconv.ParseInt(item, 10, 64)
 		diagnosisConfig, _ := service.FindDiagnoseById(id)
-		config = append(config, diagnosisConfig)
+		config = append(config, &diagnosisConfig)
 	}
 
 	for _, item := range config {
@@ -2155,7 +2155,7 @@ func (c *HisApiController) GetUploadInfo() {
 	for _, item := range diagnosis_ids {
 		id, _ := strconv.ParseInt(item, 10, 64)
 		diagnosisConfig, _ := service.FindDiagnoseById(id)
-		config = append(config, diagnosisConfig)
+		config = append(config, &diagnosisConfig)
 	}
 
 	sickConfig, _ := service.FindSickById(sick_type)
@@ -3497,7 +3497,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 	for _, item := range diagnosis_ids {
 		id, _ := strconv.ParseInt(item, 10, 64)
 		diagnosisConfig, _ := service.FindDiagnoseById(id)
-		config = append(config, diagnosisConfig)
+		config = append(config, &diagnosisConfig)
 	}
 	//diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
 

service/his_service.go

@@ -975,8 +975,8 @@ func GetPatientByID(orgID int64, patientID int64) (*models.Patients, error) {
 	return &patient, nil
 }
 
-func FindDiagnoseById(id int64) (*models.HisXtDiagnoseConfig, error) {
-	dealer := &models.HisXtDiagnoseConfig{}
+func FindDiagnoseById(id int64) (models.HisXtDiagnoseConfig, error) {
+	dealer := models.HisXtDiagnoseConfig{}
 	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ? AND status = 1", id).First(&dealer).Error
 	return dealer, err
 }