Merge branch 'master' of http://git.shengws.com/csx/XT_New

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 

controllers/gobal_config_api_controller.go

@@ -31,7 +31,7 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/stock/automaticreduce/isopen", &GobalConfigApiController{}, "post:PostStockConfig")
 	beego.Router("/api/automaticreduce/get", &GobalConfigApiController{}, "get:GetConfig")
 
-	beego.Router("/api/print/template/commit", &GobalConfigApiController{}, "post:PostPrintTemplate")
+	beego.Router("/api/print/template/commit", &GobalConfigApiController{}, "post:PostPrintTemplateTwo")
 	beego.Router("/api/print/template/get", &GobalConfigApiController{}, "get:GetPrintTemplate")
 
 	beego.Router("/api/dataupload/config/commit", &GobalConfigApiController{}, "post:PostConfig")

controllers/patient_api_controller.go

@@ -2917,6 +2917,12 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 	age := int64(patientBody["age"].(float64))
 	patient.Age = age
 
+	if patientBody["user_sys_before_count"] != nil || reflect.TypeOf(patientBody["user_sys_before_count"]).String() == "string" {
+		user_sys_before_count := patientBody["user_sys_before_count"].(string)
+		count, _ := strconv.ParseInt(user_sys_before_count, 10, 64)
+		patient.UserSysBeforeCount = count
+	}
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 

controllers/public_api_controller.go

