医保对接

controllers/his_project_api_controller.go

@@ -1228,8 +1228,10 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId, temp_p_type)
 	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId, "")
 	his, _ := service.GetLastHisPatient(patient_id, adminUserInfo.CurrentOrgId)
-	//prescriptionInfo, _ := service.GetPrscriptionInfo(patient_id, recordDateTime)
-	hisPatient, _ := service.GetHisPatientById(patient_id)
+	prescriptionInfo, _ := service.GetPrscriptionInfo(patient_id, recordDateTime)
+	//advicePrint, err := service.GetPre(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId, temp_p_type)
+	hisPatient, _ := service.GetHisPatient(adminUserInfo.CurrentOrgId, recordDateTime)
+	//hisPatient, _ := service.GetHisPatientById(patient_id)
 	hisHospitalRecord, _ := service.GetLastHospitalRecordTwo(patient_id, adminUserInfo.CurrentOrgId)
 
 	if err != nil {
@@ -1242,6 +1244,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 		"hisPatient":        hisPatient,
 		"his":               his,
 		"hisHospitalRecord": hisHospitalRecord,
+		"info":              prescriptionInfo,
 	})
 }
 

service/his_project_service.go

@@ -407,7 +407,7 @@ func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []strin
 		return db.Where("status = 1 and user_org_id = ?", orgid).Preload("Drug", "status = 1")
 	}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", orgid).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
-	}).Preload("HisPrescriptionInfo", "status =1 and user_org_id = ? and p_type = ? AND record_date = ?", orgid, p_type).Preload("HisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
+	}).Preload("HisPrescriptionInfo", "status =1 and user_org_id = ? and p_type = ? AND record_date = ?", orgid, p_type, recorddate).Preload("HisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
 
 	return prescription, err
 }