耗材参数

controllers/his_project_api_controller.go

@@ -77,6 +77,7 @@ func HisProjectRouters() {
 	beego.Router("/api/hispatient/getallhispatient", &HisProjectApiController{}, "Get:GetAllHisPatient")
 	beego.Router("/api/hispatient/getchargeprint", &HisProjectApiController{}, "Get:GetChargePrint")
 	beego.Router("/api/hispatient/gettodayschedulepatient", &HisProjectApiController{}, "Get:GetTodaySchedulePatient")
+	beego.Router("/api/hispatient/gethispatientdetail", &HisProjectApiController{}, "Get:GetHisPatientDetail")
 }
 
 func (this *HisProjectApiController) SaveProject() {
@@ -1035,20 +1036,22 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordDateTime := theTime.Unix()
-	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime)
-	//
+	fmt.Println("recordDateTime-----------", recordDateTime)
+	prescription_id, _ := this.GetInt64("prescription_id")
+	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, prescription_id)
+
 	doctorPorject, err := service.GetDoctorProjectItem(patient_id, recordDateTime)
 	patient, err := service.GetBloodPatientByPatient(patient_id)
-	//hisPatient, err := service.GetHisPatientById(patient_id)
+	prescriptionInfo, err := service.GetPrscriptionInfo(patient_id, recordDateTime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"advicePrint": advicePrint,
-		//"hisPatient":hisPatient,
-		"patient":       patient,
-		"doctorPorject": doctorPorject,
+		"advicePrint":      advicePrint,
+		"patient":          patient,
+		"doctorPorject":    doctorPorject,
+		"prescriptionInfo": prescriptionInfo,
 	})
 }
 
@@ -1347,3 +1350,16 @@ func (this *HisProjectApiController) GetTodaySchedulePatient() {
 		"patient": patient,
 	})
 }
+
+func (this *HisProjectApiController) GetHisPatientDetail() {
+	patient_id, _ := this.GetInt64("patient_id")
+
+	hisPatient, err := service.GetHisPatientById(patient_id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"hisPatient": hisPatient,
+	})
+}

models/his_models.go

@@ -418,25 +418,25 @@ func (HisDoctorAdviceTemplate) TableName() string {
 }
 
 type HisPrescriptionProject struct {
-	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
-	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price              float64    `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId          int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status             int64      `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId          int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              int64      `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                string     `gorm:"column:day" json:"day" form:"day"`
-	HisProject         HisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	ID                 int64         `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64         `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64       `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64         `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64         `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64         `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64         `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64         `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64         `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64         `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64         `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              int64         `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string        `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string        `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string        `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string        `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string        `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string        `gorm:"column:day" json:"day" form:"day"`
+	HisProject         []*HisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 }
 
 func (HisPrescriptionProject) TableName() string {

service/his_project_service.go

@@ -355,8 +355,15 @@ func GetBloodPatientByPatient(id int64) (models.XtPatients, error) {
 	return patients, err
 }
 
-func GetHisPatientById(patientid int64) (models.HisPatient, error) {
-	patient := models.HisPatient{}
+func GetHisPatientByIdTwo(patientid int64) (models.XtHisPatient, error) {
+
+	patient := models.XtHisPatient{}
+	err := XTReadDB().Model(&patient).Where("patient_id = ? and status=1", patientid).Find(&patient).Error
+	return patient, err
+}
+
+func GetHisPatientById(patientid int64) (models.VMHisPatient, error) {
+	patient := models.VMHisPatient{}
 	err := XTReadDB().Model(&patient).Where("patient_id = ? and status = 1", patientid).Find(&patient).Error
 	return patient, err
 }
@@ -380,9 +387,9 @@ func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatien
 	return hisPatient, err
 }
 
-func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64) (prescription []*models.HisDoctorAdviceInfo, err error) {
+func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, prescription_id int64) (prescription []*models.HisDoctorAdviceInfo, err error) {
 
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and status = 1 and advice_date = ?", his_patient_id, recorddate).Find(&prescription).Error
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and status = 1 and advice_date = ? and prescription_id = ?", his_patient_id, recorddate, prescription_id).Find(&prescription).Error
 	return prescription, err
 }
 
@@ -525,7 +532,7 @@ func GetChargePrintTemplate(orgid int64) (models.XtHisChargeTemplate, error) {
 func GetDoctorProjectItem(patientid int64, record_date int64) (models.HisPrescriptionProject, error) {
 
 	project := models.HisPrescriptionProject{}
-	err := XTReadDB().Model(&project).Where("patient_id = ? and record_date = ? and status = 1", patientid, record_date).Error
+	err := XTReadDB().Model(&project).Where("patient_id = ? and record_date = ? and status = 1", patientid, record_date).Preload("HisProject", "status = 1").Find(&project).Error
 	return project, err
 }
 
@@ -567,3 +574,10 @@ func GetTodaySchedulePatient(orgid int64, scheduledata int64) (schedule []*model
 	err = db.Select("x.id,x.patient_id,x.schedule_date,t.name").Joins("left join xt_patients as t on t.id = x.patient_id").Scan(&schedule).Error
 	return schedule, err
 }
+
+func GetPrscriptionInfo(patientid int64, recorddata int64) (info []*models.HisPrescriptionInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("patient_id = ? and status = 1 and record_date = ?", patientid, recorddata).Find(&info).Error
+	return info, err
+
+}