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

controllers/patient_api_controller.go

@@ -252,29 +252,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                    adminUserInfo.CurrentOrgId,
-		UserId:                       0,
-		Avatar:                       patients.Avatar,
-		PatientType:                  patients.PatientType,
-		DialysisNo:                   patients.DialysisNo,
-		AdmissionNumber:              patients.AdmissionNumber,
-		Source:                       patients.Source,
-		Lapseto:                      patients.Lapseto,
-		PartitionId:                  patients.PartitionId,
-		BedId:                        patients.BedId,
-		Name:                         patients.Name,
-		Alias:                        patients.Alias,
-		Gender:                       patients.Gender,
-		MaritalStatus:                patients.MaritalStatus,
-		IdCardNo:                     patients.IdCardNo,
-		Birthday:                     patients.Birthday,
-		ReimbursementWayId:           patients.ReimbursementWayId,
-		HealthCareType:               patients.HealthCareType,
-		HealthCareNo:                 patients.HealthCareNo,
-		HealthCareDueDate:            patients.HealthCareDueDate,
-		Height:                       patients.Height,
-		BloodType:                    patients.BloodType,
-		Rh:                           patients.Rh,
+		UserOrgId:          adminUserInfo.CurrentOrgId,
+		UserId:             0,
+		Avatar:             patients.Avatar,
+		PatientType:        patients.PatientType,
+		DialysisNo:         patients.DialysisNo,
+		AdmissionNumber:    patients.AdmissionNumber,
+		Source:             patients.Source,
+		Lapseto:            patients.Lapseto,
+		PartitionId:        patients.PartitionId,
+		BedId:              patients.BedId,
+		Name:               patients.Name,
+		Alias:              patients.Alias,
+		Gender:             patients.Gender,
+		MaritalStatus:      patients.MaritalStatus,
+		IdCardNo:           patients.IdCardNo,
+		Birthday:           patients.Birthday,
+		ReimbursementWayId: patients.ReimbursementWayId,
+		HealthCareType:     patients.HealthCareType,
+		HealthCareNo:       patients.HealthCareNo,
+		HealthCareDueDate:  patients.HealthCareDueDate,
+		Height:             patients.Height,
+		BloodType:          patients.BloodType,
+		Rh:                 patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -320,28 +320,28 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
-		IsInfectious:                 patients.IsInfectious,
-		RemindCycle:                  patients.RemindCycle,
-		ResponseResult:               patients.ResponseResult,
-		IsOpenRemind:                 patients.IsOpenRemind,
-		FirstTreatmentDate:           patients.FirstTreatmentDate,
-		DialysisAge:                  patients.DialysisAge,
-		ExpenseKind:                  patients.ExpenseKind,
-		TellPhone:                    patients.TellPhone,
-		ContactName:                  patients.ContactName,
-		BloodPatients:                1,
-		SlowPatients:                 0,
-		MemberPatients:               0,
-		EcommerPatients:              "",
-		BloodId:                      patients.ID,
-		SlowId:                       0,
-		MemberId:                     0,
-		MemberFistdate:               0,
-		MemberPatienttype:            0,
-		MemberTreatement:             0,
-		EquitmentId:                  "",
-		UserSysBeforeCount:           patient.UserSysBeforeCount,
+		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
+		IsInfectious:             patients.IsInfectious,
+		RemindCycle:              patients.RemindCycle,
+		ResponseResult:           patients.ResponseResult,
+		IsOpenRemind:             patients.IsOpenRemind,
+		FirstTreatmentDate:       patients.FirstTreatmentDate,
+		DialysisAge:              patients.DialysisAge,
+		ExpenseKind:              patients.ExpenseKind,
+		TellPhone:                patients.TellPhone,
+		ContactName:              patients.ContactName,
+		BloodPatients:            1,
+		SlowPatients:             0,
+		MemberPatients:           0,
+		EcommerPatients:          "",
+		BloodId:                  patients.ID,
+		SlowId:                   0,
+		MemberId:                 0,
+		MemberFistdate:           0,
+		MemberPatienttype:        0,
+		MemberTreatement:         0,
+		EquitmentId:              "",
+		UserSysBeforeCount:       patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -479,28 +479,28 @@ func (c *PatientApiController) EditPatient() {
 		return
 	}
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                 patient.UserOrgId,
-		UserId:                    patient.UserId,
-		Avatar:                    patient.Avatar,
-		PatientType:               patient.PatientType,
-		DialysisNo:                patient.DialysisNo,
-		AdmissionNumber:           patient.AdmissionNumber,
-		Source:                    patient.Source,
-		PartitionId:               patient.PartitionId,
-		BedId:                     patient.BedId,
-		Name:                      patient.Name,
-		Alias:                     patient.Alias,
-		Gender:                    patient.Gender,
-		MaritalStatus:             patient.MaritalStatus,
-		IdCardNo:                  patient.IdCardNo,
-		Birthday:                  patient.Birthday,
-		ReimbursementWayId:        patient.ReimbursementWayId,
-		HealthCareType:            patient.HealthCareType,
-		HealthCareNo:              patient.HealthCareNo,
-		HealthCareDueDate:         patient.HealthCareDueDate,
-		Height:                    patient.Height,
-		BloodType:                 patient.BloodType,
-		Rh:                        patient.Rh,
+		UserOrgId:          patient.UserOrgId,
+		UserId:             patient.UserId,
+		Avatar:             patient.Avatar,
+		PatientType:        patient.PatientType,
+		DialysisNo:         patient.DialysisNo,
+		AdmissionNumber:    patient.AdmissionNumber,
+		Source:             patient.Source,
+		PartitionId:        patient.PartitionId,
+		BedId:              patient.BedId,
+		Name:               patient.Name,
+		Alias:              patient.Alias,
+		Gender:             patient.Gender,
+		MaritalStatus:      patient.MaritalStatus,
+		IdCardNo:           patient.IdCardNo,
+		Birthday:           patient.Birthday,
+		ReimbursementWayId: patient.ReimbursementWayId,
+		HealthCareType:     patient.HealthCareType,
+		HealthCareNo:       patient.HealthCareNo,
+		HealthCareDueDate:  patient.HealthCareDueDate,
+		Height:             patient.Height,
+		BloodType:          patient.BloodType,
+		Rh:                 patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -542,19 +542,19 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
-		IsInfectious:              patient.IsInfectious,
-		RemindCycle:               patient.RemindCycle,
-		ResponseResult:            patient.ResponseResult,
-		IsOpenRemind:              patient.IsOpenRemind,
-		FirstTreatmentDate:        patient.FirstTreatmentDate,
-		DialysisAge:               patient.DialysisAge,
-		ExpenseKind:               patient.ExpenseKind,
-		TellPhone:                 patient.TellPhone,
-		ContactName:               patient.ContactName,
-		UpdatedTime:               time.Now().Unix(),
-		BloodPatients:             1,
-		Lapseto:                   patient.Lapseto,
+		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
+		IsInfectious:             patient.IsInfectious,
+		RemindCycle:              patient.RemindCycle,
+		ResponseResult:           patient.ResponseResult,
+		IsOpenRemind:             patient.IsOpenRemind,
+		FirstTreatmentDate:       patient.FirstTreatmentDate,
+		DialysisAge:              patient.DialysisAge,
+		ExpenseKind:              patient.ExpenseKind,
+		TellPhone:                patient.TellPhone,
+		ContactName:              patient.ContactName,
+		UpdatedTime:              time.Now().Unix(),
+		BloodPatients:            1,
+		Lapseto:                  patient.Lapseto,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -3235,6 +3235,11 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		patient.Remark = remark
 	}
 
+	if patientBody["sch_remark"] != nil && reflect.TypeOf(patientBody["sch_remark"]).String() == "string" {
+		sch_remark := patientBody["sch_remark"].(string)
+		patient.SchRemark = sch_remark
+	}
+
 	if patientBody["patient_complains"] != nil && reflect.TypeOf(patientBody["patient_complains"]).String() == "string" {
 		patient_complains := patientBody["patient_complains"].(string)
 		patient.PatientComplains = patient_complains

controllers/public_api_controller.go

@@ -183,8 +183,9 @@ func (c *PublicApiController) HandleData() {
 		//org_app_14, _ := service.GetAppByType(int64(apps.OrgId), 14)
 		//org_app_15, _ := service.GetAppByType(int64(apps.OrgId), 15)
 
-		org_app_16, _ := service.GetAppByType(int64(apps.OrgId), 16)
-		org_app_17, _ := service.GetAppByType(int64(apps.OrgId), 17)
+		//org_app_16, _ := service.GetAppByType(int64(apps.OrgId), 16)
+		//org_app_17, _ := service.GetAppByType(int64(apps.OrgId), 17)
+		org_app_18, _ := service.GetAppByType(int64(apps.OrgId), 18)
 
 		var xt_temp_org_app *models.OrgApp
 		//var mall_temp_org_app *models.OrgApp
@@ -277,28 +278,48 @@ func (c *PublicApiController) HandleData() {
 		//	mall_temp_org_app = mall_org_app
 		//}
 		//
-		if org_app_16 == nil || org_app_16.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgAppA(0, 16)
-			//org, _ := service.GetOrgById(int64(12))
-			org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-			if org == nil || org.Id == 0 {
-				continue
-			}
-
-			app.OrgId = apps.OrgId
-			app.Creator = int(org.Creator)
-			app.Number = 11
-			app.Id = 0
-			app.Status = 1
-			app.ModifyTime = time.Now().Unix()
-			app.CreateTime = time.Now().Unix()
-			app.Pid = xt_temp_org_app.Id
-			service.CreateOrgApp(app)
-
-		}
+		//if org_app_16 == nil || org_app_16.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 16)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Number = 11
+		//	app.Id = 0
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	app.Pid = xt_temp_org_app.Id
+		//	service.CreateOrgApp(app)
+		//
+		//}
+		//
+		//if org_app_17 == nil || org_app_17.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 17)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Number = 12
+		//	app.Id = 0
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	app.Pid = xt_temp_org_app.Id
+		//	service.CreateOrgApp(app)
+		//
+		//}
 
-		if org_app_17 == nil || org_app_17.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-			app, _ := service.GetOrgAppA(0, 17)
+		if org_app_18 == nil || org_app_18.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgAppA(0, 18)
 			//org, _ := service.GetOrgById(int64(12))
 			org, _ := service.GetOrgByIdB(int64(apps.OrgId))
 			if org == nil || org.Id == 0 {
@@ -307,7 +328,7 @@ func (c *PublicApiController) HandleData() {
 
 			app.OrgId = apps.OrgId
 			app.Creator = int(org.Creator)
-			app.Number = 12
+			app.Number = 5
 			app.Id = 0
 			app.Status = 1
 			app.ModifyTime = time.Now().Unix()

models/board_models.go

@@ -77,6 +77,7 @@ type BoardPatients struct {
 	FirstTreatmentDate           int64   `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
 	ContactName                  string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 }
 
 func (BoardPatients) TableName() string {

models/dialysis.go

@@ -76,6 +76,7 @@ type SchedualPatient struct {
 	FirstTreatmentDate      int64                   `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
 	ContactName             string                  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount      int64                   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	SchRemark               string                  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 }
 
 func (SchedualPatient) TableName() string {
@@ -157,6 +158,7 @@ type SchedualPatient2 struct {
 	FirstTreatmentDate      int64                `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
 	ContactName             string               `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount      int64                `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	SchRemark               string               `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 }
 
 func (SchedualPatient2) TableName() string {

models/monitor_models.go

@@ -104,6 +104,7 @@ type MonitorPatients struct {
 	FirstTreatmentDate           int64   `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
 	ContactName                  string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 }
 
 func (MonitorPatients) TableName() string {

models/patient_models.go

@@ -114,6 +114,7 @@ type Patients struct {
 	ContactName              string `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount       int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	IsExcelExport            int64  `gorm:"column:is_excel_export" json:"is_excel_export" form:"is_excel_export"`
+	SchRemark                string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 
 	ContagionIds []int64 `gorm:"-"`
 	DryWeight    float64 `gorm:"-"`
@@ -518,6 +519,7 @@ type XtPatientsNew struct {
 	EquitmentId                  string  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	IsExcelExport                int64   `gorm:"column:is_excel_export" json:"is_excel_export" form:"is_excel_export"`
+	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 }
 
 func (XtPatientsNew) TableName() string {
@@ -569,6 +571,7 @@ type CdmPatients struct {
 	CreatedTime        int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime        int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 }
 
 func (CdmPatients) TableName() string {
@@ -841,6 +844,7 @@ type XtPatients struct {
 	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	ContactName                  string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 }
 
 func (XtPatients) TableName() string {

models/vm_models.go

@@ -86,8 +86,8 @@ type VMOrgPatients struct {
 	FirstTreatmentDate       int64  `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
 	ContactName              string `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount       int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
-
-	ContagionIds string `json:"contagion_ids" gorm:"-"`
+	SchRemark                string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	ContagionIds             string `json:"contagion_ids" gorm:"-"`
 }
 
 func (VMOrgPatients) TableName() string {

service/data.go

@@ -167,7 +167,7 @@ func DeleteChildConfig(dataconfig *models.Dataconfig) (err error) {
 }
 
 func FindFiledByOrgId(org_id int64) (filedConfig []*models.FiledConfig, err error) {
-	err = readDb.Model(&models.FiledConfig{}).Where("org_id =? AND sys_module = 0", org_id).Find(&filedConfig).Error
+	err = readDb.Model(&models.FiledConfig{}).Where("org_id =? AND  sys_module = 0", org_id).Find(&filedConfig).Error
 	return
 }