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

controllers/data_api_controller.go

@@ -38,6 +38,7 @@ func DataApiRegistRouters() {
 	beego.Router("/api/executionfrequency/create", &DataApiController{}, "Post:CreateExecutionFrequency")
 	beego.Router("/api/executionfrequency/update", &DataApiController{}, "Put:UpdateExecutionFrequency")
 	beego.Router("/api/executionfrequency/delete", &DataApiController{}, "Delete:DeleteExecutionFrequency")
+
 	beego.Router("/api/advicetemplate/create", &DataApiController{}, "Post:CreateAdviceTemplate")
 	beego.Router("/api/subadvice/create", &DataApiController{}, "Post:CreateSubAdviceTemplate")
 	beego.Router("/api/advicetemplate/update", &DataApiController{}, "Put:UpdateAdviceTemplate")
@@ -52,6 +53,14 @@ func DataApiRegistRouters() {
 
 	//beego.Router("/api/dictionary/getconfiglist", &DataApiController{}, "get,post:GetDictionaryConfigList")
 
+	beego.Router("/api/hisadvicetemplate/create", &DataApiController{}, "Post:CreateHisAdviceTemplate")
+	beego.Router("/api/hissubadvice/create", &DataApiController{}, "Post:CreateHisubAdviceTemplate")
+	beego.Router("/api/hisadvicetemplate/update", &DataApiController{}, "Put:UpdateHisAdviceTemplate")
+	beego.Router("/api/hisadvicetemplate/delete", &DataApiController{}, "Delete:DeleteHisAdviceTemplate")
+	//beego.Router("/api/hisadvicetemplate/add", &DataApiController{}, "Post:CreateSingleHisAdviceTemplate")
+	//beego.Router("/api/hisadviceparenttemplate/delete", &DataApiController{}, "Delete:DeleteHisParentAdviceTemplate")
+	//beego.Router("/api/histemplate/modify", &DataApiController{}, "Post:ModifyHisTemplateName")
+
 }
 
 //GetPatientsList 取配置信息列表
@@ -1428,3 +1437,23 @@ func (c *DataApiController) UpdateDataTwo() {
 		"configModel": configModel,
 	})
 }
+
+func (c *DataApiController) CreateHisAdviceTemplate() {
+
+}
+
+func (c *DataApiController) CreateSHisubAdviceTemplate() {
+
+}
+
+func (c *DataApiController) CreateHisubAdviceTemplate() {
+
+}
+
+func (c *DataApiController) UpdateHisAdviceTemplate() {
+
+}
+
+func (c *DataApiController) DeleteHisAdviceTemplate() {
+
+}

models/his_models.go

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