宣教信息

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -4,7 +4,6 @@ import (
 	"XT_New/controllers"
 	"XT_New/enums"
 	"XT_New/models"
-	"XT_New/service"
 	"fmt"
 )
 
@@ -54,11 +53,11 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 		this.StopRun()
 	}
 
-	if this.Ctx.Request.Method != "GET" {
-		err := service.GetOrgSubscibeState(adminUserInfo.Subscibe)
-		if err != nil || adminUserInfo.Subscibe.State == 3 {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSubscibe)
-			this.StopRun()
-		}
-	}
+	//if this.Ctx.Request.Method != "GET" {
+	//	err := service.GetOrgSubscibeState(adminUserInfo.Subscibe)
+	//	if err != nil || adminUserInfo.Subscibe.State == 3 {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSubscibe)
+	//		this.StopRun()
+	//	}
+	//}
 }

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -187,13 +187,20 @@ func (this *NewDialysisApiController) SavePatient() {
 		ids = append(ids, id)
 	}
 	fmt.Print("传染病2", contagions)
+	is_infectious := int64(dataBody["is_infectious"].(float64))
+	fmt.Print("传染病", is_infectious)
 	adminssionNumber := dataBody["admissionNumber"].(string)
 	fmt.Print("住院号", adminssionNumber)
+
 	fistdate := dataBody["fistDate"].(string)
 	fmt.Print("首次透析日期", fistdate)
-	times, err := utils.ParseTimeStringToTime(timeLayout, fistdate+"00:00:00")
+	timeLayouts := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	times, err := time.ParseInLocation(timeLayouts+" 15:04:05", fistdate+" 00:00:00", loc)
+	//times, err := utils.ParseTimeStringToTime(timeLayout, fistdate+"00:00:00")
 	fisttime := times.Unix()
 	fmt.Print(fisttime)
+
 	diagonse := dataBody["diagnose"].(string)
 	fmt.Print("诊断", diagonse)
 	avatar := dataBody["avatar"].(string)
@@ -225,9 +232,10 @@ func (this *NewDialysisApiController) SavePatient() {
 	//会员
 	memberFistDate := dataBody["memberFistDate"].(string)
 	fmt.Print("首次透析日期", memberFistDate)
-	membertimes, err := utils.ParseTimeStringToTime(timeLayout, memberFistDate+"00:00:00")
+	//membertimes, err := utils.ParseTimeStringToTime(timeLayout, memberFistDate+"00:00:00")
+	membertimes, _ := time.ParseInLocation(timeLayouts+" 15:04:05", memberFistDate+" 00:00:00", loc)
 	memtime := membertimes.Unix()
-	fmt.Print(memtime)
+	fmt.Print("会员透析日期", memtime)
 	patient_type := int64(dataBody["patientType"].(float64))
 	fmt.Print("病种", patient_type)
 	treatmentmethod := int64(dataBody["treatmentMethod"].(float64))
@@ -254,6 +262,7 @@ func (this *NewDialysisApiController) SavePatient() {
 				CreatedTime:       time.Now().Unix(),
 				Avatar:            avatar,
 				IdCardNo:          idCard,
+				IsInfectious:      is_infectious,
 			}
 			err := service.CreateOldPatient(&patients)
 			fmt.Print("报错", err)
@@ -282,6 +291,8 @@ func (this *NewDialysisApiController) SavePatient() {
 				BloodPatients:     bloodPatient,
 				SlowPatients:      slowpatient,
 				BloodId:           patient.ID,
+				IsInfectious:      is_infectious,
+				IdCardNo:          idCard,
 			}
 			err = service.CreateNewPatient(&patientsNew)
 			fmt.Print("报错", err)
@@ -300,7 +311,7 @@ func (this *NewDialysisApiController) SavePatient() {
 		}
 	}
 
