提交代码

models/inspection_models.go

@@ -237,17 +237,27 @@ func (XtPatientsTenOne) TableName() string {
 	return "xt_patients"
 }
 
+type InspectionValue struct {
+	Name  string `gorm:"-" json:"name" form:"name"`
+	Value string `gorm:"-" json:"value" form:"value"`
+}
+
 type InspectionTen struct {
-	ID        int64  `gorm:"column:id" json:"id" form:"id"`
-	PatientId int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Name      string `gorm:"-" json:"name" form:"name"`
-	Ipth      string `gorm:"-" json:"ipth" form:"ipth"`
-	Xuejia    string `gorm:"-" json:"xuejia" form:"xuejia"`
-	Xuelin    string `gorm:"-" json:"xuelin" form:"xuelin"`
-	Bdb       string `gorm:"-" json:"bdb" form:"bdb"`
-	Xhdb      string `gorm:"-" json:"xhdb" form:"xhdb"`
+	ID        int64             `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Name      string            `gorm:"-" json:"name" form:"name"`
+	Values    []InspectionValue `gorm:"-" json:"values" form:"values"`
 }
 
 func (InspectionTen) TableName() string {
 	return "xt_inspection"
 }
+
+type InspectionTenOne struct {
+	ID           int64  `gorm:"-" json:"id" form:"id"`
+	PatientId    int64  `gorm:"-" json:"patient_id" form:"patient_id"`
+	Name         string `gorm:"-" json:"name" form:"name"`
+	ItemName     string `gorm:"-" json:"item_name" form:"item_name"`
+	InspectValue string `gorm:"-" json:"inspect_value" form:"inspect_value"`
+	ItemID       string `gorm:"-" json:"item_id" form:"item_id"`
+}

service/pharmacy_service.go

@@ -336,6 +336,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				ExecutionState: v.ExecutionState,
 				ExecutionStaff: v.ExecutionStaff,
 				ExecutionTime:  v.ExecutionTime,
+				Price:          v.Price,
 			})
 		}
 
@@ -369,6 +370,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				ExecutionState: v.ExecutionState,
 				ExecutionStaff: v.ExecutionStaff,
 				ExecutionTime:  v.ExecutionTime,
+				Price:          v.Price,
 			})
 		}
 		return