Browse Source

拉取代码

XMLWAN 4 years ago
parent
commit
9ecf0fbb5e
2 changed files with 2 additions and 2 deletions
  1. 1 1
      controllers/sz/sz_his_api_controller.go
  2. 1 1
      service/his_project_service.go

+ 1 - 1
controllers/sz/sz_his_api_controller.go View File

@@ -3312,7 +3312,7 @@ func (c *SZHisApiController) GetDrugList() {
3312 3312
 		recordDate := time.Unix(item.RecordDate, 0).Format(timeLayout)
3313 3313
 
3314 3314
 		detail := &models.DrugDetail{
3315
-			MedicalInsuranceNumber: item.MedicalInsuranceNumber,
3315
+			MedicalInsuranceNumber: item.SocialSecurityDirectoryCode,
3316 3316
 			Code:                   item.Code,
3317 3317
 			DrugName:               item.DrugName,
3318 3318
 			DrugSpec:               item.DrugSpec,

+ 1 - 1
service/his_project_service.go View File

@@ -711,7 +711,7 @@ func GetBatchDrugList(idss []int64) (drug []*models.BaseDrugList, err error) {
711 711
 	} else {
712 712
 		db = db.Where("x.id IN(?)", idss)
713 713
 	}
714
-	err = db.Select("x.id,x.medical_insurance_number,x.code,x.drug_name,x.drug_spec,x.drug_type,x.min_unit,x.last_price,x.retail_price,x.limit_remark,x.drug_dosage_form,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&drug).Error
714
+	err = db.Select("x.id,x.medical_insurance_number,x.code,x.drug_name,x.drug_spec,x.drug_type,x.min_unit,x.last_price,x.retail_price,x.limit_remark,x.drug_dosage_form,x.social_security_directory_code,m.manufacturer_name").Joins("left join xt_manufacturer as m on m.id = x.manufacturer").Scan(&drug).Error
715 715
 
716 716
 	return drug, err
717 717
 }