修改问题

controllers/data_api_controller.go

 	var dataconfig models.Dataconfig
 	var resultConfig models.ConfigViewModel
 	code := configFormData(&dataconfig, c.Ctx.Input.RequestBody)
-	fmt.Println("code----------", code)
 	if code > 0 {
 		c.ServeFailJSONWithSGJErrorCode(code)
 		return
 	}
 	// 验证关键字段的值是否重复
-	// if (dataconfig.Module == "education" || dataconfig.Module == "summary") {
-	// 	thisConfig,_:=service.FindConfigByTitle(dataconfig.Module, dataconfig.FieldName,dataconfig.OrgId)
-	// 	if thisConfig.ID >0 {
-	// 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFieldExist)
-	// 		return
-	// 	}
-	// } else {
-	// 	thisConfig,_:=service.FindConfigByFieldname(dataconfig.Module, dataconfig.FieldName,dataconfig.OrgId)
-	// 	if thisConfig.ID >0 {
-	// 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFieldExist)
-	// 		return
-	// 	}
-	// }
-	// fieldValue:=service.GetChildValue(dataconfig.Module, dataconfig.ParentId)
-	// dataconfig.Value = fieldValue+1
+
+	thisConfig,_:=service.FindConfigByTitle(dataconfig.Module, dataconfig.FieldName,adminUserInfo.CurrentOrgId)
+	if thisConfig.ID >0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFieldExist)
+		return
+	}
+	
+	fieldValue:=service.GetChildValue(dataconfig.Module, dataconfig.ParentId,adminUserInfo.CurrentOrgId)
+	dataconfig.Value = fieldValue+1
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)

controllers/patient_api_controller.go

 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)
 		return
 	}
-	fmt.Println("病人--------------------------------------------------------------", patient.Name, patient.Age)
+
 	patientsNew := models.XtPatientsNew{
 		UserOrgId:          patient.UserOrgId,
 		UserId:             patient.UserId,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
-	fmt.Println("更新病人失败---------------------------------------", err)
 
 	if len(record_date) > 0 {
 		var recordTime int64

service/mobile_dialysis_service.go

 	DeviceZone               *models.DeviceZone                `gorm:"ForeignKey:PartitionId" json:"device_zone"`
 	TreatmentMode            *models.TreatmentMode             `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
 	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,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"`
-	TreatmentSummary 		 *models.TreatmentSummary 		   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
+	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
+	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
+	TreatmentSummary 		 *models.TreatmentSummary 		   `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
 	Advices                  []*models.DoctorAdvice            `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
 }
 
 	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"`
+	DialysisNo         string  `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	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"`

service/patient_service.go

 		utx.Rollback()
 		return
 	}
-	if len(contagions) > 0 {
+	if len(contagions) > 0 &&  patient.IsInfectious == 2{
 		thisSQL := "INSERT INTO xt_patients_infectious_diseases (patient_id, disease_id, status, created_time, updated_time) VALUES "
 		insertParams := make([]string, 0)
 		insertData := make([]interface{}, 0)
 	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and groupno = ? and advice_date = ? and patient_id = ?", orgid, groupno, date, patientid).Update(map[string]interface{}{"start_time": advice.StartTime, "updated_time": advice.UpdatedTime}).Error
 	return err
 }
+
+
+func GetPatientsByKey(orgID int64, keywords string) (patient []*models.Patients, err error) {
+	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1 and lapseto = 1 ", orgID)
+	if len(keywords) > 0 {
+	 likekey := "%" + keywords + "%"
+	 err = db.Where("(name LIKE ? OR dialysis_no LIKE ?)", likekey, likekey).Find(&patient).Error
+	} else {
+	 err = db.Find(&patient).Error
+	}
+	return
+   }
+
+func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error {
+	err := XTWriteDB().Model(&lapseto).Where("patient_id = ?", patientid).Updates(map[string]interface{}{"lapseto_type": lapseto.LapsetoType, "lapseto_time": time.Now().Unix(), "updated_time": time.Now().Unix()}).Error
+	return err
+}

service/patientmanage_service.go

 	if projectid > 0 {
 		db = db.Where("x.project_id = ?", projectid)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id ").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on (r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0)   ").Scan(&inspection).Error
 	return inspection, err
 }
 

数据变更脚本.sql

 --显示配置里添加体液过程症状--
 INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '0','3','humor_excessive_symptom','体液过多症状','2',NULL,NULL,'0');
 --添加显示体液过程症状的机构 org_id为要显示的机构--
-INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '13','3','humor_excessive_symptom','体液过多症状','1',NULL,NULL,'0');
+INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '9883','3','humor_excessive_symptom','体液过多症状','1',NULL,NULL,'0');
 
 
 --2020-06-19 author 张保健 --