医保对接

controllers/his_api_controller.go

 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
 	patients, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
-	patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, 0)
 	patients = append(patients, patients_two...)
 	patients = RemoveRepeatedPatient(patients)
 

controllers/his_project_api_controller.go

 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordDateTime := theTime.Unix()
 	adminUserInfo := this.GetAdminUserInfo()
-	patients, err := service.GetScheduleHisPatientList(adminUserInfo.CurrentOrgId, "", recordDateTime)
+	patients, err := service.GetScheduleHisPatientList(adminUserInfo.CurrentOrgId, "", recordDateTime, 0)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": patients,
 	})

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

 }
 func (c *MobileHisApiController) GetHisPatientList() {
 	record_date := c.GetString("record_date")
+	sch_type, _ := c.GetInt64("sch_type")
+	visit_type, _ := c.GetInt64("visit_type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetMobileAdminUserInfo()
-	patients, _ := service.GetScheduleHisPatientList(adminInfo.Org.Id, "", recordDateTime)
+	patients, _ := service.GetScheduleHisPatientList(adminInfo.Org.Id, "", recordDateTime, sch_type)
 	patients_two, _ := service.GetHisPatientList(adminInfo.Org.Id, "", recordDateTime)
 	patients = append(patients, patients_two...)
 	patients = RemoveRepeatedPatient(patients)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"list": patients,
-	})
+	if visit_type == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patients,
+		})
+
+	} else if visit_type == 1 { //未就诊
+		var patientsOne []*service.Patients
+		for _, item := range patients {
+			if item.HisPrescription == nil || len(item.HisPrescription) <= 0 {
+				patientsOne = append(patientsOne, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patientsOne,
+		})
+
+	} else if visit_type == 2 { //已就诊
+		var patientsTwo []*service.Patients
+		for _, item := range patients {
+
+			if item.HisPrescription != nil && len(item.HisPrescription) > 0 {
+				patientsTwo = append(patientsTwo, item)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": patientsTwo,
+		})
+	}
 
 }
 

service/his_service.go

 	return "his_prescription"
 }
 
-func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64) (patients []*Patients, err error) {
-	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id).
-		Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ?", record_date, org_id)
+func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*Patients, err error) {
+	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+
+	if sch_type != 0 {
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_type = ?", record_date, org_id, sch_type)
+	} else {
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? ", record_date, org_id)
+	}
+
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Group("xt_patients.id").Order("sch_type").Find(&patients).Error

service/mobile_dialysis_service.go

 		Preload("DialysisOrder.DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentSummary", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
 		Preload("AssessmentAfterDislysis", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
-
+		Preload("HisAdvices", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
 		// Preload("DialysisOrder.MonitoringRecords", func(rdb *gorm.DB) *gorm.DB {
 		// 	return rdb.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time DESC")
 		// }).
 }
 
 type MDialysisScheduleVM struct {
-	ID           int64 `gorm:"column:id" json:"id"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id"`
-	BedId        int64 `gorm:"column:bed_id" json:"bed_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type"`
-	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week"`
-	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
-	Status       int64 `gorm:"column:status" json:"status"`
-
+	ID                       int64                             `gorm:"column:id" json:"id"`
+	UserOrgId                int64                             `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId              int64                             `gorm:"column:partition_id" json:"partition_id"`
+	BedId                    int64                             `gorm:"column:bed_id" json:"bed_id"`
+	PatientId                int64                             `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate             int64                             `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType             int64                             `gorm:"column:schedule_type" json:"schedule_type"`
+	ScheduleWeek             int64                             `gorm:"column:schedule_week" json:"schedule_week"`
+	ModeId                   int64                             `gorm:"column:mode_id" json:"mode_id"`
+	Status                   int64                             `gorm:"column:status" json:"status"`
 	SchedualPatient          *MSchedualPatientVMList           `gorm:"ForeignKey:PatientId" json:"patient"`
 	DeviceNumber             *MDeviceNumberVM                  `gorm:"ForeignKey:BedId" json:"device_number"`
 	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
 	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
 	AssessmentAfterDislysis  *AssessmentAfterDislysis          `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
-
-	Advices          []*VMDoctorAdvice   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
-	TreatmentSummary *VMTreatmentSummary `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
+	HisAdvices               []*VMHisDoctorAdviceInfo          `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"his_doctor_advice"`
+	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	TreatmentSummary         *VMTreatmentSummary               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
 	return "xt_doctor_advice"
 }
 
+type VMHisDoctorAdviceInfo struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId   int64 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	ExecutionTime  int64 `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff int64 `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+}
+
+func (VMHisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
 // 获取透析记录
 func MobileGetDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder