Преглед на файлове

Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

csx преди 4 години
родител
ревизия
1a0688260f
променени са 2 файла, в които са добавени 32 реда и са изтрити 3 реда
  1. 29 0
      controllers/data_api_controller.go
  2. 3 3
      models/his_models.go

+ 29 - 0
controllers/data_api_controller.go Целия файл

@@ -38,6 +38,7 @@ func DataApiRegistRouters() {
38 38
 	beego.Router("/api/executionfrequency/create", &DataApiController{}, "Post:CreateExecutionFrequency")
39 39
 	beego.Router("/api/executionfrequency/update", &DataApiController{}, "Put:UpdateExecutionFrequency")
40 40
 	beego.Router("/api/executionfrequency/delete", &DataApiController{}, "Delete:DeleteExecutionFrequency")
41
+
41 42
 	beego.Router("/api/advicetemplate/create", &DataApiController{}, "Post:CreateAdviceTemplate")
42 43
 	beego.Router("/api/subadvice/create", &DataApiController{}, "Post:CreateSubAdviceTemplate")
43 44
 	beego.Router("/api/advicetemplate/update", &DataApiController{}, "Put:UpdateAdviceTemplate")
@@ -52,6 +53,14 @@ func DataApiRegistRouters() {
52 53
 
53 54
 	//beego.Router("/api/dictionary/getconfiglist", &DataApiController{}, "get,post:GetDictionaryConfigList")
54 55
 
56
+	beego.Router("/api/hisadvicetemplate/create", &DataApiController{}, "Post:CreateHisAdviceTemplate")
57
+	beego.Router("/api/hissubadvice/create", &DataApiController{}, "Post:CreateHisubAdviceTemplate")
58
+	beego.Router("/api/hisadvicetemplate/update", &DataApiController{}, "Put:UpdateHisAdviceTemplate")
59
+	beego.Router("/api/hisadvicetemplate/delete", &DataApiController{}, "Delete:DeleteHisAdviceTemplate")
60
+	//beego.Router("/api/hisadvicetemplate/add", &DataApiController{}, "Post:CreateSingleHisAdviceTemplate")
61
+	//beego.Router("/api/hisadviceparenttemplate/delete", &DataApiController{}, "Delete:DeleteHisParentAdviceTemplate")
62
+	//beego.Router("/api/histemplate/modify", &DataApiController{}, "Post:ModifyHisTemplateName")
63
+
55 64
 }
56 65
 
57 66
 //GetPatientsList 取配置信息列表
@@ -1428,3 +1437,23 @@ func (c *DataApiController) UpdateDataTwo() {
1428 1437
 		"configModel": configModel,
1429 1438
 	})
1430 1439
 }
1440
+
1441
+func (c *DataApiController) CreateHisAdviceTemplate() {
1442
+
1443
+}
1444
+
1445
+func (c *DataApiController) CreateSHisubAdviceTemplate() {
1446
+
1447
+}
1448
+
1449
+func (c *DataApiController) CreateHisubAdviceTemplate() {
1450
+
1451
+}
1452
+
1453
+func (c *DataApiController) UpdateHisAdviceTemplate() {
1454
+
1455
+}
1456
+
1457
+func (c *DataApiController) DeleteHisAdviceTemplate() {
1458
+
1459
+}

+ 3 - 3
models/his_models.go Целия файл

@@ -294,9 +294,9 @@ type HisPrescription struct {
294 294
 	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
295 295
 	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
296 296
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
297
-	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
298
-	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
299
-	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"addition"`
297
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,ID;AssociationForeignKey:PatientId,RecordDate,PrescriptionId" json:"advices"`
298
+	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,ID;AssociationForeignKey:PatientId,RecordDate,PrescriptionId" json:"project"`
299
+	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,ID;AssociationForeignKey:PatientId,RecordDate,PrescriptionId" json:"addition"`
300 300
 }
301 301
 
302 302
 func (HisPrescription) TableName() string {