Browse Source

耗材参数

XMLWAN 4 years ago
parent
commit
b79cd4eb92
2 changed files with 3 additions and 0 deletions
  1. 2 0
      controllers/his_project_api_controller.go
  2. 1 0
      service/his_service.go

+ 2 - 0
controllers/his_project_api_controller.go View File

@@ -1324,6 +1324,7 @@ func (this *HisProjectApiController) GetChargePrint() {
1324 1324
 	chargePrint, err := service.GetChargePrint(recordDateTime, patient_id, adminUserInfo.CurrentOrgId)
1325 1325
 	prescription, err := service.GetHisPrescriptionNight(adminUserInfo.CurrentOrgId, patient_id, recordDateTime, prescription_id)
1326 1326
 	patient, err := service.GetPatientByID(adminUserInfo.CurrentOrgId, patient_id)
1327
+	hisPatient, err := service.GetHisPatientById(patient_id)
1327 1328
 	if err != nil {
1328 1329
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
1329 1330
 		return
@@ -1332,6 +1333,7 @@ func (this *HisProjectApiController) GetChargePrint() {
1332 1333
 		"list":         chargePrint,
1333 1334
 		"prescription": prescription,
1334 1335
 		"patient":      patient,
1336
+		"hisPatient":   hisPatient,
1335 1337
 	})
1336 1338
 }
1337 1339
 

+ 1 - 0
service/his_service.go View File

@@ -671,6 +671,7 @@ func GetHisPrescriptionNight(org_id int64, patient_id int64, record_date int64,
671 671
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
672 672
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
673 673
 		}).
674
+		Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).
674 675
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).
675 676
 		Find(&prescription).Error
676 677
 	return