-	fmt.Print("slowpatient----------------", slowpatient)
+	fmt.Print("slowpatient", slowpatient)
 	//如果是慢病病人
 	if slowpatient == 1 {
 		_, errcodetwo := service.GetSlowPatientData(phone, orgid)
@@ -349,6 +360,9 @@ func (this *NewDialysisApiController) SavePatient() {
 					BloodPatients:     bloodPatient,
 					SlowPatients:      slowpatient,
 					SlowId:            slowPatient.ID,
+					IsInfectious:      is_infectious,
+					IdCardNo:          idCard,
+					EquitmentId:       requipmentId,
 				}
 				err = service.CreateNewPatient(&patientsNew)
 				if err != nil {
@@ -404,6 +418,11 @@ func (this *NewDialysisApiController) SavePatient() {
 								BloodPatients:     bloodPatient,
 								SlowPatients:      slowpatient,
 								MemberId:          memberPatient.ID,
+								IsInfectious:      is_infectious,
+								IdCardNo:          idCard,
+								MemberFistdate:    memtime,
+								MemberPatienttype: patient_type,
+								MemberTreatement:  treatmentmethod,
 							}
 							err = service.CreateNewPatient(&patientsNew)
 							fmt.Print("报错-----------------------", err)
@@ -485,6 +504,11 @@ func (this *NewDialysisApiController) SavePatient() {
 					BloodPatients:     bloodPatient,
 					SlowPatients:      slowpatient,
 					MemberId:          memberPatient.ID,
+					IsInfectious:      is_infectious,
+					IdCardNo:          idCard,
+					MemberFistdate:    memtime,
+					MemberPatienttype: patient_type,
+					MemberTreatement:  treatmentmethod,
 				}
 				err = service.CreateNewPatient(&patientsNew)
 				fmt.Print("报错-----------------------", err)
@@ -517,14 +541,20 @@ func (this *NewDialysisApiController) GetPatientDetail() {
 	detail, err := service.GetPatientDetailTwo(id)
 	//获取传染病详情
 	diseases := service.GetPatientDiseasesTwo(detail.BloodId)
+	//获取慢病传染病
+	slowDiseases, err := service.GetSlowPatientDiseases(detail.SlowId)
+	//获取慢病慢性病
+	cronicDiseases, err := service.GetCronicDiseases(detail.SlowId)
 	//获取血透医嘱管理
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"patientDetail": detail,
-		"diseases":      diseases,
+		"patientDetail":  detail,
+		"diseases":       diseases,
+		"slowDiseases":   slowDiseases,
+		"cronicDiseases": cronicDiseases,
 	})
 }
 

models/patient_models.go

@@ -479,6 +479,10 @@ type XtPatientsNew struct {
 	BloodId                      int64   `gorm:"column:blood_id" json:"blood_id" form:"blood_id"`
 	SlowId                       int64   `gorm:"column:slow_id" json:"slow_id" form:"slow_id"`
 	MemberId                     int64   `gorm:"column:member_id" json:"member_id" form:"member_id"`
+	MemberFistdate               int64   `gorm:"column:member_fistdate" json:"member_fistdate" form:"member_fistdate"`
+	MemberPatienttype            int64   `gorm:"column:member_patienttype" json:"member_patienttype" form:"member_patienttype"`
+	MemberTreatement             int64   `gorm:"column:member_treatement" json:"member_treatement" form:"member_treatement"`
+	EquitmentId                  string  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 }
 
 func (XtPatientsNew) TableName() string {
@@ -535,6 +539,36 @@ func (CdmPatients) TableName() string {
 	return "xt_patients"
 }
 
+type CdmPatientsInfectiousDiseases struct {
+	ID          int64 `gorm:"column:id" json:"id" form:"id"`
+	PatientId   int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DiseaseId   int64 `gorm:"column:disease_id" json:"disease_id" form:"disease_id"`
+	Status      int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	UserOrgId   int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+}
+
+func (CdmPatientsInfectiousDiseases) TableName() string {
+
+	return "xt_patients_infectious_diseases"
+}
+
+type CdmPatientsChronicDiseases struct {
+	ID          int64 `gorm:"column:id" json:"id" form:"id"`
+	PatientId   int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DiseaseId   int64 `gorm:"column:disease_id" json:"disease_id" form:"disease_id"`
+	Status      int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	UserOrgId   int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+}
+
+func (CdmPatientsChronicDiseases) TableName() string {
+
+	return "xt_patients_chronic_diseases"
+}
+
 type SgjUserCustomer 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"`

service/patientmanage_service.go

@@ -249,6 +249,37 @@ func GetPatientDiseasesTwo(id int64) []int64 {
 	return ids
 }
 
+func GetSlowPatientDiseases(id int64) (infeciousdisease []*models.CdmPatientsInfectiousDiseases, err error) {
+	//var dis  []models.CdmPatientsInfectiousDiseases
+	//diseases := models.CdmPatientsChronicDiseases{}
+	//ids := make([]int64, 0)
+	//err := PatientReadDB().Model(&diseases).Where("patient_id = ? and status =1", id).Find(&ids).Error
+	//if err != nil || len(dis) == 0 {
+	//  return ids
+	//}
+	//for _, item := range dis {
+	//  ids = append(ids, item.DiseaseId)
+	//}
+	//return ids
+	err = PatientReadDB().Model(&infeciousdisease).Where("patient_id = ? and status =1", id).Find(&infeciousdisease).Error
+	return infeciousdisease, err
+}
+
+func GetCronicDiseases(id int64) (chronic []*models.CdmPatientsChronicDiseases, err error) {
+	//var dis  []models.CdmPatientsChronicDiseases
+	//ids := make([]int64, 0)
+	//err := PatientReadDB().Model(&models.CdmPatientsChronicDiseases{}).Where("patient_id = ? and status =1", id).Find(&ids).Error
+	//if err != nil || len(dis) == 0 {
+	//  return ids
+	//}
+	//for _, item := range dis {
+	//  ids = append(ids, item.DiseaseId)
+	//}
+	//return ids
+	err = PatientReadDB().Model(&chronic).Where("patient_id = ? and status =1", id).Find(&chronic).Error
+	return chronic, err
+}
+
 func CreatePatientTwo(patient *models.Patients, contagions []int64, diseases []int64) (err error) {
 
 	user, _ := GetSgjUserByMobild(patient.Phone)