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

controllers/his_project_api_controller.go

 	adminUserInfo := this.GetAdminUserInfo()
 	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId)
 	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId)
-	//doctorPorject, err := service.GetDoctorProjectItem(patient_id, recordDateTime)
-	//patient, err := service.GetBloodPatientByPatient(patient_id)
-	//prescriptionInfo, err := service.GetPrscriptionInfo(patient_id, recordDateTime)
+	//prescriptionInfo, _ := service.GetPrscriptionInfo(patient_id, recordDateTime)
+	hisPatient, _ := service.GetHisPatientById(patient_id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	this.ServeSuccessJSON(map[string]interface{}{
 		"advicePrint": advicePrint,
 		"projectlist": projectlist,
-		//"patient":          patient,
-		//"doctorPorject":    doctorPorject,
-		//"prescriptionInfo": prescriptionInfo,
+		"hisPatient":  hisPatient,
 	})
 }
 
 	chargePrint, err := service.GetChargePrint(recordDateTime, patient_id, adminUserInfo.CurrentOrgId)
 	prescription, err := service.GetHisPrescriptionNight(adminUserInfo.CurrentOrgId, patient_id, recordDateTime, prescription_id)
 	patient, err := service.GetPatientByID(adminUserInfo.CurrentOrgId, patient_id)
+	hisPatient, err := service.GetHisPatientById(patient_id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 		"list":         chargePrint,
 		"prescription": prescription,
 		"patient":      patient,
+		"hisPatient":   hisPatient,
 	})
 }
 

models/his_models.go

 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
+	//VMHisPrescriptionInfo  VMHisPrescriptionInfo     `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
 }
 
 func (HisPrescription) TableName() string {

service/his_service.go

 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
+		Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).
 		Find(&prescription).Error
 	return