@@ -163,6 +163,8 @@ func (this *PublicApiController) GetJson() {
 }
 
 func (c *PublicApiController) HandleData() {
+	service.HandleData()
+
 	//org_app, _ := service.GetAllAppOrg()
 	//org_role, _ := service.GetAllRole()
 	//

models/board_models.go

@@ -76,6 +76,7 @@ type BoardPatients struct {
 	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (BoardPatients) TableName() string {

models/dialysis.go

@@ -75,6 +75,7 @@ type SchedualPatient struct {
 	TellPhone               string                  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (SchedualPatient) TableName() string {
@@ -154,6 +155,7 @@ type SchedualPatient2 struct {
 	TellPhone               string           `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (SchedualPatient2) TableName() string {

models/intergration_models.go

@@ -1,16 +1,16 @@
 package models
 
 type MiddleSyncInfo struct {
-	ID             	int64 `gorm:"column:id" json:"id" form:"id"`
-	OrgId       	int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	SyncTime       int64 `gorm:"column:sync_time" json:"sync_time" form:"sync_time"`
-	SyncResultType  int	  `gorm:"column:sync_result_type" json:"sync_result_type" form:"sync_result_type"`
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	SyncTime        int64  `gorm:"column:sync_time" json:"sync_time" form:"sync_time"`
+	SyncResultType  int    `gorm:"column:sync_result_type" json:"sync_result_type" form:"sync_result_type"`
 	SyncRsultRemark string `gorm:"column:sync_result_remark" json:"sync_result_remark" form:"sync_result_remark"`
-	SyncTotalNum    int64 `gorm:"column:sync_total_num" json:"sync_total_num" form:"sync_total_num"`
-	SyncSuccessNum  int64 `gorm:"column:sync_success_num" json:"sync_success_num" form:"sync_success_num"`
-	SyncInfo      	string `gorm:"column:sync_info" json:"sync_info" form:"sync_info"`
-	CreateTime      int64 `gorm:"column:create_time" json:"create_time" form:"create_time"`
-	UpdateTime    	int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	SyncTotalNum    int64  `gorm:"column:sync_total_num" json:"sync_total_num" form:"sync_total_num"`
+	SyncSuccessNum  int64  `gorm:"column:sync_success_num" json:"sync_success_num" form:"sync_success_num"`
+	SyncInfo        string `gorm:"column:sync_info" json:"sync_info" form:"sync_info"`
+	CreateTime      int64  `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime      int64  `gorm:"column:update_time" json:"update_time" form:"update_time"`
 }
 
 func (MiddleSyncInfo) TableName() string {
@@ -18,22 +18,22 @@ func (MiddleSyncInfo) TableName() string {
 }
 
 type MiddleInterface struct {
-	ID          	int64  `gorm:"column:id" json:"id" form:"id"`
-	OrgId   		int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Creater   		int64 `gorm:"column:creater" json:"creater" form:"creater"`
-	Pattern 		int  `gorm:"column:pattern" json:"pattern" form:"pattern"`
-	Dbhost 			string  `gorm:"column:dbhost" json:"dbhost" form:"dbhost"`
-	Dbuser 			string  `gorm:"column:dbuser" json:"dbuser" form:"dbuser"`
-	Dbpassword 		string  `gorm:"column:dbpassword" json:"dbpassword" form:"dbpassword"`
-	Dbname 			string  `gorm:"column:dbname" json:"dbname" form:"dbname"`
-	InterfaceUrl 	string  `gorm:"column:interface_url" json:"interface_url" form:"interface_url"`
-	InterFaceToken 	string  `gorm:"column:interface_token" json:"interface_token" form:"interface_token"`
-	AllowIp 		string  `gorm:"column:allow_ip" json:"allow_ip" form:"allow_ip"`
-	AllowToken 		string  `gorm:"column:allow_token" json:"allow_token" form:"allow_token"`
-	SyncFrequency 	int  `gorm:"column:sync_frequency" json:"sync_frequency" form:"sync_frequency"`
-	Status			int  `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"`
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId          int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Creater        int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Pattern        int    `gorm:"column:pattern" json:"pattern" form:"pattern"`
+	Dbhost         string `gorm:"column:dbhost" json:"dbhost" form:"dbhost"`
+	Dbuser         string `gorm:"column:dbuser" json:"dbuser" form:"dbuser"`
+	Dbpassword     string `gorm:"column:dbpassword" json:"dbpassword" form:"dbpassword"`
+	Dbname         string `gorm:"column:dbname" json:"dbname" form:"dbname"`
+	InterfaceUrl   string `gorm:"column:interface_url" json:"interface_url" form:"interface_url"`
+	InterFaceToken string `gorm:"column:interface_token" json:"interface_token" form:"interface_token"`
+	AllowIp        string `gorm:"column:allow_ip" json:"allow_ip" form:"allow_ip"`
+	AllowToken     string `gorm:"column:allow_token" json:"allow_token" form:"allow_token"`
+	SyncFrequency  int    `gorm:"column:sync_frequency" json:"sync_frequency" form:"sync_frequency"`
+	Status         int    `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"`
 }
 
 func (MiddleInterface) TableName() string {
@@ -126,6 +126,7 @@ type VMPatients 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"`
 	VMHisPatients            VMHisPatients `gorm:"ForeignKey:XtPatientId;AssociationForeignKey:ID" json:"his_patient"`
+	UserSysBeforeCount       int64         `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (VMPatients) TableName() string {

models/monitor_models.go

@@ -103,6 +103,7 @@ type MonitorPatients struct {
 	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (MonitorPatients) TableName() string {

models/patient_models.go

@@ -85,6 +85,7 @@ type Patients struct {
 	TellPhone                string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (Patients) TableName() string {
@@ -483,6 +484,7 @@ type XtPatientsNew struct {
 	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"`
+	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (XtPatientsNew) TableName() string {
@@ -495,44 +497,45 @@ type PatientsNew struct {
 }
 
 type CdmPatients 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"`
-	UserId            int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
-	Avatar            string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	PatientType       int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
-	Source            int64  `gorm:"column:source" json:"source" form:"source"`
-	Name              string `gorm:"column:name" json:"name" form:"name"`
-	Alias             string `gorm:"column:alias" json:"alias" form:"alias"`
-	Gender            int64  `gorm:"column:gender" json:"gender" form:"gender"`
-	MaritalStatus     int64  `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
-	IdCardNo          string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	Birthday          int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	HealthCareType    int64  `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
-	HealthCareNo      string `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
-	Height            int64  `gorm:"column:height" json:"height" form:"height"`
-	BloodType         int64  `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
-	Rh                int64  `gorm:"column:rh" json:"rh" form:"rh"`
-	EducationLevel    int64  `gorm:"column:education_level" json:"education_level" form:"education_level"`
-	Profession        int64  `gorm:"column:profession" json:"profession" form:"profession"`
-	Phone             string `gorm:"column:phone" json:"phone" form:"phone"`
-	HomeTelephone     string `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
-	RelativePhone     string `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
-	RelativeRelations string `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
-	HomeAddress       string `gorm:"column:home_address" json:"home_address" form:"home_address"`
-	WorkUnit          string `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
-	UnitAddress       string `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
-	Children          int64  `gorm:"column:children" json:"children" form:"children"`
-	AttendingDoctorId int64  `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
-	HeadNurseId       int64  `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
-	Diagnose          string `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
-	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
-	RegistrarsId      int64  `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
-	Registrars        string `gorm:"column:registrars" json:"registrars" form:"registrars"`
-	QrCode            string `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
-	BindingState      int64  `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
-	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"`
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId             int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar             string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType        int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	Source             int64  `gorm:"column:source" json:"source" form:"source"`
+	Name               string `gorm:"column:name" json:"name" form:"name"`
+	Alias              string `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender             int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	MaritalStatus      int64  `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
+	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday           int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	HealthCareType     int64  `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
+	HealthCareNo       string `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
+	Height             int64  `gorm:"column:height" json:"height" form:"height"`
+	BloodType          int64  `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
+	Rh                 int64  `gorm:"column:rh" json:"rh" form:"rh"`
+	EducationLevel     int64  `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession         int64  `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone              string `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone      string `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone      string `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations  string `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress        string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit           string `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress        string `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children           int64  `gorm:"column:children" json:"children" form:"children"`
+	AttendingDoctorId  int64  `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
+	HeadNurseId        int64  `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
+	Diagnose           string `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark             string `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId       int64  `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars         string `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	QrCode             string `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
+	BindingState       int64  `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
+	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"`
+	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (CdmPatients) TableName() string {
@@ -791,6 +794,7 @@ type XtPatients struct {
 	ExpenseKind                  int64   `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
 	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"`
 }
 
 func (XtPatients) TableName() string {

models/vm_models.go

@@ -85,6 +85,7 @@ type VMOrgPatients struct {
 	TellPhone                string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (VMOrgPatients) TableName() string {

service/app_version.go

@@ -182,3 +182,11 @@ func GetSystemRole(orgID int64) ([]*models.Role, error) {
 	}
 	return roles, nil
 }
+
+func HandleData() {
+	var prescription []*models.DialysisPrescription
+	readDb.Model(&models.DialysisPrescription{}).Where("user_org_id = 12 AND record_date <= 1587571200").Find(&prescription)
+	for _, item := range prescription {
+		writeDb.Model(&models.AssessmentAfterDislysis{}).Where("user_org_id =12 AND assessment_date = ?", item.RecordDate).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "actual_ultrafiltration": item.Ultrafiltration})
+	}
+}

service/gobal_config_service.go

@@ -76,7 +76,7 @@ func UpdateDoctorAdviceRecord(config *models.DoctorAdviceConfig) (err error) {
 }
 
 func UpdateFiledConfig(org_id int64) (err error) {
-	err = writeDb.Model(&models.FiledConfig{}).Where("org_id = ?", org_id).Updates(map[string]interface{}{"is_show": 1}).Error
+	err = writeDb.Model(&models.FiledConfig{}).Where("org_id = ? AND sys_module = 0", org_id).Updates(map[string]interface{}{"is_show": 1}).Error
 	return
 }
 

service/mobile_dialysis_service.go

@@ -109,16 +109,17 @@ func (MDeviceNumberVM) TableName() string {
 }
 
 type MSchedualPatientVMList 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"`
-	UserId      int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
-	PatientType int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
-	Avatar      string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	Gender      int64  `gorm:"column:gender" json:"gender" form:"gender"`
-	Birthday    int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	Age         int64  `gorm:"column:age" json:"age"`
-	Name        string `gorm:"column:name" json:"name" form:"name"`
-	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"`
+	UserId             int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	PatientType        int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	Avatar             string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	Gender             int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	Birthday           int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Age                int64  `gorm:"column:age" json:"age"`
+	Name               string `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (MSchedualPatientVMList) TableName() string {
@@ -195,6 +196,7 @@ type MSchedualPatientVM struct {
 	TellPhone               string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (MSchedualPatientVM) TableName() string {
@@ -387,6 +389,7 @@ type MPatient struct {
 	TellPhone               string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (MPatient) TableName() string {

service/patient_service.go

@@ -67,7 +67,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	offset := (page - 1) * limit
 
-	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 	return
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -75,6 +75,7 @@ type PatientVM struct {
 	ExpenseKind                  int64   `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
 	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	FirstTreatmentDate           int64   `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (PatientVM) TableName() string {