医保对接

controllers/base_api_controller.go

 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3877
+		subscibe.OrgId = 9919
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 3877
+		adminUserInfo.CurrentOrgId = 9919
+		adminUserInfo.CurrentAppId = 4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3877
+		subscibe.OrgId = 9919
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 8642
+		adminUserInfo.CurrentOrgId = 9919
+		adminUserInfo.CurrentAppId = 4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/his_api_controller.go

 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	patients, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
-	patients_two, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	patients, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
 	patients = append(patients, patients_two...)
 	patients = RemoveRepeatedPatient(patients)
 
 	})
 }
 
-func (this *DialysisApiController) GetLastOrNextHisPrescription() {
+func (this *HisApiController) GetLastOrNextHisPrescription() {
 	change_type, _ := this.GetInt64("type", 0)
 	record_date := this.GetString("record_time")
 	patient_id, _ := this.GetInt64("patient_id", 0)
 	}
 }
 
-func (this *DialysisApiController) GetCallHisPrescription() {
+func (this *HisApiController) GetCallHisPrescription() {
 	patient_id, _ := this.GetInt64("patient_id", 0)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")

service/his_service.go

 }
 
 type Patients 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"`
-	Name                  string                `gorm:"column:name" json:"name" form:"name"`
-	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
-	IdCardNo              string                `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+
 	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
 	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	HisPrescription       []*HisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescription"`
 }
 
 func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64) (patients []*Patients, err error) {
-	db := readDb.Model(&Patients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id).
+	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)
 	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").Find(&patients).Error
+	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
 	return
 }