Browse Source

耗材参数

XMLWAN 4 years ago
parent
commit
ce842fd325
2 changed files with 4 additions and 6 deletions
  1. 3 6
      controllers/his_project_api_controller.go
  2. 1 0
      models/his_models.go

+ 3 - 6
controllers/his_project_api_controller.go View File

@@ -1041,9 +1041,8 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
1041 1041
 	adminUserInfo := this.GetAdminUserInfo()
1042 1042
 	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId)
1043 1043
 	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId)
1044
-	//doctorPorject, err := service.GetDoctorProjectItem(patient_id, recordDateTime)
1045
-	//patient, err := service.GetBloodPatientByPatient(patient_id)
1046
-	//prescriptionInfo, err := service.GetPrscriptionInfo(patient_id, recordDateTime)
1044
+	//prescriptionInfo, _ := service.GetPrscriptionInfo(patient_id, recordDateTime)
1045
+	hisPatient, _ := service.GetHisPatientById(patient_id)
1047 1046
 	if err != nil {
1048 1047
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
1049 1048
 		return
@@ -1051,9 +1050,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
1051 1050
 	this.ServeSuccessJSON(map[string]interface{}{
1052 1051
 		"advicePrint": advicePrint,
1053 1052
 		"projectlist": projectlist,
1054
-		//"patient":          patient,
1055
-		//"doctorPorject":    doctorPorject,
1056
-		//"prescriptionInfo": prescriptionInfo,
1053
+		"hisPatient":  hisPatient,
1057 1054
 	})
1058 1055
 }
1059 1056
 

+ 1 - 0
models/his_models.go View File

@@ -315,6 +315,7 @@ type HisPrescription struct {
315 315
 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
316 316
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
317 317
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
318
+	//VMHisPrescriptionInfo  VMHisPrescriptionInfo     `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
318 319
 }
319 320
 
320 321
 func (HisPrescription) TableName() string {